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 |