From aeddbd1737cfc05eb4946cc160ba7e4a7e4c84b6 Mon Sep 17 00:00:00 2001 From: Marius David Wieschollek Date: Wed, 30 Jan 2019 21:44:08 +0100 Subject: [PATCH 1/4] Fix issues related to new CSP in NC 15 --- controller/pagecontroller.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php index 47d35a412..f073f698e 100644 --- a/controller/pagecontroller.php +++ b/controller/pagecontroller.php @@ -11,6 +11,7 @@ namespace OCA\Passman\Controller; +use OCP\AppFramework\Http\StrictContentSecurityPolicy; use OCP\IRequest; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\DataResponse; @@ -38,7 +39,14 @@ public function __construct($AppName, IRequest $request, $UserId){ */ public function index() { $params = ['user' => $this->userId]; - return new TemplateResponse('passman', 'main', $params); // templates/main.php + $response = new TemplateResponse('passman', 'main', $params); // templates/main.php + + $csp = new StrictContentSecurityPolicy(); + $csp->allowEvalScript(); + + $response->setContentSecurityPolicy($csp); + + return $response; } From d329b110a1d077c59d6c5973b218dc1f532df86c Mon Sep 17 00:00:00 2001 From: Marius David Wieschollek Date: Wed, 30 Jan 2019 21:51:26 +0100 Subject: [PATCH 2/4] Fixed spaces --- controller/pagecontroller.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php index f073f698e..da0e83848 100644 --- a/controller/pagecontroller.php +++ b/controller/pagecontroller.php @@ -39,14 +39,14 @@ public function __construct($AppName, IRequest $request, $UserId){ */ public function index() { $params = ['user' => $this->userId]; - $response = new TemplateResponse('passman', 'main', $params); // templates/main.php + $response = new TemplateResponse('passman', 'main', $params); // templates/main.php - $csp = new StrictContentSecurityPolicy(); - $csp->allowEvalScript(); + $csp = new StrictContentSecurityPolicy(); + $csp->allowEvalScript(); - $response->setContentSecurityPolicy($csp); + $response->setContentSecurityPolicy($csp); - return $response; + return $response; } From 6e443d7e54b45856cf71a6f23144f1f9782f41bb Mon Sep 17 00:00:00 2001 From: Marius David Wieschollek Date: Wed, 30 Jan 2019 21:53:32 +0100 Subject: [PATCH 3/4] Also allow inline style in CSP --- controller/pagecontroller.php | 1 + 1 file changed, 1 insertion(+) diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php index da0e83848..0e22f79f5 100644 --- a/controller/pagecontroller.php +++ b/controller/pagecontroller.php @@ -43,6 +43,7 @@ public function index() { $csp = new StrictContentSecurityPolicy(); $csp->allowEvalScript(); + $csp->allowInlineStyle(); $response->setContentSecurityPolicy($csp); From 403ed10a4ffe6436dbbc514945b0a5cdd546fa89 Mon Sep 17 00:00:00 2001 From: Marius David Wieschollek Date: Fri, 14 Jun 2019 21:39:26 +0200 Subject: [PATCH 4/4] Fix indentation --- controller/pagecontroller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php index 0e22f79f5..d40f21e57 100644 --- a/controller/pagecontroller.php +++ b/controller/pagecontroller.php @@ -43,7 +43,7 @@ public function index() { $csp = new StrictContentSecurityPolicy(); $csp->allowEvalScript(); - $csp->allowInlineStyle(); + $csp->allowInlineStyle(); $response->setContentSecurityPolicy($csp);