nextcloud-server

Commit Graph

Author	SHA1	Message	Date
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>	4 years ago
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>	5 years ago
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>	5 years ago
Vincent Petry	43a0016aa7	Downstream FixEncryptedVersionTest Signed-off-by: Vincent Petry <vincent@nextcloud.com>	5 years ago
John Molakvoæ (skjnldsv)	215aef3cbd	Update php licenses Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>	5 years ago
Morris Jobke	dc981623aa	Fix test Signed-off-by: Morris Jobke <hey@morrisjobke.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
Morris Jobke	c832e6180b	Remove unused dependencies in encryption app setup Signed-off-by: Morris Jobke <hey@morrisjobke.de>	5 years ago
Christoph Wurst	d9015a8c94	Format code to a single space around binary operators Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	5 years ago
Christoph Wurst	2a054e6c04	Update the license headers for Nextcloud 20 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	5 years ago
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>	5 years ago
Julius Härtl	00e62171d2	Test for locking state in key generation Signed-off-by: Julius Härtl <jus@bitgrid.net>	5 years ago
Morris Jobke	234b510652	Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to \PHPUnit\Framework\MockObject\MockObject Signed-off-by: Morris Jobke <hey@morrisjobke.de>	5 years ago
Christoph Wurst	cb057829f7	Update license headers for 19 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	6 years ago
Christoph Wurst	1584c9ae9c	Add visibility to all methods and position of static keyword Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	6 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	14c996d982	Use elseif instead of else if Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	6 years ago
Christoph Wurst	afbd9c4e6e	Unify function spacing to PSR2 recommendation 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	2fbad1ed72	Fix (array) indent style to always use one tab 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
Christoph Wurst	2ee65f177e	Use the shorter phpunit syntax for mocked return values Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	6 years ago
Christoph Wurst	74936c49ea	Remove unused imports Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	6 years ago
Christoph Wurst	5bf3d1bb38	Update license headers Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>	6 years ago
Roeland Jago Douma	9761822aeb	TO REVERT LATER: fix UserHooksTest Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	6 years ago
Roeland Jago Douma	3a7cf40aaa	Mode to modern phpunit Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	6 years ago
Roeland Jago Douma	c007ca624f	Make phpunit8 compatible Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	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>	6 years ago
Roeland Jago Douma	372f3d2a60	Remove deprecated functions from SecureRandom Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>	7 years ago
Bjoern Schiessle	87657fffd8	skip already encrypted files on encrypt all command Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	7 years ago
Bjoern Schiessle	3adc2aca53	add occ command to recover encrypted files in case of password lost Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	7 years ago
Julius Härtl	0dd519cff1	Fix encryption admin section tests Signed-off-by: Julius Härtl <jus@bitgrid.net>	8 years ago
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>	8 years ago
Joas Schilling	3917a54113	Class "ProgressBar" is declared "final" and cannot be mocked. Signed-off-by: Joas Schilling <coding@schilljs.com>	8 years ago
Joas Schilling	bf2be08c9f	Fix risky tests without assertions Signed-off-by: Joas Schilling <coding@schilljs.com>	8 years ago
Morris Jobke	0eebff152a	Update license headers Signed-off-by: Morris Jobke <hey@morrisjobke.de>	8 years ago
Morris Jobke	c733cdaa65	Use ::class in test mocks of encryption app Signed-off-by: Morris Jobke <hey@morrisjobke.de>	8 years ago
Morris Jobke	43e498844e	Use ::class in test mocks Signed-off-by: Morris Jobke <hey@morrisjobke.de>	8 years ago
Morris Jobke	99934134dc	Use DI for IAppManager to encryption migration Signed-off-by: Morris Jobke <hey@morrisjobke.de>	8 years ago
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>	8 years ago
Bjoern Schiessle	001a9c02dd	adjust encryption tests to the new master key default Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	9 years ago
Bjoern Schiessle	5f75468aa4	improve status messages Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	9 years ago
Morris Jobke	1729e4471f	Update comments to Nextcloud * based on PR by @Ardinis * see #4311 Signed-off-by: Morris Jobke <hey@morrisjobke.de>	9 years ago
Vincent Petry	6b9ef15803	Use master key for public links as well	9 years ago
Vincent Petry	305718370a	Add tests for null user	9 years ago
Bjoern Schiessle	9ce32d9941	always throw a encryption exception Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	9 years ago
Bjoern Schiessle	fcda3a20f4	create new encryption keys on password reset and backup the old one Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	9 years ago
Bjoern Schiessle	8a401ee156	check if session is initialized Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>	9 years ago

1 2 3 4

161 Commits (1f42657bb9ea76353fbc02ee100cff5755b6384d)