Commit Graph

10197 Commits

Author SHA1 Message Date
Bjoern Schiessle 4ce5669419 read cipher from key header and always write a key header if a new private key is stored 2015-04-08 14:26:00 +02:00
Vincent Petry 69ba67ec0f Merge pull request #15464 from owncloud/fixmasterunittests
Replace originalStorage in tests with a proper teardown
2015-04-08 14:24:42 +02:00
Lukas Reschke c3c50fb481 Fix language level incompatibilties
Arbitrary expressions in empty are allowed in PHP 5.5 ands upwards. Seems to only affect master.

Fixed https://github.com/owncloud/core/issues/15463
2015-04-08 13:55:10 +02:00
Vincent Petry 4acf6747d2 Disable trashbin when testing orphaned shares deletion job 2015-04-08 13:04:06 +02:00
Thomas Müller 19834211b4 Merge pull request #15443 from owncloud/encryption-user-hook-tests
adding test for user hooks
2015-04-08 12:56:18 +02:00
Vincent Petry f8cfc03f36 Replace originalStorage in tests with a proper teardown
The purpose of $originalStorage in unit tests was to remount the old
root.
However that storage itself is already wrapped by storage wrapper, so
remounting it would rewrap the storage several times.

This fix makes use of "loginAsUser()" and "logout()" from the TestCase
class to properly initialize and cleanup the FS as expected.
2015-04-08 12:45:38 +02:00
Vincent Petry 9c3893ce69 Added FIXME about registering jobs in apps.php 2015-04-08 12:09:42 +02:00
James Anslow d53aa4a816 Fixing issue #15322 - showing Settings button next to gear icon 2015-04-08 11:57:33 +02:00
Vincent Petry 17b141337a Delete orphaned shares in a background job 2015-04-08 10:47:55 +02:00
Morris Jobke cefdcea021 [command] delete orphaned file cache entries
* ./occ files:cleanup
* delete file cache entries without an existing storage
2015-04-08 10:23:56 +02:00
Bjoern Schiessle 215a9bcbc3 fix function call 2015-04-08 09:32:55 +02:00
Clark Tomlinson 4098f5f7fd adding test for user hooks 2015-04-07 11:49:50 -04:00
Thomas Müller a4483243ac fixing license headers - encryption code related 2015-04-07 17:02:49 +02:00
Thomas Müller 54a3bdf1c5 fixing unit test execution related to trashbin 2015-04-07 13:30:31 +02:00
Clark Tomlinson d637bffac6 adding user setup test and adding 4 tests to keymanager 2015-04-07 13:30:31 +02:00
Clark Tomlinson 28c8017928 adding recoverFileTest 2015-04-07 13:30:31 +02:00
Clark Tomlinson c7c3caedf5 adding recovery tests 2015-04-07 13:30:31 +02:00
Thomas Müller 111fbabfb4 PHPDoc cleanup - clean code \o/ 2015-04-07 13:30:31 +02:00
Bjoern Schiessle b9e4e61759 userRecovery() was replaced by setRecoveryForUser() 2015-04-07 13:30:31 +02:00
Bjoern Schiessle 9a7fbbbc5a fix versions tests 2015-04-07 13:30:31 +02:00
Bjoern Schiessle a7e7151364 remove unused code 2015-04-07 13:30:31 +02:00
Bjoern Schiessle e8fa3a2370 fix versions download and previews 2015-04-07 13:30:31 +02:00
Bjoern Schiessle d3e887a7cf reset init status before login 2015-04-07 13:30:30 +02:00
Thomas Müller 8cf9b423d5 cleanup 2015-04-07 13:30:30 +02:00
Bjoern Schiessle fac7ec3fc4 fix re-shares with encryption 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 60d8a39f03 store init status per user 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 8b1a12a224 use loginHelper from base class 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 391fab35f0 reset storage for each unit test 2015-04-07 13:30:30 +02:00
Thomas Müller 4c899238e9 fixing unit test execution 2015-04-07 13:30:30 +02:00
Clark Tomlinson e507dc11a0 adding util test and reducing keymanager instances to one in test 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 2511c32e61 add more descriptive message to the exception, will be displayed to the user 2015-04-07 13:30:30 +02:00
Bjoern Schiessle ee53ba5ed6 remove encryption specific code from files app 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 5ea94b7c45 add priority to trashbin storage wrapper so that he is always on top 2015-04-07 13:30:30 +02:00
Thomas Müller 664b2bb7af cleaning up exception mess 2015-04-07 13:30:30 +02:00
Bjoern Schiessle de4ec21c39 work arround to make sure that shares are initialized only once 2015-04-07 13:30:30 +02:00
Thomas Müller feb9a6e216 Set human readable module ids 2015-04-07 13:30:30 +02:00
Thomas Müller 43c0af2580 Fix shouldEncrypt and don't throw exception id fileKey not present - can happen 2015-04-07 13:30:30 +02:00
Bjoern Schiessle a057108c0c make recovery key work 2015-04-07 13:30:30 +02:00
Thomas Müller cac83642f2 Finally fixing encryption with public share 2015-04-07 13:30:30 +02:00
Thomas Müller d203296e35 only encrypt files and files_versions 2015-04-07 13:30:30 +02:00
Thomas Müller 035646c0f6 fix exception handling 2015-04-07 13:30:30 +02:00
Bjoern Schiessle d90663704c fix hook registration 2015-04-07 13:30:29 +02:00
Clark Tomlinson 505e0eaf61 remove useless setup base class 2015-04-07 13:30:29 +02:00
Clark Tomlinson 1fb29ec546 adding hook manager test 2015-04-07 13:30:29 +02:00
Bjoern Schiessle c9ca068427 keyManagerTest: remove code which is no longer needed 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 4efbcb0280 cleanup keymanager test and add some additional tests 2015-04-07 13:30:29 +02:00
Bjoern Schiessle dac94679c6 delete recovery keys on disable 2015-04-07 13:30:29 +02:00
Clark Tomlinson ea6b53042d fixing test helper and undoing fubar in class... 2015-04-07 13:30:29 +02:00
Clark Tomlinson 48e3864c77 💯% coverage for session class 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 1358d07d35 let user enable recovery key 2015-04-07 13:30:29 +02:00
Bjoern Schiessle e4895bda01 add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files 2015-04-07 13:30:29 +02:00
Thomas Müller bd933b1c85 Adding app icon and fixing admin setting 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 6bd83c0422 register settings and hooks only once 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 4b4aeaa5b2 fix set recovery key and implement change password 2015-04-07 13:30:29 +02:00
Thomas Müller a98b7dbf6f Fix double registration of encryption module 2015-04-07 13:30:29 +02:00
Thomas Müller 3458b5ab4c Remove old encryption left overs from trashbin 2015-04-07 13:30:29 +02:00
Thomas Müller f5638d9163 Fix settings 2015-04-07 13:30:29 +02:00
Thomas Müller bf809ac85a Removing left overs from old encryption app 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 4843e5ce30 use password change logic to userhooks to avoid recursions 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 0f28d538a0 add session class to handle all session operations 2015-04-07 13:30:28 +02:00
Clark Tomlinson e6dc6944c2 moving methods to their final places
and updating test some.
2015-04-07 13:30:28 +02:00
Thomas Müller 1b42b492dc kill OC_FileProxy 💥 2015-04-07 13:30:28 +02:00
Thomas Müller dbdd754c3f Further cleanup of files_encryption 2015-04-07 13:30:28 +02:00
Thomas Müller 00338f9dca Removing files_encryption left overs 2015-04-07 13:30:28 +02:00
Bjoern Schiessle e7a68d1c21 remove old encryption app 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 0eee3a2618 remove unencrypted_size from the cache, size will contain the unencrypted size 2015-04-07 13:30:28 +02:00
Thomas Müller a905f641b3 various fixes & start to unit test the encryption storage wrapper 2015-04-07 13:30:28 +02:00
Bjoern Schiessle a85e2e0bfd make recovery settings work 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 2331298380 fix parameter declaration and class initialisation 2015-04-07 13:30:28 +02:00
Thomas Müller 48fc3f3afe fix unit test execution, variable naming and kill no longer used $cacheFactory 2015-04-07 13:30:28 +02:00
Bjoern Schiessle c64e0af4fb check if recovery key exists and encrypt the file with the recovery key if needed 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 24c6604388 add public link share key to file if it was shared as public link 2015-04-07 13:30:28 +02:00
Bjoern Schiessle bd99042a66 add setting templates 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 37e8268447 make sharing and unsharing work 2015-04-07 13:30:27 +02:00
Clark Tomlinson d15c2e52b0 cleanup and removing cachefactory 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 2e00acda07 read encrypted files 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 6c9251d9f8 make sure that all file keys are written to the key storage 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 198b73fe32 write encrypted file to disc 2015-04-07 13:30:27 +02:00
Thomas Müller 7ffd77fac9 enable encryption unit test execution 2015-04-07 13:30:27 +02:00
Bjoern Schiessle c00e728e5f encryption app: remove legacy code, we do only server-side encryption 2015-04-07 13:30:27 +02:00
Thomas Müller ecb3834554 fixing obvious bugs while testing 2015-04-07 13:30:27 +02:00
Clark Tomlinson 0c2f9ca849 Updating keystorage movement and fixing hooks 2015-04-07 13:30:27 +02:00
Clark Tomlinson 39733c8da1 Initial commit 2015-04-07 13:30:27 +02:00
Joas Schilling e16d61e293 Remove server timezone dependency from files list test 2015-04-07 10:12:15 +02:00
Jenkins for ownCloud 95e55aa4ad [tx-robot] updated from transifex 2015-04-07 01:54:47 -04:00
Jenkins for ownCloud 2bff92ade5 [tx-robot] updated from transifex 2015-04-05 01:54:51 -04:00
Thomas Müller 4996706078 Merge pull request #15338 from owncloud/encryption-mount-option
Add mount point to disable the encryption wrapper
2015-04-04 12:51:41 +02:00
Jenkins for ownCloud 9b250baf9e [tx-robot] updated from transifex 2015-04-04 01:54:43 -04:00
Thomas Müller 3bf269e565 Merge pull request #15229 from owncloud/response-setContentLengthHeader
Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround...
2015-04-03 22:51:36 +02:00
Jenkins for ownCloud 23f1702f24 [tx-robot] updated from transifex 2015-04-03 01:54:53 -04:00
Robin Appelman 519d568847 add unit test 2015-04-02 18:31:26 +02:00
Robin Appelman 10b85871cc adjust unt tests 2015-04-02 18:17:28 +02:00
Thomas Müller 4082436419 Merge pull request #15367 from owncloud/pre-setup-hook
setup storage wrappers before setting up the filesystem
2015-04-02 17:40:23 +02:00
Jenkins for ownCloud cc96105ebe [tx-robot] updated from transifex 2015-04-02 01:54:47 -04:00
Robin Appelman 3cb53b7756 setup storage wrappers before setting up the filesystem 2015-04-01 17:12:06 +02:00
Roeland Jago Douma 9e3dcd01bc Use URLGenerator instread of OC_Helper 2015-04-01 14:57:01 +02:00
Roeland Douma 8ff94f0d15 Merge pull request #15356 from rullzer/apps_oc_to_ocs
Move core apps from private to public functions (trivial part)
2015-04-01 13:24:54 +02:00
Joas Schilling 730efe25a4 Make scrutinizer happy 2015-04-01 12:13:49 +02:00
Roeland Jago Douma 2b81d0f237 Move core apps from private to public functions
Apps still use OC_Helper and OC_Util functions even when public ones are
already available. Sometimes the public one is even used in the same
file.
2015-04-01 12:06:04 +02:00
Morris Jobke 297e29248d Merge pull request #15336 from owncloud/revive-15215
Properly quote file names in listFiles query for GDrive
2015-04-01 10:35:39 +02:00