Merge pull request #5429 from LinneyS/patch-1

Allow onlyoffice on the same domain
owncloud · Jul 1, 2021 · 1130ba4 · 1130ba4
2 parents 0fdea7f + 81e2f1e
commit 1130ba4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/web-integration-oc10/lib/Controller/FilesController.php b/packages/web-integration-oc10/lib/Controller/FilesController.php
@@ -129,11 +129,14 @@ private function getMimeType(string $filename): string {
 	}
 
 	private function applyCSPOnlyOffice(ContentSecurityPolicy $csp): ContentSecurityPolicy {
-        $documentServerUrl = $this->extractDomain($this->getOnlyOfficeDocumentServerUrl());
+        $ooUrl = $this->getOnlyOfficeDocumentServerUrl();
+        $documentServerUrl = $this->extractDomain($ooUrl);
         if (!empty($documentServerUrl)) {
             $csp->addAllowedScriptDomain($documentServerUrl);
             $csp->addAllowedFrameDomain($documentServerUrl);
-        }
+        } else if (!empty($ooUrl)) {
+            $csp->addAllowedFrameDomain("'self'");
+	}
         return $csp;
     }