summaryrefslogtreecommitdiffstats
path: root/lib/private/Server.php
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-07-09 10:59:15 +0200
committerGitHub <noreply@github.com>2019-07-09 10:59:15 +0200
commit5cef8957b5f7e1c86af4c4f1ec80b1ccc698b8e1 (patch)
tree8b2859147ccafa246ec9b565d521a2234591f675 /lib/private/Server.php
parent5fdeacb75f3c5917afb62e83d47a5880a82117f9 (diff)
parent5ac857bcdcd204d6dbfd86f8a09d241661cdd2c5 (diff)
downloadnextcloud-server-5cef8957b5f7e1c86af4c4f1ec80b1ccc698b8e1.tar.gz
nextcloud-server-5cef8957b5f7e1c86af4c4f1ec80b1ccc698b8e1.zip
Merge pull request #15730 from nextcloud/enh/14179/event_for_csp
Add an event to edit the CSP
Diffstat (limited to 'lib/private/Server.php')
-rw-r--r--lib/private/Server.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 0318d9e43be..c716b996a37 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -1030,10 +1030,8 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerService(SessionStorage::class, function (Server $c) {
return new SessionStorage($c->getSession());
});
- $this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) {
- return new ContentSecurityPolicyManager();
- });
- $this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
+ $this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, \OC\Security\CSP\ContentSecurityPolicyManager::class);
+ $this->registerAlias('ContentSecurityPolicyManager', \OC\Security\CSP\ContentSecurityPolicyManager::class);
$this->registerService('ContentSecurityPolicyNonceManager', function (Server $c) {
return new ContentSecurityPolicyNonceManager(