Merge pull request #51 from gary-kim/fix/47/mic-camera-request

Add camera, microphone, and display-capture to feat policy
gary-kim · May 16, 2020 · eaedc2a · eaedc2a
2 parents 47cd417 + 01281fe
commit eaedc2a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/lib/Controller/AppController.php b/lib/Controller/AppController.php
@@ -32,6 +32,7 @@
 use OCP\IConfig;
 use OCP\IInitialStateService;
 use OCP\IRequest;
+use OCP\AppFramework\Http\FeaturePolicy;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Controller;
 
@@ -63,6 +64,12 @@ public function index() {
 		$csp->addAllowedFrameDomain($this->request->getServerHost());
 		$response->setContentSecurityPolicy($csp);
 
+		$featurePolicy = new FeaturePolicy();
+		$featurePolicy->addAllowedCameraDomain('\'self\'');
+		$featurePolicy->addAllowedMicrophoneDomain('\'self\'');
+
+		$response->setFeaturePolicy($featurePolicy);
+
 		return $response;
 	}
 }
diff --git a/lib/Controller/StaticController.php b/lib/Controller/StaticController.php
@@ -30,6 +30,7 @@
 use OC\Security\CSP\ContentSecurityPolicyNonceManager;
 use OCA\RiotChat\FileResponse;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\FeaturePolicy;
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\Files\IMimeTypeDetector;
 use OCP\IConfig;
@@ -162,6 +163,12 @@ private function createFileResponseWithContent(string $path, string $content, $c
 
 		$response->setContentSecurityPolicy($csp);
 
+		$featurePolicy = new FeaturePolicy();
+		$featurePolicy->addAllowedCameraDomain('\'self\'');
+		$featurePolicy->addAllowedMicrophoneDomain('\'self\'');
+
+		$response->setFeaturePolicy($featurePolicy);
+
 		return $response;
 	}
 

diff --git a/templates/index.php b/templates/index.php
@@ -3,5 +3,5 @@
 script('riotchat', 'main');
 ?>
 
-<iframe id="riot-iframe" scrolling="no"></iframe>
+<iframe id="riot-iframe" scrolling="no" allow="camera; microphone; display-capture"></iframe>