Joas Schilling
aa5f037af7
chore: apply changes from Nextcloud coding standards 1.1.1
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
2 years ago
Côme Chilliet
8900d030d1
Adapt code to new encryption system
fileKey gets deleted upon save as it’s stored in shareKeys instead now.
We use presence of a fileKey to detect if a file is using the legacy
system or the new one, because we do not always have access to header
data.
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
3 years ago
Carl Schwan
aeecb72e96
Fix a few psalm issues and moved back to psalm/phar 4.18
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
4 years ago
John Molakvoæ (skjnldsv)
215aef3cbd
Update php licenses
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
5 years ago
Christoph Wurst
caff1023ea
Format control structures, classes, methods and function
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.
This also removes and empty lines from method/function bodies at the
beginning and end.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
6 years ago
Christoph Wurst
41b5e5923a
Use exactly one empty line after the namespace declaration
For PSR2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
6 years ago
Christoph Wurst
1a9330cd69
Update the license headers for Nextcloud 19
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
6 years ago
Christoph Wurst
b80ebc9674
Use the short array syntax, everywhere
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
6 years ago
Daniel Kesselberg
8f403b66d1
Fix Argument 3 passed to OCA\Encryption\Recovery::__construct() must be an instance of OCA\Encryption\KeyManager
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
6 years ago
Christoph Wurst
5bf3d1bb38
Update license headers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
6 years ago
Roeland Jago Douma
68748d4f85
Some php-cs fixes
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years ago
Joas Schilling
16d47b5928
Fix wrongly mixed mock objects in encryption tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago
Joas Schilling
813f0a0f40
Fix apps/
10 years ago
Lukas Reschke
aba539703c
Update license headers
10 years ago
Joas Schilling
4a3311f430
Move Encryption app to PSR-4 ( #24524 )
* Move Encryption to PSR-4
* Move encryption tests to PSR-4
* Fix the tests
10 years ago
Lukas Reschke
c353d51810
Remove Scrutinizer Auto Fixer
10 years ago
Thomas Müller
682821c71e
Happy new year!
10 years ago
Lukas Reschke
0654d37da8
Remove undefined variable
10 years ago
Lukas Reschke
00a01a8de2
Fix PHPDoc + Add handling for error cases
Makes static code analyzers happier.
10 years ago
Scrutinizer Auto-Fixer
be4c3a8b56
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
10 years ago
Morris Jobke
b945d71384
update licence headers via script
10 years ago
Bjoern Schiessle
854fd63ea9
use uid as additional information for salt
11 years ago
Bjoern Schiessle
62bc0e5264
use password hash instead of the plain password to encrypt the private key
11 years ago
Morris Jobke
f63915d0c8
update license headers and authors
11 years ago
Bjoern Schiessle
70a44621be
check recovery setting for the right user
11 years ago
Bjoern Schiessle
389a101de6
make sure that encrypted private keys always have a header
11 years ago
Bjoern Schiessle
4ce5669419
read cipher from key header and always write a key header if a new private key is stored
11 years ago
Thomas Müller
a4483243ac
fixing license headers - encryption code related
11 years ago
Bjoern Schiessle
a057108c0c
make recovery key work
11 years ago
Bjoern Schiessle
4efbcb0280
cleanup keymanager test and add some additional tests
11 years ago
Bjoern Schiessle
dac94679c6
delete recovery keys on disable
11 years ago
Bjoern Schiessle
1358d07d35
let user enable recovery key
11 years ago
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
11 years ago
Bjoern Schiessle
4b4aeaa5b2
fix set recovery key and implement change password
11 years ago
Clark Tomlinson
e6dc6944c2
moving methods to their final places
and updating test some.
11 years ago
Clark Tomlinson
0c2f9ca849
Updating keystorage movement and fixing hooks
11 years ago
Clark Tomlinson
39733c8da1
Initial commit
11 years ago