Merge pull request #196 from owncloud/bugfix/e3377

Allow opening pdf attachements
owncloud · Nov 25, 2019 · b9db381 · b9db381
2 parents fb10f5e + 2c5326f
commit b9db381
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/controller/displaycontroller.php b/controller/displaycontroller.php
@@ -49,6 +49,7 @@ public function showPdfViewer() {
 		$policy->addAllowedChildSrcDomain('\'self\'');
 		$policy->addAllowedFontDomain('data:');
 		$policy->addAllowedImageDomain('*');
+		$policy->addAllowedConnectDomain('blob:');
 		$policy->allowEvalScript(false);
 		$response->setContentSecurityPolicy($policy);
 

diff --git a/js/workersrc.js b/js/workersrc.js
@@ -3,7 +3,7 @@
  **/
 function redirectIfNotDisplayedInFrame () {
 	try {
-		if (window.frameElement) {
+		if (window.frameElement || location.href.indexOf('?file=blob') !== false) {
 			return;
 		}
 	} catch (e) {}

diff --git a/tests/unit/controller/displaycontrollertest.php b/tests/unit/controller/displaycontrollertest.php
@@ -55,6 +55,7 @@ public function testShowPdfViewer() {
 		$policy->addAllowedChildSrcDomain('\'self\'');
 		$policy->addAllowedFontDomain('data:');
 		$policy->addAllowedImageDomain('*');
+		$policy->addAllowedConnectDomain('blob:');
 		$policy->allowEvalScript(false);
 		$expectedResponse->setContentSecurityPolicy($policy);