Age | Commit message (Collapse) | Author |
|
stable6 has a bug where the share keys are not properly deleted when
deleting a shared file as non-owner.
To make sure the more important fix from the backport of
1e631754d78e98d74ba0d3fb477d5eb815e9dfb3 can be applied, the
corresponding assert introduced by the backport is disabled.
|
|
FileInfo class doesn't exist in stable6
|
|
fixFileSize is not needed as the target file will already have the
correct unencrypted size after renaming
|
|
Instead of inaccurate pattern matching, use the list of users who we
know have access to the file to build the list of share keys.
This covers the following cases:
- Move/copy files into a subfolder within a share
- Unsharing from a user
- Deleting files directlry / moving share keys to trashbin
Conflicts:
apps/files_encryption/lib/keymanager.php
apps/files_encryption/tests/hooks.php
apps/files_encryption/tests/keymanager.php
apps/files_encryption/tests/trashbin.php
|
|
Conflicts:
apps/files_versions/appinfo/app.php
apps/files_versions/tests/versions.php
|
|
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_versions/appinfo/app.php
|
|
|
|
When moving a folder into another mount point, $renamedFiles is empty
because that goes over a different mechanism.
In such case, this fix makes sure that the file proxy is reenable to
avoid breaking the subsequent files that are being moved.
|
|
|
|
|
|
|
|
|
|
Backport of https://github.com/owncloud/core/commit/8a24e1eb9624 to stable7
|
|
|
|
|
|
|
|
[encryption] check if file exists (OC6)
|
|
|
|
|
|
delete operation
|
|
point
|
|
[encryption] always use oc filesview, backport for OC6
|
|
|
|
|
|
|
|
|
|
|
|
add actual locking and log changes necessary for debugging.
Simpler log unique id.
Respect locked files, surface correct exception.
Conflicts:
lib/private/connector/sabre/file.php
Remove unused methods.
Conflicts:
lib/private/files/storage/local.php
Fix typo
Fix typo
Removed unused vars/declarations, update PHPDoc.
Don't error out on console.
Move Lock to private namespace, add interface. Update PHPDoc.
Restore the reference to this used exception class.
make sure to close the stream at the end of each test
Normalize lock exception messages.
don't ask for fileInfo if we already have one
Conflicts:
apps/files_encryption/lib/proxy.php
name the storage wrapper to make sure that we don't apply the wrapper multiple times
Conflicts:
lib/private/util.php
fix unit test after adding the additional parameter to addStorageWrapper()
only lock if unlink is called for a file
Can't use assertInstanceOf on wrapped storage; use assertTrue(instanceOfStorage() instead.
Conflicts:
tests/lib/files/filesystem.php
Use ->instanceOfStorage() not instanceof for Storage instances.
Conflicts:
lib/private/helper.php
get the storage from the view
Conflicts:
apps/files_encryption/tests/webdav.php
workaround to get the unit test going
Conflicts:
apps/files_encryption/hooks/hooks.php
Added isLocal() method to storage, used for xsendfile
Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.
Conflicts:
lib/private/files.php
Add ->instanceOfStorage to handle instanceof for storage wrappers
Conflicts:
lib/private/files/storage/common.php
lib/private/files/storage/wrapper/wrapper.php
lib/public/files/storage.php
Use instanceOfStorage instead of instanceof
Conflicts:
lib/private/files.php
Fix storage wrapper being called with null
Pass any methods custom to specific storage implementations to the wrapped storage
remove duplicate declaration of isLocal()
remove file locking - code will continue to live in it's own app
|
|
|
|
keys if no files exists
|
|
|
|
|
|
The virtual "Shared" folder doesn't have an unencrypted_size field.
This fix adds a check to prevent warnings in the log.
Backport of 022d76c from master
|
|
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
|
|
|
|
Enc fseek fallback stable6
|
|
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
|
|
[stable6] Fixed wrong field name
|
|
This re-fixes an issue where the unencrypted size isn't updated
correctly when saving a text file in the UI multiple times.
Fixes #7467
|
|
folder /tmp
|
|
|
|
back for file size calculation if the storage doesn't support fseek
|
|
|
|
|
|
|
|
|
|
|
|
encryption
|
|
Conflicts:
apps/files_encryption/tests/util.php
|
|
|