summaryrefslogtreecommitdiffstats
path: root/apps/encryption/lib
Commit message (Collapse)AuthorAgeFilesLines
* Encryption is ready if master key is enabledJulius Härtl2020-07-211-0/+3
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Also always return in app commandsJoas Schilling2020-06-263-6/+11
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Update license headers for 19Christoph Wurst2020-04-2913-0/+13
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Format code according to PSR2Christoph Wurst2020-04-101-1/+1
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Add visibility to all constantsChristoph Wurst2020-04-103-10/+10
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Format control structures, classes, methods and functionChristoph Wurst2020-04-1023-96/+28
| | | | | | | | | | | | | | | 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>
* Use elseif instead of else ifChristoph Wurst2020-04-103-3/+3
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Remove trailing and in between spacesChristoph Wurst2020-04-091-1/+1
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Remove spaces after method or function callChristoph Wurst2020-04-092-3/+3
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Unify function spacing to PSR2 recommendationChristoph Wurst2020-04-091-1/+1
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Use exactly one empty line after the namespace declarationChristoph Wurst2020-04-0917-17/+0
| | | | | | For PSR2 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Fix (array) indent style to always use one tabChristoph Wurst2020-04-091-1/+1
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Update the license headers for Nextcloud 19Christoph Wurst2020-03-314-0/+4
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #20170 from nextcloud/techdebt/remove-unused-importsChristoph Wurst2020-03-271-5/+0
|\ | | | | Remove unused imports
| * Remove unused importsChristoph Wurst2020-03-251-5/+0
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Use the short array syntax, everywhereChristoph Wurst2020-03-264-13/+13
|/ | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Fix Argument 3 passed to OCA\Encryption\Recovery::__construct() must be an ↵Daniel Kesselberg2019-12-092-4/+0
| | | | | | instance of OCA\Encryption\KeyManager Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* Update license headersChristoph Wurst2019-12-0526-26/+47
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Some php-cs fixesRoeland Jago Douma2019-11-2219-23/+19
| | | | | | | | | | | * 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>
* Fix wrongly mixed mock objects in encryption testsJoas Schilling2019-09-152-33/+19
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Make sure maintenance mode is always casted to boolJoas Schilling2019-02-221-1/+1
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* improve variable namingBjoern Schiessle2018-11-301-4/+4
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* in case 'encryption_skip_signature_check' was set to true we accept if the ↵Bjoern Schiessle2018-11-271-1/+3
| | | | | | file doesn't has a signature Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Allow to disable the signature checkBjoern Schiessle2018-11-271-1/+7
| | | | | | This allows you to recover encryption files even if the signature is broken Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* skip already encrypted files on encrypt all commandBjoern Schiessle2018-10-241-0/+6
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Adding a check to see if keyFileContents is empty:Stefan Weiberg2018-08-211-0/+4
| | | | | | | | | * 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>
* add occ command to recover encrypted files in case of password lostBjoern Schiessle2018-08-162-2/+134
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #10397 from nextcloud/encryption-s3-fixBjörn Schießle2018-08-081-1/+0
|\ | | | | make file cache updates more robust
| * make file cache updates more robustBjoern Schiessle2018-07-311-1/+0
| | | | | | | | | | | | only update the encrypted version after the write operation is finished and the stream is closed Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Move encryption settings to securityJulius Härtl2018-08-011-2/+2
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* move log constants to ILoggerArthur Schiwon2018-04-261-1/+1
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* this was a migration step to ownCloud 8.0 to restructure the encryption ↵Bjoern Schiessle2018-03-025-537/+1
| | | | | | folder which is no longer needed Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #8335 from nextcloud/remove-unused-importMorris Jobke2018-02-142-2/+0
|\ | | | | Remove unused import statements
| * Remove unused import statementsMorris Jobke2018-02-142-2/+0
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Simplify return statementMorris Jobke2018-02-131-5/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Remove unneeded semicolon and parenthesesMorris Jobke2018-01-261-1/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #8063 from nextcloud/inline-valueJoas Schilling2018-01-261-2/+1
|\ | | | | Return value immediately instead of assigning to a one-time variable
| * Return value immediately instead of assigning to a one-time variableMorris Jobke2018-01-261-2/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Use stripos instead of strpos(strtolower(), 'something')Morris Jobke2018-01-251-1/+1
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Properly log the full exception instead of only the messageMorris Jobke2018-01-231-5/+5
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Update license headersMorris Jobke2017-11-0613-0/+20
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #6919 from nextcloud/di-appmanager-encryption-migrationMorris Jobke2017-10-241-2/+6
|\ | | | | Use DI for IAppManager to encryption migration
| * Use DI for IAppManager to encryption migrationMorris Jobke2017-10-241-2/+6
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Remove unneeded check if app is enabledMorris Jobke2017-10-231-17/+4
|/ | | | | | 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>
* print generated encryption key passwords directly after generating the keys ↵Kenneth Newwood2017-09-111-6/+9
| | | | | | so that errors during the encryption do not lead to a potentially massive data loss Signed-off-by: Kenneth Newwood <kenneth@newwood.name>
* Fix comparisons in encryption appJoas Schilling2017-08-012-4/+4
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* make sure that we always have a ownerBjoern Schiessle2017-07-201-4/+17
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Add recovery key on public uploadBjoern Schiessle2017-07-201-2/+8
| | | | | | | | 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>
* since the default for the master key changed we need to write the setting ↵Bjoern Schiessle2017-07-061-0/+77
| | | | | | explicitely to the database if we migrate from a older version Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* add occ command to disable the master key againBjoern Schiessle2017-07-061-0/+89
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 05:16:49 +0000