upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-13 13:08:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
77659 commits 900 branches 1195 tags 7.1 GiB
Commit graph

326 commits

Author SHA1 Message Date
Robin Appelman
2399710356
allow running encryption:fix-encrypted-version for all users 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-11-29 17:49:35 +01:00
Robin Appelman
dd4ebbd72a
add migration for encryption keys in wrong location 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-11-28 16:12:11 +01:00
Robin Appelman
06b2ed2641
skip files that cant be opened for FixEncryptedVersion 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-11-22 16:40:12 +01:00
luz paz
9d26671f05 Fix typos in apps/ subdirectory 
Found via `codespell -q 3 -S l10n,./apps/files_external/3rdparty -L adn,ba,boxs,keypair,jus,optionel,ressource,tabel ./apps/`

Signed-off-by: luz paz <luzpaz@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-09-05 12:59:54 +00:00
Côme Chilliet
b20278f708
Fix encryption:fix-encrypted-version command when encrypted is set to 0 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-08-02 12:47:26 +02:00
Côme Chilliet
bd467e5d66
Improve typing in FixEncryptedVersion command 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-08-02 12:11:15 +02:00
plumbeo
1258caeab7 Save encrypted files in binary format 
Default to the more space-efficient binary encoding for newly encrypted files
instead of the traditional base64 encoding, eliminating the 33% overhead.

The new option 'encryption.use_legacy_encoding' allows to force the legacy
encoding format if needed. Files encoded in the old format remain readable.

Based on https://github.com/owncloud/encryption/pull/224 and
https://github.com/owncloud/core/pull/38249 by karakayasemi.

Signed-off-by: plumbeo <plumbeo@users.noreply.github.com>
 2022-05-04 17:38:25 +02:00
Carl Schwan
aeecb72e96
Fix a few psalm issues and moved back to psalm/phar 4.18 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-12 20:03:06 +01:00
Côme Chilliet
37f8f7a5a1
Fix tests on PHP 8.1 for encryption, files_sharing, files_version, 
files_trashbin and theming apps

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:43:29 +01:00
Vincent Petry
60e44077b7
Fix encrypted version to 0 when finding unencrypted file 
Whenever the command is run and a "legacy cipher" seems to be detected
when the legacy option is disabled, it's highly likely that the file is
actually unencrypted but the database contains a encrypted version
higher than 0 for some reason.

The command now detects this case and automatically sets the encrypted
version to 0 so that the file can be read again.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-26 10:44:49 +02:00
J0WI
91051d9207 Generate strong, human readable OTP 
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
 2021-07-08 15:11:33 +02:00
Gary Kim
b78f3a57d1
Migrate HintException to OCP 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2021-06-30 15:28:02 -04:00
Julius Härtl
75f7287b5e
Merge pull request #27638 from nextcloud/enh/noid/fix-encrypted-version 2021-06-30 14:17:38 +02:00
Vincent Petry
d3eeecba54
Prevent running FixEncryptedVersion without master key 
Return an error when running occ encryption:fix-encrypted-version
when master key encryption is not enabled.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 20:44:07 +02:00
Vincent Petry
101c65a949
Fix FixEncryptedVersionTest test 
Fixed setup to use EncryptionTrait like other existing tests.
Fix expectations to not rely on side effects from previous test cases.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 14:39:51 +02:00
Vincent Petry
6170912ace
Fix warnings in FixEncryptedVersion command 
Fixed code warnings

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 14:39:51 +02:00
Vincent Petry
4e9241c706
Detect disabled signature check when reparing 
When running occ encryption:fix-encrypted-version, detect whether the
setting 'encryption_skip_signature_check' is set and abort if it is,
because the repair cannot detect version mismatch errors with it
enabled.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 14:39:51 +02:00
Vincent Petry
a6dc81d419
Downstream encryption:fix-encrypted-version 
For fixing "Bad signature" errors.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 14:39:51 +02:00
J0WI
c694b9d52b Remember current cipher 
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
 2021-06-29 13:41:22 +02:00
blizzz
c6d5653a85
Merge pull request #26323 from J0WI/crypt-const 
Use constant for supported formats
 2021-06-23 11:17:05 +02:00
John Molakvoæ (skjnldsv)
215aef3cbd
Update php licenses 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-06-04 22:02:41 +02:00
Valdnet
b9d00a96b3
l10n: Unify spelling 
Spelling unification in Nextcloud applications.
 2021-05-20 09:22:07 +02:00
Roeland Jago Douma
7c30d1aa2d
Merge pull request #26219 from nextcloud/relative-path-null 
getRelativePath can return null
 2021-03-30 21:10:05 +02:00
J0WI
e617361250 Use constant for supported formats 
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
 2021-03-26 19:24:04 +01:00
J0WI
21494a5b7b Drop OpenSSL 0.9.8 workaround 
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
 2021-03-26 19:23:10 +01:00
Robin Appelman
8a92229485
getStorage can also return null 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-24 14:56:40 +01:00
dependabot-preview[bot]
eb502c02ff
Bump nextcloud/coding-standard from 0.3.0 to 0.5.0 
Bumps [nextcloud/coding-standard](https://github.com/nextcloud/coding-standard) from 0.3.0 to 0.5.0.
- [Release notes](https://github.com/nextcloud/coding-standard/releases)
- [Changelog](https://github.com/nextcloud/coding-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/coding-standard/compare/v0.3.0...v0.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-02-18 13:31:24 +01:00
Roeland Jago Douma
918af40f05 Harden EncryptAll check for empty email 
Reported by psalm
For #25641

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-02-15 22:28:28 +01:00
Morris Jobke
24d436cb60
Remove unneeded casts that were found by Psalm 
In preparation of the update of Psalm from 4.2.1 to 4.3.1+ (see https://github.com/nextcloud/server/pull/24521)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-01-11 13:14:41 +01:00
Christoph Wurst
d89a75be0b
Update all license headers for Nextcloud 21 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-12-16 18:48:22 +01:00
Roeland Jago Douma
b3037dee6a
FIXME use default RC4 method 
* We should pick better default method!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-12-07 15:44:04 +01:00
Roeland Jago Douma
98eede7f68
Fix encryption test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-12-07 15:44:04 +01:00
Morris Jobke
dc5f17f561
Merge pull request #24288 from nextcloud/techdebt/noid/encryption-setup-dependency-cleanup 
Remove unused dependencies in encryption app setup
 2020-11-23 20:43:42 +01:00
Morris Jobke
c832e6180b
Remove unused dependencies in encryption app setup 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-11-23 16:20:00 +01:00
Morris Jobke
efe644137d
[encryption] Remove dependency fetching inside the constructor and move them to method call parameters 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-11-22 22:35:02 +01:00
Morris Jobke
858c7f4032
Auto-wire remaining encryption app services that depend on View 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-11-22 22:22:16 +01:00
Morris Jobke
5be18215fb
Auto-wire as much as possible in the encryption app 
Also cleans up only non-classname services in the server container

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-11-20 23:13:22 +01:00
essys
fdcfc4edce
Update ScanLegacyFormat.php 
Fixed a small typo on line 99.
 2020-11-20 10:16:35 +01:00
Morris Jobke
42a033bbc4
Change to full class names for the encryption app DI in preparation of auto-wiring 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-11-11 21:30:45 +01:00
Christoph Wurst
b2de9a6f9e
The encryption decrypt position can be int or string 
The public API said string, internally we treated it as int. In reality
both are used. Let's reflect that in the documented argument type.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-10-13 10:51:22 +02:00
Christoph Wurst
8033655a5a
Migrate encryption to the PSR container 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-10-07 15:34:06 +02:00
Christoph Wurst
d9015a8c94
Format code to a single space around binary operators 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-10-05 20:25:24 +02:00
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
Morris Jobke
99934134dc
Use DI for IAppManager to encryption migration 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 15:52:00 +02:00
Morris Jobke
5987099d2a
Remove unneeded check if app is enabled 
App code will not be executable if the app is not enabled, because the autoloader refuses to load that class.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-23 23:47:06 +02:00
Kenneth Newwood
7092c50e7c print generated encryption key passwords directly after generating the keys so that errors during the encryption do not lead to a potentially massive data loss 
Signed-off-by: Kenneth Newwood <kenneth@newwood.name>
 2017-09-11 12:52:25 +02:00
Joas Schilling
0ebdf871e0 Fix comparisons in encryption app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:54:07 +02:00
Bjoern Schiessle
473824fa06
make sure that we always have a owner 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-20 11:40:17 +02:00
Bjoern Schiessle
20a6b22db6
Add recovery key on public upload 
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-20 11:40:14 +02:00
Bjoern Schiessle
d668e17769
since the default for the master key changed we need to write the setting explicitely to the database if we migrate from a older version 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:11 +02:00
Bjoern Schiessle
66debbe18e
add occ command to disable the master key again 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:11 +02:00