Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add check for availability of /dev/urandom | Lukas Reschke | 2015-05-26 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | 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. | ||||
* | Get correct mimetype when moving and changing extension | Vincent Petry | 2015-05-21 | 1 | -7/+19 |
| | | | | | | | | 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. | ||||
* | Merge pull request #16322 from owncloud/trash-view | Morris Jobke | 2015-05-20 | 1 | -12/+25 |
|\ | | | | | dont go trough the view when moving to trash | ||||
| * | add tests for copyFromStorage with same storage | Robin Appelman | 2015-05-19 | 1 | -12/+25 |
| | | |||||
* | | Merge pull request #16075 from owncloud/skeleton-copy-delay | Vincent Petry | 2015-05-20 | 2 | -5/+4 |
|\ \ | | | | | | | wait with copying the skeleton untill login and setupfs are done | ||||
| * | | fix tests | Robin Appelman | 2015-05-18 | 1 | -5/+1 |
| | | | |||||
| * | | fix tests | Robin Appelman | 2015-05-18 | 1 | -1/+3 |
| | | | |||||
| * | | fix tests | Robin Appelman | 2015-05-18 | 1 | -0/+1 |
| | | | |||||
* | | | Add support for disallowing domains to the ContentSecurityPolicy | Lukas Reschke | 2015-05-20 | 1 | -0/+216 |
| | | | | | | | | | | | | | | | | | | For enhanced security it is important that there is also a way to disallow domains, including the default ones. With this commit every method gets added a new "disallow" function. | ||||
* | | | Merge pull request #16446 from owncloud/fix-url-generation | Lukas Reschke | 2015-05-20 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Fix URL generation | ||||
| * | | | Added unit tests for download URL in public sharing page | Vincent Petry | 2015-05-19 | 1 | -1/+2 |
| | | | | |||||
* | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-05-19 | 2 | -2/+0 |
|/ / / | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | | Merge pull request #16420 from owncloud/update-useconfigtableprefix | Morris Jobke | 2015-05-19 | 1 | -1/+28 |
|\ \ \ | | | | | | | | | Add unit test for migrator with different prefix | ||||
| * | | | Add unit test for migrator with different prefix | Vincent Petry | 2015-05-19 | 1 | -1/+28 |
| | | | | |||||
* | | | | Merge pull request #15965 from owncloud/conditional-logging | Thomas Müller | 2015-05-19 | 1 | -3/+27 |
|\ \ \ \ | |/ / / |/| | | | Conditional logging | ||||
| * | | | Conditional logging | Morris Jobke | 2015-05-08 | 1 | -3/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Log condition for log level increase based on conditions. Once one of these conditions is met, the required log level is set to debug. This allows to debug specific requests, users or apps * Supported conditions (setting `log_condition` in `config.php`): - `shared_secret`: if a request parameter with the name `log_secret` is set to this value the condition is met - `users`: if the current request is done by one of the specified users, this condition is met - `apps`: if the log message is invoked by one of the specified apps, this condition is met * fix unit test and add app log condition test | ||||
* | | | | Merge pull request #16412 from owncloud/jknockaert-patch-1 | Björn Schießle | 2015-05-18 | 1 | -2/+10 |
|\ \ \ \ | |_|_|/ |/| | | | fix #16356 | ||||
| * | | | add a unit test to make sure that we don't try to read a file during a write ↵ | Bjoern Schiessle | 2015-05-18 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | operation | ||||
* | | | | Merge pull request #16399 from owncloud/enc_rmdir_fix | Clark Tomlinson | 2015-05-18 | 1 | -7/+74 |
|\ \ \ \ | |/ / / |/| | | | [encryption] only try to delete file keys if it is a valid path | ||||
| * | | | only try to delete file keys if it is a valid path | Bjoern Schiessle | 2015-05-18 | 1 | -7/+74 |
| | | | | |||||
* | | | | Merge pull request #15980 from owncloud/jknockaert-patch-1 | Björn Schießle | 2015-05-18 | 1 | -10/+11 |
|\ \ \ \ | |_|_|/ |/| | | | fix bug #15973 | ||||
| * | | | correct testSeek | jknockaert | 2015-05-18 | 1 | -4/+4 |
| | | | | |||||
| * | | | work on tests | jknockaert | 2015-05-18 | 1 | -10/+11 |
| | | | | | | | | | | | | Tests reorganised and extended | ||||
* | | | | Merge pull request #16243 from owncloud/error_if_download_failed | Vincent Petry | 2015-05-18 | 2 | -3/+9 |
|\ \ \ \ | | | | | | | | | | | redirect to error page if download failed | ||||
| * | | | | a new approach to display the error message | Bjoern Schiessle | 2015-05-18 | 2 | -3/+9 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #16364 from owncloud/add-warning-webdav | Morris Jobke | 2015-05-18 | 1 | -0/+65 |
|\ \ \ \ | |/ / / |/| | | | Add notice that WebDAV interface is not intended for browsers | ||||
| * | | | Add unit tests for \OC\Connector\Sabre\DummyGetResponsePlugin | Lukas Reschke | 2015-05-15 | 1 | -0/+65 |
| | | | | |||||
* | | | | Merge pull request #15978 from owncloud/feature/fix-encryption-tooltips | Thomas Müller | 2015-05-15 | 1 | -9/+9 |
|\ \ \ \ | | | | | | | | | | | [enc2]fixing recovery tooltip | ||||
| * | | | | fixing test | Clark Tomlinson | 2015-05-11 | 1 | -9/+9 |
| | | | | | |||||
* | | | | | Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota | Vincent Petry | 2015-05-15 | 1 | -9/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | Validate the quota value to be a correct value | ||||
| * | | | | | Validate the quota value to be a correct value | Thomas Müller | 2015-05-07 | 1 | -9/+10 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #15811 from owncloud/exception-on-lost-ldap-connection | Thomas Müller | 2015-05-15 | 1 | -0/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | throw exception when LDAP Connection was lost | ||||
| * | | | | | do not execute integration tests when executing autotest.sh | Thomas Müller | 2015-05-15 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #16292 from owncloud/webdav-storage-fireprehooks | Joas Schilling | 2015-05-15 | 2 | -38/+306 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fire prehooks when uploading directly to storage | ||||
| * | | | | | | Fire prehooks when uploading directly to storage | Vincent Petry | 2015-05-13 | 2 | -38/+306 |
| | | | | | | | |||||
* | | | | | | | Properly log out test users in unit tests | Vincent Petry | 2015-05-15 | 1 | -0/+2 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge pull request #16276 from owncloud/dav-quota-root | Robin Appelman | 2015-05-13 | 1 | -1/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | fix webdav quota check for the root of the dav endpoint | ||||
| * | | | | | Added unit test to quota plugin for free_space argument | Vincent Petry | 2015-05-13 | 1 | -1/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #16228 from owncloud/enc_fix_restore | Björn Schießle | 2015-05-12 | 2 | -14/+112 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | use hooks to update encryption keys | ||||
| * | | | | | use hooks to update encryption keys instead of the storage wrapper if a file ↵ | Bjoern Schiessle | 2015-05-11 | 2 | -14/+112 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | gets renamed/restored, as long as we are in the storage wrapper the file cache isn't up-to-date | ||||
* | | | | | Merge pull request #16233 from owncloud/enc_fix_check_if_file_is_excluded | Morris Jobke | 2015-05-12 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | fix check if a file is excluded from encryption | ||||
| * | | | | | fix check if file is excluded from encryption | Bjoern Schiessle | 2015-05-11 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Use insertIfNotExists to avoid problems with parallel calls | Joas Schilling | 2015-05-11 | 1 | -4/+6 |
| | | | | | |||||
* | | | | | Add a test for parallel insert | Joas Schilling | 2015-05-11 | 1 | -12/+29 |
| | | | | | |||||
* | | | | | Always test the object and the legacy class | Joas Schilling | 2015-05-11 | 1 | -59/+127 |
|/ / / / | |||||
* | | | | \OC\Connector\Sabre\CopyEtagHeaderPlugin constructor does not take arguments. | Andreas Fischer | 2015-05-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #16035 from ↵ | Thomas Müller | 2015-05-07 | 2 | -15/+37 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/issue-15975-occ-encryption-enable-warning-no-module Display a message when there is a problem with the default module | ||||
| * | | | | Display a message when there is a problem with the default module | Joas Schilling | 2015-05-04 | 2 | -15/+37 |
| | | | | | |||||
* | | | | | Fix missing types on doc block and deduplicate the method name | Joas Schilling | 2015-05-06 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | move/copy from storage | Bjoern Schiessle | 2015-05-06 | 1 | -9/+10 |
| | | | | |