Vincent Petry
271ef9dedb
Remove test-specific method to make Bjoern and Joas happy
2015-06-26 17:37:04 +02:00
Thomas Müller
ac94126393
Merge pull request #17191 from owncloud/issue-17188-group-share-part-file
...
Correctly check if the real file exists, otherwise try the part file
2015-06-26 16:01:41 +02:00
Björn Schießle
b318b9cf17
Merge pull request #17008 from owncloud/fix-17006
...
Improve splitting of username and remote adress when username contains an `@`
2015-06-26 16:01:16 +02:00
Joas Schilling
9b336765b6
Correctly check if the real file exists, otherwise try the part file
2015-06-26 13:17:23 +02:00
Vincent Petry
eae08d0adc
Release locks after class in tests
2015-06-25 16:33:02 +02:00
Vincent Petry
538e466c30
Keep shared locks in post hooks
...
Instead of unlocking after the file operation, change exclusive locks
back to shared locks during post hooks, and unlock after that.
Also added unit tests to test locking in pre-hooks, during operation and
post-hooks.
2015-06-25 16:33:02 +02:00
Morris Jobke
1601867c9d
Remove unneeded getetag entries in properties table
...
* fixes #13281
2015-06-25 08:44:26 +02:00
Vincent Petry
58439c337c
Merge pull request #17070 from owncloud/lock-movemountbug
...
Lock correct paths when moving mount
2015-06-24 18:37:48 +02:00
Vincent Petry
35047a2300
Fix locked paths in the moveMount case
...
When moving a mount point directly, the lock must be applied on the
local mount point path instead of the attached storage root.
Other operations will still lock the attached storage root.
2015-06-24 11:33:28 +02:00
Björn Schießle
cce841c665
Merge pull request #17045 from owncloud/enc_improvements
...
encryption improvements
2015-06-23 14:30:21 +02:00
Bjoern Schiessle
95602d4069
make sure that we always read the header from the original file
2015-06-23 11:41:21 +02:00
Joas Schilling
45f9083a58
Make an assertion in risky test testGetNodeForPathRoot
2015-06-22 16:49:04 +02:00
Joas Schilling
738b78f1b0
Use \OC\HintException and translate the hint
2015-06-22 15:34:06 +02:00
Joas Schilling
2b7e5f841a
Merge spliteUserRemote with fixRemoteUrlInShareWith
2015-06-22 15:25:23 +02:00
Bjoern Schiessle
d38a378b8c
make sure that we split username and server address at the first '@' from the right to allow usernames containing '@'
2015-06-22 15:25:23 +02:00
Björn Schießle
a88b370dc8
Merge pull request #12546 from oparoz/patch-1
...
Send the mime icon if we can't generate a preview
2015-06-22 13:55:17 +02:00
Lukas Reschke
4d23e06097
Fix undefined offset
...
There are cases where no trusted host is specified such as when installing the instance, this lead to an undefined offset warning in the log right after installing. (when another domain than localhost or 127.0.0.1 was used)
2015-06-22 12:28:07 +02:00
Thomas Müller
ced15c44b4
Merge pull request #16657 from owncloud/view-emit-path
...
emit hooks from a view as long as the path is inside the default root
2015-06-22 11:29:11 +02:00
Bernhard Posselt
7fe5ab4d4a
Merge pull request #17056 from owncloud/appframework-type-cast
...
Allow multiple whitespace in type hints in AppFramework
2015-06-22 10:35:28 +02:00
Robin McCorkell
05fb9ceef9
Merge pull request #17025 from owncloud/sftp-rmdir-emptydir
...
Workaround for empty dir deletion for SFTP
2015-06-21 23:50:58 +01:00
Robin McCorkell
f1e3e25158
AppFramework annotation whitespace unit test
2015-06-21 20:26:57 +01:00
Lukas Reschke
00a65e30ce
Request approved state for disabled apps with ocsid
...
In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git.
With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided.
Fixes https://github.com/owncloud/core/issues/17003
2015-06-19 19:04:54 +02:00
Olivier Paroz
ba3b6f9be4
Remove unneeded returns from private cropping methods
2015-06-19 15:07:49 +02:00
Joas Schilling
6adddb3095
Merge pull request #16889 from owncloud/group-sorting-fixes
...
Only sort by group name when LDAP is involved
2015-06-19 08:29:25 +02:00
Vincent Petry
e15dd783ab
Workaround for empty dir deletion for SFTP
...
Explicitly clear the stat cache after deleting an empty folder to make
sure it is properly detected as deleted in subsequent requests.
This works around a problem with phpseclib where the folder is properly
deleted remotely but the stat cache was not updated.
2015-06-18 17:40:38 +02:00
Olivier Paroz
8193e1d7c1
Move media type icon preview creation to its own method
2015-06-18 13:24:15 +02:00
Lukas Reschke
21d261885d
Fix test
2015-06-17 12:11:09 +02:00
Vincent Petry
102c6ffc41
Normalize path in View's lock methods
2015-06-16 17:03:12 +02:00
Vincent Petry
e5d34a2733
Merge pull request #16892 from owncloud/lock-returnfullpath
...
Rethrow LockedException with full path
2015-06-16 16:47:10 +02:00
Joas Schilling
171f86ca2e
Only sort by group name when LDAP is involved
2015-06-16 11:10:00 +02:00
Joas Schilling
7d8b728066
Merge pull request #16832 from owncloud/memcache-fail
...
Throw exception if memcache misconfigured or missing
2015-06-16 11:00:18 +02:00
Joas Schilling
60005bea19
Merge pull request #16943 from owncloud/sabre-convertinvalidpath
...
Convert invalid path exception to sabre exception on MOVE
2015-06-16 10:49:22 +02:00
Vincent Petry
0e3a3dd5d7
Rethrow LockedException with full path
...
Because the path is converted to md5 from the original exception,
rethrow the exception with the correct full path
2015-06-16 10:48:31 +02:00
Lukas Reschke
fffef529ee
Adjust NullCache tests
2015-06-15 19:17:50 +02:00
Lukas Reschke
34f5541088
Add `no-store` to AppFramework
2015-06-15 18:35:41 +02:00
Vincent Petry
1f91e9e65d
Convert invalid path exception to sabre exception on MOVE
2015-06-15 17:49:11 +02:00
Thomas Müller
de3ed8e077
Merge pull request #16821 from owncloud/compare-and-delete-locking-watch
...
Compare and delete locking watch
2015-06-15 14:09:06 +02:00
Thomas Müller
b6165b6865
Merge pull request #16912 from owncloud/webdav-smalltransferlockfix
...
Webdav PUT small file lock must be shared during hooks
2015-06-15 11:30:59 +02:00
Vincent Petry
4497aa4c68
Webdav PUT small file lock must be shared during hooks
...
Fixed code path for Webdav PUT of small files to use shared locks during
hook execution, and exclusive during the file operation
This makes it possible for versions to be copied by accessing the file
in a post_write hook.
2015-06-12 18:52:18 +02:00
Robin Appelman
ac9f998abd
add compare-and-delete to the memcache interface
2015-06-12 17:28:09 +02:00
Vincent Petry
446f628136
Merge pull request #16886 from owncloud/webdav-verify-path-again
...
verify path when getting a node for sabredav
2015-06-12 16:45:20 +02:00
Vincent Petry
3b08b26589
Throw exception if memcache misconfigured or missing
...
Instead of falling back to null memcache, throw exceptions.
Also throw file locking specific exceptions in case the class is not
available.
2015-06-12 12:33:06 +02:00
Joas Schilling
a7d2b3b9ae
Add return value to lock methods and check it in tests
2015-06-12 11:41:05 +02:00
Robin Appelman
5a5639ab76
tests for getNodeForPath with invalid path
2015-06-11 17:25:06 +02:00
Lukas Reschke
dbe344ef3d
Merge pull request #16879 from jcfischer/jcf_fix_user_delete_message
...
Fix error message and add 'user' to it
2015-06-11 14:53:50 +02:00
Jens-Christian Fischer
bffadd069d
Fix test message and add 'user' to it
2015-06-11 13:44:38 +02:00
Joas Schilling
afa030c561
Check the query() for all defined services
2015-06-11 12:28:30 +02:00
Joas Schilling
05f1ff8715
Correctly import NullCache class
2015-06-11 10:48:30 +02:00
Thomas Müller
9d90421e62
Merge pull request #16803 from owncloud/issue/16801-group-reshare-part-file-enc-keys
...
Check if the part files has keys when the original file does not
2015-06-09 11:41:36 +02:00
Joas Schilling
05c2fc72d8
Add a test for the fallback to the part file keys
2015-06-08 16:35:37 +02:00
Thomas Müller
64c9c27f7e
Merge pull request #16382 from oparoz/providers-are-responsible-for-the-size-of-their-preview
...
Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly
2015-06-08 16:14:35 +02:00
Thomas Müller
a968b8409d
Merge pull request #16158 from owncloud/mountprovider-after-setup
...
Call newly registered mount providers after the filesystem is setup
2015-06-08 13:42:02 +02:00
Thomas Müller
f051b7381b
Merge pull request #16402 from owncloud/issue-15956-slow-group-usercount
...
Sort user groups by group name and hide the user count
2015-06-08 12:11:22 +02:00
Olivier Paroz
71d65cb713
Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly
...
* introduces a method in OC_Image which doesn't stretch images when trying to make them fit in a box
* adds the method to all key providers so that they can do their job, as expected by the Preview class
* improves the caching mechanism of Preview in order to reduce I/O and to avoid filling the available disk space
* fixes some long standing issues
* **contains mostly tests**
2015-06-06 16:25:04 +02:00
Lukas Reschke
cbb15f3cbd
Merge pull request #16767 from owncloud/webdav-preventdeleteroot
...
Prevent deleting Webdav root
2015-06-05 19:56:20 +02:00
Vincent Petry
b97be0ea02
Fix sabre directory test cases
...
- rely on a mock subfolder instead of the root
- remove obsolete "Shared" limitation tests which did pass but not for the right
reasons
- added test for the prevention of root deletion
2015-06-05 19:04:59 +02:00
Thomas Müller
85d1ca11d4
Merge pull request #16765 from owncloud/fix-chunked-upload-jenkins
...
Fix chunked upload jenkins
2015-06-05 16:20:33 +02:00
Thomas Müller
680a67712b
fix unit test
2015-06-05 15:30:20 +02:00
Thomas Müller
cd82b24edd
Bring back unit tests for \OC\Cache\File
2015-06-05 14:29:15 +02:00
Joas Schilling
249e54e34a
Add unit tests for InvalidPath Exception being thrown
2015-06-05 13:55:12 +02:00
Joas Schilling
bb0cb0aaec
Merge pull request #15895 from owncloud/dav-getremoteetag
...
Get etag from remote OC server
2015-06-03 17:20:25 +02:00
Lukas Reschke
bf07eb45e2
Fix unit tests
...
Regression caused by https://github.com/owncloud/core/pull/16721
Failed the unit tests as per https://ci.owncloud.org/job/server-master-linux/database=sqlite,label=SLAVE/1994/testReport/junit/(root)/Test_Encryption_ManagerTest/testGetEncryptionModuleUnknown/ :
```
Test\Encryption\ManagerTest::testGetEncryptionModuleUnknown
Failed asserting that exception message 'Module with id: unknown does not exist.' contains 'Module with id: unknown does not exists.'
```
2015-06-03 17:07:30 +02:00
Morris Jobke
2edcce7e2a
use not deprecated method in tests
2015-06-03 14:33:56 +02:00
Lukas Reschke
3a233b8698
Merge pull request #16714 from owncloud/fix-cors-test
...
Fix #16713
2015-06-03 13:52:14 +02:00
Morris Jobke
e3440863bc
Merge pull request #16708 from owncloud/enc_fix_move_to_trash
...
make sure that we always use the correct owner for both source and target
2015-06-03 13:49:46 +02:00
Bernhard Posselt
21ce5d034b
fix #16713
2015-06-03 12:56:50 +02:00
Joas Schilling
d3e3a84cae
Move the helpful method to the TestCase class
2015-06-03 12:33:29 +02:00
Bjoern Schiessle
7eb2b31e34
make sure that we always use the correct owner for both source and target
2015-06-03 11:59:06 +02:00
Vincent Petry
120588dd7a
Disable update check test when testing wrappers
...
The checkUpdate test is intended for testing real storages, not
wrappers.
2015-06-02 15:14:37 +02:00
Robin Appelman
0497534a6e
more type hints
2015-06-02 14:07:55 +02:00
Robin Appelman
8926bca0c7
phpdoc, strict and type hints
2015-06-02 14:07:55 +02:00
Robin Appelman
24131586d7
call mount providers that are registered after the filesystem is setup
2015-06-02 14:07:54 +02:00
Robin Appelman
4b48dd424f
emit hooks from a view as long as the path is inside the default root
2015-06-02 14:07:20 +02:00
Joas Schilling
50a31fa8f9
Add unit tests for wrapStorage
2015-06-02 12:33:17 +02:00
Vincent Petry
c4cb93e644
Added storage backend test for checkUpdate
...
This helps testing whether checkUpdate properly returns false when no
change exists
2015-06-02 11:42:03 +02:00
Morris Jobke
cf2c599218
Merge pull request #16200 from owncloud/kill-globalfilecache
...
Drop file caching
2015-06-02 09:11:33 +02:00
Thomas Müller
1acdef5e34
Merge pull request #16672 from owncloud/tests-xmlupdate
...
Fix phpunit xml
2015-06-01 21:31:39 +02:00
Vincent Petry
ac98480028
Fix phpunit xml
...
Rename/remove obsolete paths
2015-06-01 20:42:32 +02:00
Joas Schilling
1c47b14651
Merge pull request #16663 from owncloud/no-sense-to-check-for-cli
...
Remove check for RAW_POPULATE_POST_DATA for unit tests
2015-06-01 17:35:30 +02:00
Lukas Reschke
e6b0a7a55a
Remove check for RAW_POPULATE_POST_DATA for unit tests
...
We do have a work around meanwhile and for CLI this is not relevant at all. Can be removedWe do have a work around meanwhile and for CLI this is not relevant at all. Can be removed.
2015-06-01 16:35:54 +02:00
Robin Appelman
a1372b2fb5
add method to atomically change between shared and exclusive lock
2015-06-01 13:24:02 +02:00
Robin Appelman
c72ea9f7d7
unit test for releaseall
2015-06-01 13:22:56 +02:00
Robin Appelman
b98dd3ceb8
release all locks after test
2015-06-01 13:22:56 +02:00
Robin Appelman
d519aba878
fix test
2015-06-01 13:22:56 +02:00
Robin Appelman
7e418c7d69
high level locking wip
2015-06-01 13:22:56 +02:00
Thomas Müller
c700f42b68
Merge pull request #16517 from owncloud/remove-logo-wide
...
replace logo-wide on share page as well with better icon + text
2015-05-29 12:15:02 +02:00
Jan-Christoph Borchardt
9194603c31
change tests back to check for logo-wide, make them pass again
2015-05-28 23:39:55 +02:00
Vincent Petry
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
Vincent Petry
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
Bjoern Schiessle
5549641f1f
improve error messages displayed to the user
2015-05-27 21:00:02 +02:00
Thomas Müller
07c6e523b1
Merge pull request #16565 from owncloud/add-urandom-check
...
Add check for availability of /dev/urandom
2015-05-26 16:53:11 +02:00
Lukas Reschke
bc6d17ed74
Add check for availability of /dev/urandom
...
Without /dev/urandom being available to read the medium RNG will rely only on the following components on a Linux system:
1. MicroTime: microtime() . memory_get_usage() as seed and then a garbage collected microtime for loop
2. MTRand: chr((mt_rand() ^ mt_rand()) % 256)
3. Rand: chr((rand() ^ rand()) % 256)
4. UniqId: Plain uniqid()
An adversary with the possibility to predict the seed used by the PHP process may thus be able to predict future tokens which is an unwanted behaviour.
One should note that this behaviour is documented in our documentation to ensure that users get aware of this even without reading our documentation this will add a post setup check to the administrative interface.
Thanks to David Black from d1b.org for bringing this again to our attention.
2015-05-26 14:16:07 +02:00
Björn Schießle
f70c309c2d
Merge pull request #16561 from owncloud/add-default-timeout-back
...
Add connection timeout to default POST options
2015-05-26 12:23:57 +02:00
Vincent Petry
39c6a36488
Merge pull request #16532 from owncloud/cors-no-cookie-auth
...
Disallow cookie auth for cors requests
2015-05-26 12:12:04 +02:00
Björn Schießle
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
Thomas Müller
3babcd0344
Merge pull request #16339 from owncloud/master-override-channel
...
Allow change update channel via public API
2015-05-26 11:42:41 +02:00
Lukas Reschke
dff361dc5c
Add connection timeout to default POST options
...
Fixes https://github.com/owncloud/core/issues/16560
2015-05-26 11:22:50 +02:00
Vincent Petry
ce34edacfa
Merge pull request #16526 from owncloud/enc_fix_versions_webdav_upload
...
remove part file extension before we read a filekey
2015-05-22 16:42:52 +02:00
Bjoern Schiessle
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
Bernhard Posselt
c8e3599cad
disallow cookie auth for cors requests
...
testing ...
fixes
fix test
add php doc
fix small mistake
add another phpdoc
remove not working cors annotations from files app
2015-05-22 14:06:26 +02:00