diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2021-07-21 16:19:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 16:19:21 +0200 |
| commit | 63b4450141e1994733c476d288924d75ff994612 (patch) | |
| tree | f36ccc38c3c7ed7c8a3a71e92d2714f09caa56f5 /lib | |
| parent | 41eec84ade3541574b0ffa966d13915b407f5c5f (diff) | |
| parent | b3ddc098950e29cdceae8be94f58d0ac9b5ae5ee (diff) | |
| download | nextcloud-server-63b4450141e1994733c476d288924d75ff994612.tar.gz nextcloud-server-63b4450141e1994733c476d288924d75ff994612.zip | |
Merge pull request #28082 from nextcloud/improve-exception-serializer
Sanitize more functions from the encryption app
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Log/ExceptionSerializer.php | 58 |
1 files changed, 57 insertions, 1 deletions
diff --git a/lib/private/Log/ExceptionSerializer.php b/lib/private/Log/ExceptionSerializer.php index a8eedda90be..a943efd0084 100644 --- a/lib/private/Log/ExceptionSerializer.php +++ b/lib/private/Log/ExceptionSerializer.php @@ -32,6 +32,13 @@ use OC\Core\Controller\SetupController; use OC\Security\IdentityProof\Key; use OC\Setup; use OC\SystemConfig; +use OCA\Encryption\Controller\RecoveryController; +use OCA\Encryption\Controller\SettingsController; +use OCA\Encryption\Crypto\Crypt; +use OCA\Encryption\Crypto\Encryption; +use OCA\Encryption\Hooks\UserHooks; +use OCA\Encryption\KeyManager; +use OCA\Encryption\Session; use OCP\HintException; class ExceptionSerializer { @@ -117,7 +124,56 @@ class ExceptionSerializer { ], \RedisCluster::class => [ '__construct' - ] + ], + Crypt::class => [ + 'symmetricEncryptFileContent', + 'encrypt', + 'generatePasswordHash', + 'encryptPrivateKey', + 'decryptPrivateKey', + 'isValidPrivateKey', + 'symmetricDecryptFileContent', + 'checkSignature', + 'createSignature', + 'decrypt', + 'multiKeyDecrypt', + 'multiKeyEncrypt', + ], + RecoveryController::class => [ + 'adminRecovery', + 'changeRecoveryPassword' + ], + SettingsController::class => [ + 'updatePrivateKeyPassword', + ], + Encryption::class => [ + 'encrypt', + 'decrypt', + ], + KeyManager::class => [ + 'checkRecoveryPassword', + 'storeKeyPair', + 'setRecoveryKey', + 'setPrivateKey', + 'setFileKey', + 'setAllFileKeys', + ], + Session::class => [ + 'setPrivateKey', + 'prepareDecryptAll', + ], + \OCA\Encryption\Users\Setup::class => [ + 'setupUser', + ], + UserHooks::class => [ + 'login', + 'postCreateUser', + 'postDeleteUser', + 'prePasswordReset', + 'postPasswordReset', + 'preSetPassphrase', + 'setPassphrase', + ], ]; private function editTrace(array &$sensitiveValues, array $traceLine): array { |