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
75,767 Commits 712 Branches 1,186 Tags
dd08f9320249d8ac7bf96f338a5be70d60af1dce
Commit Graph

33 Commits

Author SHA1 Message Date
Côme Chilliet
95cd524771 fix: Autodetect legacy filekey instead of trusting the header for legacy header 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2024-06-04 17:20:20 +02:00
Andy Scherzinger
5b7dcc1427 chore: Add SPDX header 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2024-05-29 08:58:16 +02:00
Côme Chilliet
1e06b61f59 Migrate away from ILogger in encryption 
And modernize code a bit

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2023-08-08 09:14:16 +02:00
Côme Chilliet
bd08849866 Fix sharing of encrypted files 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2023-07-18 09:42:57 +02:00
Côme Chilliet
c9c49bfef8 Log failures to delete legacy file key 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2023-05-04 17:50:51 +02:00
Côme Chilliet
24e762c59f Fix encryption file key management 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2023-03-17 11:08:59 +01:00
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>
 2023-03-17 11:08:58 +01:00
Côme Chilliet
fbe282caeb Getting rid of openssl_seal and rc4 in server side encryption 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2023-03-17 11:08:50 +01: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
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
Robin Appelman
8a92229485 getStorage can also return null 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-24 14:56:40 +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
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
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
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
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
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
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
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
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
Morris Jobke
0eebff152a Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01: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
da51ec38f4 only collect detailed access list if it is really needed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:33:08 +02:00
Morris Jobke
1729e4471f Update comments to Nextcloud 
* based on PR by @Ardinis
* see #4311

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-11 23:16:27 -05:00
Bjoern Schiessle
8a401ee156 check if session is initialized 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-23 12:20:43 +01:00
Joas Schilling
813f0a0f40 Fix apps/ 2016-07-21 18:13:57 +02:00
Lukas Reschke
aba539703c Update license headers 2016-05-26 19:57:24 +02:00
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