wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
28843 commits 157 branches 562 tags 714 MiB
Commit graph

274 commits

Author SHA1 Message Date
Jenkins for ownCloud
aa0d439ed9 [tx-robot] updated from transifex 2015-05-02 01:54:49 -04:00
Joas Schilling
4a6808a0f4 Simplify the test 2015-04-30 12:04:02 +02:00
Bjoern Schiessle
4ef9df8750 skip user if we don't have a public key 2015-04-30 12:04:02 +02:00
Bjoern Schiessle
70a44621be check recovery setting for the right user 2015-04-30 11:38:53 +02:00
Clark Tomlinson
4209757d61 Merge pull request #15919 from owncloud/enc_handle_empty_files 
Encryption improve handling of empty and unencrypted files
 2015-04-29 19:32:02 -04:00
Björn Schießle
6ebb021359 Merge pull request #15911 from owncloud/enc_create_header_for_new_key 
make sure that we create a header for the encrypted private key
 2015-04-29 09:43:54 +02:00
Lukas Reschke
3e06fd9342 Merge pull request #15706 from owncloud/fix-15705-master 
move creation of shared key to the login handler
 2015-04-29 09:36:34 +02:00
Bjoern Schiessle
29bcfb2fdb method shouldn't be static 2015-04-28 20:21:53 +02:00
Bjoern Schiessle
d5cbb66b66 also create encryption keys for empty files 2015-04-28 20:21:53 +02:00
Bjoern Schiessle
df428b76ac skip update of encryption keys if file is not encrypted 2015-04-28 20:21:53 +02:00
Bjoern Schiessle
7d05f387fb make sure that we create a header for the encrypted private key 2015-04-28 13:00:09 +02:00
Bjoern Schiessle
27683f9442 fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header 2015-04-27 13:01:18 +02:00
Clark Tomlinson
8c0856779b change error codes to 400 2015-04-24 09:42:02 -04:00
Vincent Petry
cc3bc6345b Only get encryption status when logged in 
This removes useless warnings in the logs.
 2015-04-23 13:06:00 +02:00
Jenkins for ownCloud
f8f354b351 [tx-robot] updated from transifex 2015-04-23 01:54:51 -04:00
Clark Tomlinson
29168665cb fix messages from settings crontroller 2015-04-22 13:26:06 -04:00
Clark Tomlinson
e3ec1a8bb8 remove status's and adjust js 2015-04-22 11:07:56 -04:00
Clark Tomlinson
1747117edf destupify tests 2015-04-22 10:46:56 -04:00
Clark Tomlinson
c81bc152d7 fixing return values and adding tests 2015-04-22 10:46:55 -04:00
Thomas Müller
fc4127dd62 add $encryptionModuleId to methods of Keys/IStorage 2015-04-22 11:53:05 +02:00
Jenkins for ownCloud
d7bdf60559 [tx-robot] updated from transifex 2015-04-22 01:55:38 -04:00
Morris Jobke
4b968da9e6 Merge pull request #15713 from owncloud/fix-15707-master 
[enc2] Fixing JS errors
 2015-04-21 12:47:43 +02:00
Thomas Müller
490e779424 doc and indent 2015-04-21 12:19:15 +02:00
Thomas Müller
4a2f8f81ca Don't pollute the global namespace 2015-04-21 12:01:56 +02:00
Jenkins for ownCloud
c548066d2c [tx-robot] updated from transifex 2015-04-21 01:55:37 -04:00
Thomas Müller
55962c5f5a make jshint happy 
This reverts commit ae681f0061.
 2015-04-20 20:51:15 +02:00
Thomas Müller
3bc5c1c3cf use a simple function - OC.Encryption is already defined - fixes #15707 
This reverts commit 0ca6398aa3.
 2015-04-20 20:50:08 +02:00
Thomas Müller
b78e76a1cb Merge pull request #15677 from owncloud/enc_reset_private_key_password 
[encryption] let user update the private key password
 2015-04-20 20:48:12 +02:00
Joas Schilling
04674c06cc Dont use the old .status way 2015-04-20 18:26:14 +02:00
Joas Schilling
3f96662609 Fix several minor things 2015-04-20 17:44:34 +02:00
Jenkins for ownCloud
fd3c1484ad [tx-robot] updated from transifex 2015-04-19 01:54:41 -04:00
Jenkins for ownCloud
37a871127b [tx-robot] updated from transifex 2015-04-18 01:55:19 -04:00
Bjoern Schiessle
d0a6fb1f2c let user update the private key password in case the login password was changed from outside 2015-04-17 20:11:22 +02:00
Thomas Müller
ae681f0061 Revert "make jshint happy" 
This reverts commit a255866a93.
 2015-04-17 18:02:08 +02:00
Thomas Müller
0ca6398aa3 Revert "use a simple function - OC.Encryption is already defined - fixes #15707" 
This reverts commit c1a60a2349.
 2015-04-17 18:02:00 +02:00
Thomas Müller
a255866a93 make jshint happy 2015-04-17 17:59:53 +02:00
Thomas Müller
c1a60a2349 use a simple function - OC.Encryption is already defined - fixes #15707 2015-04-17 17:57:17 +02:00
Thomas Müller
c6e243928c move creation of shared key to the login handler - fixes #15705 2015-04-17 17:51:18 +02:00
Thomas Müller
2e803fd2cd Do not concat translation string 2015-04-17 14:26:58 +02:00
Thomas Müller
d9f23c0578 fixing undefined variable 2015-04-17 14:25:57 +02:00
Thomas Müller
295839930a Merge pull request #15686 from owncloud/enc_fix_change_password 
fix change password if no user is logged in, occ call
 2015-04-17 14:14:29 +02:00
Bjoern Schiessle
195a48b2b8 fix change password if no user is logged in, occ call 2015-04-17 13:26:38 +02:00
Bjoern Schiessle
7d4b1b52d0 always create a new instance of the encryption module 2015-04-17 10:31:33 +02:00
Jenkins for ownCloud
da44df2cfa [tx-robot] updated from transifex 2015-04-17 01:55:37 -04:00
Clark Tomlinson
ac133e9faa Merge pull request #15675 from owncloud/enc_error_messages 
[encryption] display warning if password changed or if the keys are not initialized
 2015-04-16 09:45:09 -04:00
Clark Tomlinson
1174ad0681 Merge pull request #15445 from owncloud/enc2_migration 
add migration script from old encryption to new one
 2015-04-16 09:34:47 -04:00
Bjoern Schiessle
e93f262eac display warning if password changed or if the keys are not initialized 2015-04-16 14:30:19 +02:00
Bjoern Schiessle
959665003b decrypt private key for public shares correctly 2015-04-16 14:15:04 +02:00
Bjoern Schiessle
6bcf88ca96 fix decryption of legacy private key 2015-04-16 14:15:04 +02:00
Bjoern Schiessle
e7a4f4f3e4 add version 2015-04-16 14:15:04 +02:00
Bjoern Schiessle
e3d77c4b01 add migration script from old encryption to new one 2015-04-16 14:15:04 +02:00
Jenkins for ownCloud
8606b7ca66 [tx-robot] updated from transifex 2015-04-16 01:54:43 -04:00
Bjoern Schiessle
389a101de6 make sure that encrypted private keys always have a header 2015-04-15 19:52:48 +02:00
Jenkins for ownCloud
7f3f191ee9 [tx-robot] updated from transifex 2015-04-14 18:19:31 -04:00
Thomas Müller
cbe30f740e remove calculateUnencryptedSize() - not needed 2015-04-14 13:08:59 +02:00
Thomas Müller
f816acde27 fix reading of private key 2015-04-14 12:23:25 +02:00
Bjoern Schiessle
d1fa3c6b32 add unit test for crypt.php 2015-04-10 15:12:57 +02:00
Lukas Reschke
0bad8f644a Merge pull request #15511 from owncloud/fix-typos 
Fix typos and some other adjustments
 2015-04-09 19:23:27 +02:00
Lukas Reschke
ec69f2838c Fix typos and some other adjustments 2015-04-09 14:09:09 +02:00
Lukas Reschke
96e7f607d5 Remove unneeded file 2015-04-09 13:29:51 +02:00
Lukas Reschke
4ca6419475 Fix PHPDoc 2015-04-09 10:54:53 +02:00
Lukas Reschke
3aad47c0f0 Fix code style 2015-04-09 10:46:46 +02:00
Lukas Reschke
d869f8212b Enforce string as passed type 2015-04-09 10:45:50 +02:00
Clark Tomlinson
fc2711e156 Merge pull request #15472 from owncloud/enc_backward_compatibility 
make private key handling backward compatible
 2015-04-08 09:38:27 -04:00
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
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
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
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
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
Thomas Müller
8cf9b423d5 cleanup 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
Thomas Müller
664b2bb7af cleaning up exception mess 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
f5638d9163 Fix settings 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
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