diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-07-05 14:31:19 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2020-11-03 00:13:01 +0100 |
| commit | dc479aae2d055dafddb250a382eb801a68d42afb (patch) | |
| tree | dba601f780b38207e88b406da723467e87cf1411 /apps/dav/lib | |
| parent | 65375320fb94fe3b7d0aaaecc9e66b7458ed6c1a (diff) | |
| download | nextcloud-server-dc479aae2d055dafddb250a382eb801a68d42afb.tar.gz nextcloud-server-dc479aae2d055dafddb250a382eb801a68d42afb.zip | |
Improve CertificateManager to not be user context dependent
* removes the ability for users to import their own certificates (for external storage)
* reliably returns the same certificate bundles system wide (and not depending on the user context and available sessions)
The user specific certificates were broken in some cases anyways, as they are only loaded if the specific user is logged in and thus causing unexpected behavior for background jobs and other non-user triggered code paths.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/dav/lib')
| -rw-r--r-- | apps/dav/lib/CardDAV/SyncService.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/dav/lib/CardDAV/SyncService.php b/apps/dav/lib/CardDAV/SyncService.php index 1cd01066a7c..bcb20409524 100644 --- a/apps/dav/lib/CardDAV/SyncService.php +++ b/apps/dav/lib/CardDAV/SyncService.php @@ -31,7 +31,6 @@ namespace OCA\DAV\CardDAV; use OC\Accounts\AccountManager; use OCP\AppFramework\Http; -use OCP\ICertificateManager; use OCP\ILogger; use OCP\IUser; use OCP\IUserManager; @@ -155,8 +154,7 @@ class SyncService { return $this->certPath; } - /** @var ICertificateManager $certManager */ - $certManager = \OC::$server->getCertificateManager(null); + $certManager = \OC::$server->getCertificateManager(); $certPath = $certManager->getAbsoluteBundlePath(); if (file_exists($certPath)) { $this->certPath = $certPath; |