wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18300 from nextcloud/bug/18295/recovery-initialization

Browse source 
Fix Argument 3 passed to OCA\Encryption\Recovery::__construct() must …
This commit is contained in:
Roeland Jago Douma 2019-12-09 21:34:01 +01:00 committed by GitHub
commit 3e720942e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/encryption/lib/AppInfo/Application.php
View file

@ -167,10 +167,8 @@ class Application extends \OCP\AppFramework\App {
return new Recovery( return new Recovery(
$server->getUserSession(), $server->getUserSession(),
$c->query('Crypt'), $c->query('Crypt'),
$server->getSecureRandom(),
$c->query('KeyManager'), $c->query('KeyManager'),
$server->getConfig(), $server->getConfig(),
$server->getEncryptionKeyStorage(),
$server->getEncryptionFilesHelper(), $server->getEncryptionFilesHelper(),
new View()); new View());
}); });

2
apps/encryption/lib/Recovery.php
View file

@ -30,12 +30,10 @@ namespace OCA\Encryption;
use OC\Files\View; use OC\Files\View;
use OCA\Encryption\Crypto\Crypt; use OCA\Encryption\Crypto\Crypt;
use OCP\Encryption\IFile; use OCP\Encryption\IFile;
use OCP\Encryption\Keys\IStorage;
use OCP\IConfig; use OCP\IConfig;
use OCP\IUser; use OCP\IUser;
use OCP\IUserSession; use OCP\IUserSession;
use OCP\PreConditionNotMetException; use OCP\PreConditionNotMetException;
use OCP\Security\ISecureRandom;
class Recovery { class Recovery {

2
apps/settings/lib/Controller/ChangePasswordController.php
View file

@ -215,10 +215,8 @@ class ChangePasswordController extends Controller {
$recovery = new \OCA\Encryption\Recovery( $recovery = new \OCA\Encryption\Recovery(
\OC::$server->getUserSession(), \OC::$server->getUserSession(),
$crypt, $crypt,
\OC::$server->getSecureRandom(),
$keyManager, $keyManager,
\OC::$server->getConfig(), \OC::$server->getConfig(),
$keyStorage,
\OC::$server->getEncryptionFilesHelper(), \OC::$server->getEncryptionFilesHelper(),
new \OC\Files\View()); new \OC\Files\View());
$recoveryAdminEnabled = $recovery->isRecoveryKeyEnabled(); $recoveryAdminEnabled = $recovery->isRecoveryKeyEnabled();