Browse Source
only warn about data lose on password reset if per-user keys are used
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
pull/10645/head
Bjoern Schiessle
7 years ago
No known key found for this signature in database
GPG Key ID: 2378A753E2BF04F6
1 changed files with
10 additions and
1 deletions
-
core/Controller/LostController.php
|
|
|
@ -37,6 +37,7 @@ use OCP\AppFramework\Http\JSONResponse; |
|
|
|
use \OCP\AppFramework\Http\TemplateResponse; |
|
|
|
use OCP\AppFramework\Utility\ITimeFactory; |
|
|
|
use OCP\Defaults; |
|
|
|
use OCP\Encryption\IEncryptionModule; |
|
|
|
use OCP\Encryption\IManager; |
|
|
|
use \OCP\IURLGenerator; |
|
|
|
use \OCP\IRequest; |
|
|
|
@ -260,7 +261,15 @@ class LostController extends Controller { |
|
|
|
} |
|
|
|
|
|
|
|
if ($this->encryptionManager->isEnabled() && !$proceed) { |
|
|
|
return $this->error('', array('encryption' => true)); |
|
|
|
$encryptionModules = $this->encryptionManager->getEncryptionModules(); |
|
|
|
foreach ($encryptionModules as $module) { |
|
|
|
/** @var IEncryptionModule $instance */ |
|
|
|
$instance = call_user_func($module['callback']); |
|
|
|
// this way we can find out whether per-user keys are used or a system wide encryption key
|
|
|
|
if ($instance->needDetailedAccessList()) { |
|
|
|
return $this->error('', array('encryption' => true)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
try { |
|
|
|
|