79 Commits (bf7dc2f2e7a4ef82db38d10deebfdfaebdac4b13)

Author	SHA1	Message	Date
Robin Appelman	012a402cec	fix: restore updated encrypted version when copying versions ... Signed-off-by: Robin Appelman <robin@icewind.nl>	1 year ago
Louis Chemineau	199b0bd4d9	fix(files): Correctly copy the cache information on copy operations ... Needed to copy the `encrypted` flag of encrypted files when those files are two level down in a moved folder. Signed-off-by: Louis Chemineau <louis@chmn.me>	1 year ago
Git'Fellow	60d956f39f	refactor(storage): Code adjustements and simplifications ... Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>	1 year ago
provokateurin	0de4843b73	refactor(Storage): Align all Storage constructors ... Signed-off-by: provokateurin <kate@provokateurin.de>	1 year ago
provokateurin	f28e74b7a8	refactor(Storage): Make all parameter types strong types ... Signed-off-by: provokateurin <kate@provokateurin.de>	1 year ago
provokateurin	4412b2b8a8	refactor(Wrapper\Encryption): Migrate to strong types ... Signed-off-by: provokateurin <kate@provokateurin.de>	1 year ago
provokateurin	7cdccd058f	fix(Storage): Fix IStorage return types ... Signed-off-by: provokateurin <kate@provokateurin.de>	1 year ago
provokateurin	9836e9b164	chore(deps): Update nextcloud/coding-standard to v1.3.1 ... Signed-off-by: provokateurin <kate@provokateurin.de>	1 year ago
Daniel Kesselberg	af6de04e9e	style: update codestyle for coding-standard 1.2.3 ... Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>	1 year ago
Robin Appelman	3756152cb1	fix: use mountpoint from storage to find the encryption keys ... Signed-off-by: Robin Appelman <robin@icewind.nl>	1 year ago
Côme Chilliet	277c2cf5d1	fix(encryption): Fix mountpoint check to accept if several are found ... There is no strong requirement to have only one mount for a given storage id. Also the error in this case would be misleading. Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>	1 year ago
withbest	dd08f93202	chore: fix some comments ... Signed-off-by: withbest <seekseat@outlook.com>	1 year ago
Andy Scherzinger	dae7c159f7	chore: Add SPDX header ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2 years ago
Côme Chilliet	ec5133b739	fix: Apply new coding standard to all files ... Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>	2 years ago
Julius Härtl	88a96e4db7	fix: Only store unencrypted_size if path should be encrypted ... Signed-off-by: Julius Härtl <jus@bitgrid.net>	2 years ago
Robin Appelman	e4f85226c5	extend fix-key-location to handle cases from broken cross-storage moves ... Signed-off-by: Robin Appelman <robin@icewind.nl>	2 years ago
Richard Steinmetz	c4eccbb304	fix(sse): don't update uncached files ... Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>	3 years ago
Faraz Samapoor	e7cc7653b8	Refactors "strpos" calls in lib/private to improve code readability. ... Signed-off-by: Faraz Samapoor <fsamapoor@gmail.com>	3 years ago
Côme Chilliet	546d94c3ec	Fix file_get_content signatures to make it clear it can return false ... In File::getContent, which must return a string, throw an Exception instead of returning false. Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>	3 years ago
Robin Appelman	649bed5154	fix unencrypted_size for files when scanning ... Signed-off-by: Robin Appelman <robin@icewind.nl>	3 years ago
Robin Appelman	15a6920b07	fix encryption wrapper filesize for non existing files ... Signed-off-by: Robin Appelman <robin@icewind.nl>	3 years ago
Côme Chilliet	308fcf4526	Respect OCP interface in private classes ... Because the parameter type was moved to phpdoc it needs to be removed from implementations Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>	3 years ago
Côme Chilliet	d9dbed9105	Fix psalm errors related to filesizes ... Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>	3 years ago
Côme Chilliet	ff776a90b1	Strong type filesize related methods to ease 32bits problem findings ... Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>	3 years ago
Richard Steinmetz	f0a3b77d0f	fix(encryption): don't throw on missing file ... Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>	3 years ago
Côme Chilliet	f5c361cf44	composer run cs:fix ... Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>	3 years ago
Robin Appelman	e3a0e64698	clear is-encrypted cache when trying to fix encrypted version ... Signed-off-by: Robin Appelman <robin@icewind.nl>	3 years ago
Robin Appelman	e9b87c73fa	fix reading newly written encrypted files before their cache entry is written ... Signed-off-by: Robin Appelman <robin@icewind.nl>	3 years ago
Carl Schwan	a5ea677370	Rename file1 and file2 to source and target in Storage abstraction ... Signed-off-by: Carl Schwan <carl@carlschwan.eu>	3 years ago
Robin Appelman	1374cbee3e	store unencrypted size in the unencrypted_size column ... Signed-off-by: Robin Appelman <robin@icewind.nl>	3 years ago
Robin Appelman	5e375d9092	Revert "store unencrypted size in the unencrypted_size column" ... This reverts commit 8238582e59. Signed-off-by: Robin Appelman <robin@icewind.nl>	3 years ago
Robin Appelman	8238582e59	store unencrypted size in the unencrypted_size column ... Signed-off-by: Robin Appelman <robin@icewind.nl>	4 years ago
Côme Chilliet	e8c1f75064	Fixing psalm errors ... Encryption constructor is problematic and should still be fixed later. Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>	4 years ago
Côme Chilliet	6be7aa112f	Migrate from ILogger to LoggerInterface in lib/private ... Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>	4 years ago
Jonas Meurer	a2f4c62c19	updateEncryptedVersion: cleanup on target if cache already got renamed ... When moving a file to trash with encryption enabled, the cache gets moved before the actual file. According to @icewind1991 this is in order to not break object storage. When moving a file from an unencrypted storage (e.g. a collectives storage) to the encrypted trashbin storage, this causes errors, see This commit fixes it by doing `updateEncryptedVersion()` on the target cache entry *if* the source cache entry doesn't exist anymore, but the corresponding target cache entry does exist already. Fixes: #26544 Signed-off-by: Jonas Meurer <jonas@freesources.org>	4 years ago
Vincent Petry	be590df588	Fix fail when keys/files folder already exists ... Fixes an issue with transfer ownership in move mode where the folder "files_encryption/keys/files" already exists. Instead of failing, its existence is checked before calling mkdir. Signed-off-by: Vincent Petry <vincent@nextcloud.com>	4 years ago
Vincent Petry	6f81e60bce	Check resource before closing in encryption wrapper ... In case of error there is no guarantee that $source or $target is set or is a resource when handling an error. Without this fix, there's a risk that fclose will fail and the actual exception will not be thrown, making it impossible to find out about the root cause. Signed-off-by: Vincent Petry <vincent@nextcloud.com>	4 years ago
alanmeeson	16f70e8647	Add type hint to fread_block $blockSize param & apply cs:fix. ... Signed-off-by: alanmeeson <alan@carefullycalculated.co.uk>	4 years ago
Alan Meeson	44c332a46e	Fix truncation of files upon read when using object store and encryption. ... When using and object store as primary storage and using the default encryption module at the same time, any encrypted file would be truncated when read, and a text error message added to the end. This was caused by a combination of the reliance of the read functions on on knowing the unencrypted file size, and a bug in the function which calculated the unencrypted file size for a given file. In order to calculate the unencrypted file size, the function would first skip the header block, then use fseek to skip to the last encrypted block in the file. Because there was a corresponence between the encrypted and unencrypted blocks, this would also be the last encrypted block. It would then read the final block and decrypt it to get the unencrypted length of the last block. With that, the number of blocks, and the unencrypted block size, it could calculate the unencrypted file size. The trouble was that when using an object store, an fread call doesn't always get you the number of bytes you asked for, even if they are available. To resolve this I adapted the stream_read_block function from lib/private/Files/Streams/Encryption.php to work here. This function wraps the fread call in a loop and repeats until it has the entire set of bytes that were requested, or there are no more to get. This fixes the imediate bug, and should (with luck) allow people to get their encrypted files out of Nextcloud now. (The problem was purely on the decryption side). In the future it would be nice to do some refactoring here. I have tested this with image files ranging from 1kb to 10mb using Nextcloud version 22.1.0 (the nextcloud:22.1-apache docker image), with sqlite and a Linode object store as the primary storage. Signed-off-by: Alan Meeson <alan@carefullycalculated.co.uk>	4 years ago
Daniel Kesselberg	be3f4edf1f	explicitly close source stream on encryption storage ... Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>	4 years ago
acsfer	9324a74bba	Handle files with is_file instead of file_exists ... Should fix things like `fread(): read of 8192 bytes failed with errno=21 Is a directory`	4 years ago
John Molakvoæ (skjnldsv)	215aef3cbd	Update php licenses ... Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	5 years ago
Robin Appelman	b844293536	catch notfound and forbidden exception in smb::getmetadata ... Signed-off-by: Robin Appelman <robin@icewind.nl>	5 years ago
Jasper Knockaert	40fde94b4d	fix even more brackets ... Signed-off-by: Jasper Knockaert jasper@knockaert.nl	5 years ago
Jasper Knockaert	252d1ae512	fix brakcets	5 years ago
Jasper Knockaert	f9a0380eb1	consolidation of boolean expression	5 years ago
Jasper Knockaert	81e3ae4753	avoid fread on directories and unencrypted files ... Reworking the logic in order to first check the filecache and only then reading the fileheader. This in order to solve #21578.	5 years ago
Christoph Wurst	9ce3ea3368	Update license headers ... Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	5 years ago
Tigran Mkrtchyan	4f2dc18f58	storage: update IStorage#file_put_contents docs to match usage ... The current phpdoc of IStorage#file_put_contents doesnt corresponds to it's actual usage in code, e.g. Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>	5 years ago
Christoph Wurst	d89a75be0b	Update all license headers for Nextcloud 21 ... Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	5 years ago