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

59 commits

Author SHA1 Message Date
Joas Schilling
4a3311f430 Move Encryption app to PSR-4 (#24524) 
* Move Encryption to PSR-4

* Move encryption tests to PSR-4

* Fix the tests
 2016-05-12 09:42:19 +02:00
Bjoern Schiessle
d86f8ba5f8
if we don't have a encrypted file key we can return a empty string right away 2016-04-26 11:06:55 +02:00
Vincent Petry
b50d3255fb Merge pull request #22791 from owncloud/enc_master_key_improvements 
Enc master key improvements
 2016-04-21 11:48:26 +02:00
Thomas Müller
50e20e531e
Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 2016-04-15 15:07:40 +02:00
Bjoern Schiessle
89223379ad replaceUserKeys() actually deletes the users keys -> update method name and doc-block 2016-03-18 11:06:14 +01:00
Bjoern Schiessle
5e267589d4 only create and update user specific key if no master key is enabled 2016-03-18 11:06:14 +01:00
Lukas Reschke
c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Lukas Reschke
933f60e314 Update author information 
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
 2016-03-01 17:25:15 +01:00
Bjoern Schiessle
95ea2ccb53 make decrypt all work with the master key 2016-02-29 14:54:32 +01:00
Vincent Petry
45c78476f5 Use cache update instead of put for encryption version 
Saves a call to fetch the file id which didn't even work for a reason.

This fix properly sets the version in the database.
 2016-02-09 23:43:28 +01:00
Lukas Reschke
6724f76573 Use cache and add tests 2016-02-09 23:43:27 +01:00
Lukas Reschke
5ccb9dfa7e Use database for keeping track of the version 2016-02-09 23:43:27 +01:00
Lukas Reschke
b5824f024a Keep track of file version 
This way it is not possible anymore for an external storage admin to put up old versions of the file.
 2016-02-09 23:43:26 +01:00
Thomas Müller
e0aa6e01ab Merge pull request #21612 from owncloud/fix_21598 
fix public link sharing if the master key is enabled
 2016-01-13 10:34:48 +01:00
Thomas Müller
682821c71e Happy new year! 2016-01-12 15:02:18 +01:00
Björn Schießle
46f6c289ca only use master key ID if a user is logged in. Otherwise keep the public link share key 2016-01-11 13:09:06 +01:00
Lukas Reschke
00a01a8de2 Fix PHPDoc + Add handling for error cases 
Makes static code analyzers happier.
 2016-01-07 21:30:44 +01:00
Scrutinizer Auto-Fixer
be4c3a8b56 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-11-27 15:32:44 +00:00
Bjoern Schiessle
acfc7d7c4d enable usage of a master key 2015-09-07 16:08:41 +02:00
Bjoern Schiessle
854fd63ea9 use uid as additional information for salt 2015-08-07 15:51:43 +02:00
Bjoern Schiessle
62bc0e5264 use password hash instead of the plain password to encrypt the private key 2015-08-07 15:21:08 +02:00
Bjoern Schiessle
1e284b15ff only create new key pair if both keys are missing 2015-07-08 19:08:41 +02:00
Bjoern Schiessle
ccbefb6e75 delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories 2015-05-13 19:06:23 +02:00
Bjoern Schiessle
70a44621be check recovery setting for the right user 2015-04-30 11:38:53 +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
Thomas Müller
c6e243928c move creation of shared key to the login handler - fixes #15705 2015-04-17 17:51:18 +02: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
Thomas Müller
fc4127dd62 add $encryptionModuleId to methods of Keys/IStorage 2015-04-22 11:53:05 +02:00
Bjoern Schiessle
389a101de6 make sure that encrypted private keys always have a header 2015-04-15 19:52:48 +02: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
a4483243ac fixing license headers - encryption code related 2015-04-07 17:02:49 +02:00
Thomas Müller
4c899238e9 fixing unit test execution 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
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
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
Bjoern Schiessle
1358d07d35 let user enable recovery key 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
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
Bjoern Schiessle
a85e2e0bfd make recovery settings work 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