Robin McCorkell [Mon, 21 Apr 2014 20:41:45 +0000 (21:41 +0100)]
Permit personal mount points to be used for sharing
An issue existed where `readData` used `OCP\User::getUser()` to get the user
for personal mount points, which worked in all situations apart from when a
personal mount point was used for sharing, so the return from `getUser()` is
not the user that owns the share. As such, any personal mount points would not
work correctly when shared.
`readData` and `writeData` have been changed from using a `$isPersonal`
boolean to using a `$user` string|null. `$isPersonal = false` can now be
written as `$user = NULL` (or left out in the case of `readData`), and
`$isPersonal = true` can be written as `$user = OCP\User::getUser()`.
Thomas Müller [Fri, 11 Jul 2014 14:51:59 +0000 (16:51 +0200)]
append file extension to the temporary file which contains the downloaded archive - in case of zip files fileinfo doesn't seem to return anything reliable
Fix Signiture Does Not Match when mounting Amazon S3 external storage
For some reason the aws-sdk-php package does not caclulate the
signiture correctly when accessing an object in a bucket with a name of
'.'.
When we are at the top of a S3 bucket there is a need(?) to have a directory
name. Per standard Unix the name picked was '.' (dot or period). This
choice exercises the aws-sdk bug.
This fix is to add a field to the method to store the name to use instead of
'.' which at this point is hard coded to '<root>'. We also add a private
function 'cleanKey()' which will test for the '.' name and replace it with
the variable. Finally all calls to manipulate objects where the path is
not obviously not '.' are processed through cleanKey().
An example where we don't process through clean key would be
'Key' => $path.'/',
Vincent Petry [Wed, 26 Mar 2014 11:10:17 +0000 (12:10 +0100)]
Fix merging of external storage configurations
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.
Fixed merging logic to make sure that class, mount point and options are
the same before merging them.
Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
Lukas Reschke [Sat, 14 Jun 2014 09:05:12 +0000 (11:05 +0200)]
Add deprecation notice to load* functions
This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way.
Please review @karlitschek and others. Backport to stable5 and master requested.
Vincent Petry [Thu, 12 Jun 2014 16:26:08 +0000 (18:26 +0200)]
Added max heartbeat interval to prevent integer overflow
When using big session timeout values, the interval value might overflow
and cause the setInterval() call to ping the server in a loop without
any delay.
This fix adds a maximum ping interval of 24 hours.
Vincent Petry [Thu, 12 Jun 2014 15:29:55 +0000 (17:29 +0200)]
Fix public download link when zip download is disabled
When zip download is disabled, the public download action defined in
public.js is overridden by the one in fileactions.js because of the JS
loading order.
This quick fix prevents the override to happen when a download action is
already defined.
There are additional changes that were required to make the download
action icon work when registered from the public page.
ringmaster [Fri, 23 May 2014 14:29:37 +0000 (10:29 -0400)]
Continued flock work.
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