| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)
Get final redirect manually using get_headers()
Migrate to HTTPHelper class and add unit tests
Conflicts:
apps/files/ajax/newfile.php
lib/private/files/storage/dav.php
lib/private/server.php
lib/private/util.php
lib/public/iservercontainer.php
|
|
|
|
| |
notification was send
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added obfuscation for all "password" options from external storages.
Added more ext storage unit tests config.
Added unit tests for reading/writing the configuration.
Added IV for ext storage password encryption
Moved the mounting code for external storage from
OC\Filesystem::initMountPoint to files_external using the post_initMountPoints hook
Fixed ext storage unit test for groups
Squashed backport of 2c561c9c5072ce82e06bd5ab2c4ee81bc5d09d59 from
master.
|
| |
|
| |
|
| |
|
|
|
| |
Backwards compability fix for faster merge ;)
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.
This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.
This will make it much easier to debug syncing issues.
Backport of 11ef12a to stable6
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error
Conflicts:
lib/public/json.php
|
| |
|
|
|
|
| |
single owner.
|
|\
| |
| | |
Backport: Re-add the config options to remove the ability for users to change their displayname
|
| | |
|
|/
|
|
|
|
|
|
|
| |
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.
Refactored download code to use the new API.
Removed unused trashbin download file.
|
|
|
|
|
|
|
|
|
| |
In some specific situations, the L10N bundle isn't loadable yet (for
example when there is an issue with the app_config table). In such case,
we still want to be able to log the real exception.
This fixes errors that say "OC_L10N_String::__toString must not throw
exceptions"
|
| |
|
| |
|
|
|
|
| |
to find out to whom a file was shared after it was expired.
|
|\
| |
| | |
Get rid of date strings for DB. Completely use Doctrine and DateTime.
|
| | |
|
| |
| |
| |
| |
| | |
Use a DateTime object and have conversion handled by Doctrine instead of using
a date string with a fixed format.
|
| | |
|
|\ \
| | |
| | | |
API doc for contacts manager, server container and share
|
| | | |
|
| |/ |
|
|\ \
| |/
|/| |
fix appframework routing
|
| | |
|
| | |
|
|\ \
| |/
|/| |
Fix api documentation
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| | |
| | | |
Add public API for \OC\Avatar
|
| | | |
|