3ebc8f0564
Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-master
...
Fix get local file encryption master
2015-06-02 13:47:37 +02:00
ce04cf6610
shared lock around hooks
2015-06-01 13:24:02 +02:00
661c9e2444
add changeLock to the storage api
2015-06-01 13:24:02 +02:00
437c0b55a6
unlock source file when we cant lock the target in a rename
2015-06-01 13:22:56 +02:00
f0b8672729
fix locking root of a view
2015-06-01 13:22:56 +02:00
2d63fd77de
dont apply callback wrapper when fopen failed
2015-06-01 13:22:56 +02:00
1270c6800d
dont lock on meta data operations
2015-06-01 13:22:56 +02:00
35c377f7a9
phpdoc and minor issues
2015-06-01 13:22:56 +02:00
8d53dc803f
Use md5 + prefix for file locking keys in memcache
...
Also trim slashes from paths to make sure the locks are based on the
same paths.
2015-06-01 13:22:56 +02:00
0775e9c1ca
Use md5 for lock key
2015-06-01 13:22:56 +02:00
a1a25a9b5b
fix unlocking when moving mount points
2015-06-01 13:22:56 +02:00
7e418c7d69
high level locking wip
2015-06-01 13:22:56 +02:00
bf7002bc65
add locking to the view apo
2015-06-01 13:22:56 +02:00
536e187e51
add locking to the storage api
2015-06-01 13:22:56 +02:00
e114d00242
Only use quota stream wrapper on "files"
...
Prevent using the quota stream wrapper on trashbin folders and other
metadata folders
2015-05-28 18:31:20 +02:00
ded62ff693
Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storages
...
[encryption] fix move versions between storages
2015-05-28 15:28:25 +02:00
0de59acb49
only request encryption module for files which are not excluded
2015-05-27 15:47:40 +02:00
4513cf5967
Revert "Revert "Revert "FIX for webdav.mediencenter.t-online.de"""
2015-05-26 14:40:07 +02:00
f8938f004d
Revert "Revert "FIX for webdav.mediencenter.t-online.de""
2015-05-26 13:36:45 +02:00
ab0747113c
Merge pull request #16452 from owncloud/enc_ftp_upload
...
always write file, if fseek doesn't work we write the whole file
2015-05-26 12:02:41 +02:00
a577e723b0
flush() comments + perf opt
2015-05-26 10:22:52 +02:00
c63f2286c0
copy keys before we move a file between storages to make sure that the new target file reuses the old file key, otherwise versions will break
2015-05-22 15:41:28 +02:00
b82d902e18
Merge pull request #16493 from owncloud/cache-movewithcorrectmimetype
...
Get correct mimetype when moving and changing extension
2015-05-22 11:37:11 +02:00
d7b2bc9e2f
Merge pull request #16516 from owncloud/fix-phpdoc-trait
...
Fix PHPDoc
2015-05-22 09:47:59 +02:00
3d8ea96e55
Fix PHPDoc
...
Use correct parameters
2015-05-22 00:17:38 +02:00
bf6151e799
fix calculation of $count, $count is always 8129 so we need to check this
...
against the unencrypted file size
2015-05-21 14:15:26 +02:00
5a20edac82
test to simulate a non-seekable stream wrapper
2015-05-21 14:15:26 +02:00
fb51880a4a
encrypted filesize calculation in flush()
2015-05-21 14:15:26 +02:00
22968e806c
Get correct mimetype when moving and changing extension
...
Fixes issue when restoring folders from trash cross-storage, as such
folders have an extension ".d12345678".
Fixes issue when moving folders between storages and at the same time
changing their extension.
2015-05-21 10:57:58 +02:00
39d1e99228
Merge pull request #16322 from owncloud/trash-view
...
dont go trough the view when moving to trash
2015-05-20 14:44:01 +02:00
f9d04f62a8
Merge pull request #16440 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2015-05-19 22:12:35 +02:00
d832c4ae23
Fix unexisting class and broken doc
2015-05-19 15:27:50 +02:00
9c751f1d87
use copy when doing a crossStorageCopy on the same storage
2015-05-19 14:21:58 +02:00
fdbc21fc6c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-05-19 11:23:06 +00:00
1c411baf17
Merge pull request #16412 from owncloud/jknockaert-patch-1
...
fix #16356
2015-05-18 19:26:40 +02:00
f9b6ee86cd
Merge pull request #16399 from owncloud/enc_rmdir_fix
...
[encryption] only try to delete file keys if it is a valid path
2015-05-18 11:09:36 -04:00
2834971a77
fix #16356
2015-05-18 15:06:55 +02:00
a1e60e7882
Merge pull request #15980 from owncloud/jknockaert-patch-1
...
fix bug #15973
2015-05-18 15:01:16 +02:00
efa674f10d
only try to delete file keys if it is a valid path
2015-05-18 11:54:51 +02:00
887be709f5
a new approach to display the error message
2015-05-18 10:15:17 +02:00
ccbefb6e75
delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories
2015-05-13 19:06:23 +02:00
dc362823e0
Merge pull request #16269 from owncloud/master-fix-16179
...
Check if cURL supports the desired features
2015-05-12 18:27:57 +02:00
4613456a8a
Check if cURL supports the desired features
...
Older versions of cURL that are unfortunately still bundled by distributors don't support these features which will result in errors and other possibly unpredictable behaviour.
Fixes https://github.com/owncloud/core/issues/16179 for master – stable8 requires another patch.
2015-05-12 12:00:56 +02:00
0d5c7a11e2
use hooks to update encryption keys instead of the storage wrapper if a file gets renamed/restored, as long as we
...
are in the storage wrapper the file cache isn't up-to-date
2015-05-11 12:06:57 +02:00
aea734aaf1
Fix missing types on doc block and deduplicate the method name
2015-05-06 14:31:10 +02:00
e4829a2358
update 'encrypted'-flag in file cache according to the storage settings
2015-05-06 14:20:05 +02:00
dc39bda870
move/copy from storage
2015-05-06 14:20:02 +02:00
83ed4ee5b6
unit tests
2015-05-06 12:28:15 +02:00
e7a3911c83
check if encryption is enbaled before we start moving keys
2015-05-06 11:35:45 +02:00
35a2fd3f89
Only return cached files if existing
2015-05-06 11:16:44 +02:00
Thomas Müller
Robin Appelman
Vincent Petry
Bjoern Schiessle
Oliver Kohl D.Sc
Björn Schießle
jknockaert
Joas Schilling
Lukas Reschke
Morris Jobke
Joas Schilling
Scrutinizer Auto-Fixer
Clark Tomlinson