Commit Graph

151 Commits

Author SHA1 Message Date
Bjoern Schiessle 1e284b15ff only create new key pair if both keys are missing 2015-07-08 19:08:41 +02:00
Bjoern Schiessle 876d7c160d more secure way to update the database 2015-07-08 13:26:53 +02:00
Morris Jobke f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Joas Schilling d3e3a84cae Move the helpful method to the TestCase class 2015-06-03 12:33:29 +02:00
Bjoern Schiessle 68db3059ee detect migration status 2015-05-27 21:00:02 +02:00
Joas Schilling 30d165ebf2 Add missing import for the exception 2015-05-18 15:45:47 +02:00
Joas Schilling 4444db61b7 Add a unit test for the decrypt method 2015-05-18 15:45:11 +02:00
Bjoern Schiessle 7676166254 add l10n to constructor 2015-05-18 15:43:53 +02:00
Vincent Petry 86cf8e1f68 Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash
also encrypt files in trash bin
2015-05-18 14:59:34 +02:00
Bjoern Schiessle 7d492fefae also encrypt files in trash bin 2015-05-18 12:51:47 +02:00
Bjoern Schiessle 887be709f5 a new approach to display the error message 2015-05-18 10:15:17 +02:00
Björn Schießle 2ce01ee0bf Merge pull request #15938 from owncloud/enc_update_recovery_share_key
[encryption] check recovery key setting for the correct user
2015-05-05 10:48:09 +02:00
Thomas Müller 0f7b8dd338 Merge pull request #15752 from owncloud/feature/fix-encryption-return-values
[enc2] fixing return values and adding tests
2015-05-04 11:44:15 +02: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
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
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 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
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
Bjoern Schiessle 195a48b2b8 fix change password if no user is logged in, occ call 2015-04-17 13:26:38 +02:00
Bjoern Schiessle 959665003b decrypt private key for public shares correctly 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
Bjoern Schiessle d1fa3c6b32 add unit test for crypt.php 2015-04-10 15:12:57 +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
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 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
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
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
Clark Tomlinson e6dc6944c2 moving methods to their final places
and updating test some.
2015-04-07 13:30:28 +02:00
Clark Tomlinson d15c2e52b0 cleanup and removing cachefactory 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
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