averello/nextcloud-server-mirror
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-04 18:28:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,289 Commits 712 Branches 1,186 Tags
c9639f3956e4591f57718d3f2be512e4cdfd2bba
Commit Graph

234 Commits

Author SHA1 Message Date
Christoph Wurst
2a054e6c04 Update the license headers for Nextcloud 20 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-08-24 14:54:25 +02:00
Morris Jobke
da584462d1 Merge pull request #22018 from nextcloud/bugfix/noid/harden-key-generation 
Harden SSE key generation
 2020-08-19 20:42:34 +02:00
Morris Jobke
5a064ec28b Fix typo in error message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-19 20:42:27 +02:00
Roeland Jago Douma
2bbb848c31 Add legacy scanning command 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-08-19 15:45:45 +02:00
Roeland Jago Douma
8928bbe969 Make legacy cipher opt in 
* Systems that upgrade have this enabled by default
* New systems disable it
* We'll have to add some wargning in the setup checks if this is enabled

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-08-19 15:45:45 +02:00
Daniel Kesselberg
6f8147b18f Fix some MissingDocblockType or InvalidDocblock warnings. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-08-14 15:10:48 +02:00
Julius Härtl
36cfdd320b Harden key generation 
There might be cases where multiple requests trigger the key generation
at the same time and the instance ends up with a non-fitting
public/private key pair. Therefore the whole key generation should be
locked. Other than that this makes sure that user key generation return
values are properly validated.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-08-14 07:58:40 +02:00
Roeland Jago Douma
9975b80d41 SSE enhancement 
Do not blind concatenate ints. Lets add a _ between them. So that we can
distrinquis them properly

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-08-11 19:26:41 +02:00
Julius Härtl
fc1596fada Encryption is ready if master key is enabled 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-07-21 09:16:43 +02:00
Joas Schilling
d7c0b9cced Also always return in app commands 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-06-26 15:12:11 +02:00
Christoph Wurst
cb057829f7 Update license headers for 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-29 11:57:22 +02:00
Christoph Wurst
734c62bee0 Format code according to PSR2 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:56:50 +02:00
Christoph Wurst
28f8eb5dba Add visibility to all constants 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:54:27 +02:00
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>
 2020-04-10 14:19:56 +02:00
Christoph Wurst
14c996d982 Use elseif instead of else if 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 10:35:09 +02:00
Christoph Wurst
44577e4345 Remove trailing and in between spaces 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 16:07:47 +02:00
Christoph Wurst
42625a46be Remove spaces after method or function call 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 16:05:56 +02:00
Christoph Wurst
afbd9c4e6e Unify function spacing to PSR2 recommendation 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 13:54:22 +02:00
Christoph Wurst
41b5e5923a Use exactly one empty line after the namespace declaration 
For PSR2

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 11:48:10 +02:00
Christoph Wurst
2fbad1ed72 Fix (array) indent style to always use one tab 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 10:16:08 +02:00
Christoph Wurst
1a9330cd69 Update the license headers for Nextcloud 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-31 14:52:54 +02:00
Christoph Wurst
463b388589 Merge pull request #20170 from nextcloud/techdebt/remove-unused-imports 
Remove unused imports
 2020-03-27 17:14:08 +01:00
Christoph Wurst
b80ebc9674 Use the short array syntax, everywhere 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-26 16:34:56 +01:00
Christoph Wurst
74936c49ea Remove unused imports 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-25 22:08:08 +01:00
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>
 2019-12-09 14:29:22 +01:00
Christoph Wurst
5bf3d1bb38 Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-05 15:38:45 +01:00
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>
 2019-11-22 20:52:10 +01:00
Joas Schilling
16d47b5928 Fix wrongly mixed mock objects in encryption tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-15 12:04:28 +02:00
Joas Schilling
0c77cd21f9 Make sure maintenance mode is always casted to bool 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-22 08:25:41 +01:00
Bjoern Schiessle
34d4c2bc16 improve variable naming 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-30 15:24:05 +01:00
Bjoern Schiessle
8796c6bc78 in case 'encryption_skip_signature_check' was set to true we accept if the file doesn't has a signature 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-27 23:38:41 +01:00
Bjoern Schiessle
7a61ffc3dd Allow to disable the signature check 
This allows you to recover encryption files even if the signature is broken

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-27 11:08:41 +01:00
Bjoern Schiessle
87657fffd8 skip already encrypted files on encrypt all command 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-24 16:53:39 +02:00
Stefan Weiberg
375f167c67 Adding a check to see if keyFileContents is empty: 
* this fixes a download error and an exception if the data content
  for encryption is empty
* #3958: for recovering encrypted files with a damaged signature
  this is necessary in addition to turning the signature check off

Signed-off-by: Stefan Weiberg <sweiberg@suse.com>
 2018-08-21 15:21:26 +02:00
Bjoern Schiessle
3adc2aca53 add occ command to recover encrypted files in case of password lost 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-08-16 15:51:01 +02:00
Björn Schießle
11e99859ef Merge pull request #10397 from nextcloud/encryption-s3-fix 
make file cache updates more robust
 2018-08-08 18:27:18 +02:00
Julius Härtl
03971d3695 Move encryption settings to security 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-01 09:41:09 +02:00
Bjoern Schiessle
a9e22c5f1c make file cache updates more robust 
only update the encrypted version after the write operation is finished and the stream is closed

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-31 12:24:38 +02:00
Arthur Schiwon
38a90130ce move log constants to ILogger 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 10:45:52 +02:00
Bjoern Schiessle
8042e6b8fb this was a migration step to ownCloud 8.0 to restructure the encryption folder which is no longer needed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-03-02 10:09:52 +01:00
Morris Jobke
236086c457 Merge pull request #8335 from nextcloud/remove-unused-import 
Remove unused import statements
 2018-02-14 22:23:07 +01:00
Morris Jobke
d3d045dd5c Remove unused import statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-14 16:55:43 +01:00
Morris Jobke
e2974f1133 Simplify return statement 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:55:24 +01:00
Morris Jobke
a661f043e1 Remove unneeded semicolon and parentheses 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 23:46:40 +01:00
Joas Schilling
c2b1bd92d6 Merge pull request #8063 from nextcloud/inline-value 
Return value immediately instead of assigning to a one-time variable
 2018-01-26 10:15:39 +01:00
Morris Jobke
0a56d2185e Return value immediately instead of assigning to a one-time variable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 00:02:03 +01:00
Morris Jobke
464f024fa9 Use stripos instead of strpos(strtolower(), 'something') 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:59:50 +01:00
Morris Jobke
2a38605545 Properly log the full exception instead of only the message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-23 10:57:21 +01:00
Morris Jobke
0eebff152a Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Morris Jobke
b1f77aca4e Merge pull request #6919 from nextcloud/di-appmanager-encryption-migration 
Use DI for IAppManager to encryption migration
 2017-10-24 16:33:03 +02:00