Merge pull request #16711 from nextcloud/fix/csp/form_actions/loginflow

Fix login flow form actions
nextcloud · Aug 12, 2019 · fced73a · fced73a
2 parents ec03059 + 6dc179e
commit fced73a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php
@@ -195,7 +195,10 @@ public function showAuthPickerPage($clientIdentifier = '') {
 		);
 		$this->session->set(self::stateName, $stateToken);
 
-		return new StandaloneTemplateResponse(
+		$csp = new Http\ContentSecurityPolicy();
+		$csp->addAllowedFormActionDomain('nc://*');
+
+		$response = new StandaloneTemplateResponse(
 			$this->appName,
 			'loginflow/authpicker',
 			[
@@ -209,6 +212,9 @@ public function showAuthPickerPage($clientIdentifier = '') {
 			],
 			'guest'
 		);
+
+		$response->setContentSecurityPolicy($csp);
+		return $response;
 	}
 
 	/**
@@ -234,7 +240,10 @@ public function grantPage($stateToken = '',
 			$clientName = $client->getName();
 		}
 
-		return new StandaloneTemplateResponse(
+		$csp = new Http\ContentSecurityPolicy();
+		$csp->addAllowedFormActionDomain('nc://*');
+
+		$response = new StandaloneTemplateResponse(
 			$this->appName,
 			'loginflow/grant',
 			[
@@ -248,6 +257,9 @@ public function grantPage($stateToken = '',
 			],
 			'guest'
 		);
+
+		$response->setContentSecurityPolicy($csp);
+		return $response;
 	}
 
 	/**

diff --git a/tests/Core/Controller/ClientFlowLoginControllerTest.php b/tests/Core/Controller/ClientFlowLoginControllerTest.php
@@ -186,6 +186,9 @@ public function testShowAuthPickerPageWithOcsHeader() {
 			],
 			'guest'
 		);
+		$csp = new Http\ContentSecurityPolicy();
+		$csp->addAllowedFormActionDomain('nc://*');
+		$expected->setContentSecurityPolicy($csp);
 		$this->assertEquals($expected, $this->clientFlowLoginController->showAuthPickerPage());
 	}
 
@@ -245,6 +248,9 @@ public function testShowAuthPickerPageWithOauth() {
 			],
 			'guest'
 		);
+		$csp = new Http\ContentSecurityPolicy();
+		$csp->addAllowedFormActionDomain('nc://*');
+		$expected->setContentSecurityPolicy($csp);
 		$this->assertEquals($expected, $this->clientFlowLoginController->showAuthPickerPage('MyClientIdentifier'));
 	}