aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2013-02-04 17:51:52 +0100
committerLukas Reschke <lukas@statuscode.ch>2013-02-04 17:51:52 +0100
commit8de0f96a244a95e0b881e64d73f9aaa6011de188 (patch)
treeb5866690bfb96e979656b606086db435067dd1d7
parentb8e6b8692b0c306de6ebfe0a82bfe7bab304cd0a (diff)
downloadnextcloud-server-8de0f96a244a95e0b881e64d73f9aaa6011de188.tar.gz
nextcloud-server-8de0f96a244a95e0b881e64d73f9aaa6011de188.zip
Allow loading of external fonts
Required by several applications like our pdf viewer
-rw-r--r--config/config.sample.php2
-rw-r--r--lib/template.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index 5264e948200..1eec4c91c70 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -130,7 +130,7 @@ $CONFIG = array(
"remember_login_cookie_lifetime" => 60*60*24*15,
/* Custom CSP policy, changing this will overwrite the standard policy */
-"custom_csp_policy" => "default-src \'self\'; script-src \'self\' \'unsafe-eval\'; style-src \'self\' \'unsafe-inline\'; frame-src *; img-src *",
+"custom_csp_policy" => "default-src \'self\'; script-src \'self\' \'unsafe-eval\'; style-src \'self\' \'unsafe-inline\'; frame-src *; img-src *; font-src *",
/* The directory where the user data is stored, default to data in the owncloud
* directory. The sqlite database is also stored here, when sqlite is used.
diff --git a/lib/template.php b/lib/template.php
index 238d8a8ad0f..ebcc2b879c8 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -192,7 +192,7 @@ class OC_Template{
// Content Security Policy
// If you change the standard policy, please also change it in config.sample.php
- $policy = OC_Config::getValue('custom_csp_policy', 'default-src \'self\'; script-src \'self\' \'unsafe-eval\'; style-src \'self\' \'unsafe-inline\'; frame-src *; img-src *');
+ $policy = OC_Config::getValue('custom_csp_policy', 'default-src \'self\'; script-src \'self\' \'unsafe-eval\'; style-src \'self\' \'unsafe-inline\'; frame-src *; img-src *; font-src *');
header('Content-Security-Policy:'.$policy); // Standard
header('X-WebKit-CSP:'.$policy); // Older webkit browsers