summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2013-02-04 18:38:16 +0100
committerLukas Reschke <lukas@statuscode.ch>2013-02-04 18:38:16 +0100
commitbb90b0ee6e42be748309d56040a4c41add32edc9 (patch)
treedaa2de0e788453df64b47dd755b5a979ae769ae8
parent8de0f96a244a95e0b881e64d73f9aaa6011de188 (diff)
downloadnextcloud-server-bb90b0ee6e42be748309d56040a4c41add32edc9.tar.gz
nextcloud-server-bb90b0ee6e42be748309d56040a4c41add32edc9.zip
Allow the loading of local font files embedded via data:
-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 1eec4c91c70..8d6bc749710 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 *; font-src *",
+"custom_csp_policy" => "default-src \'self\'; script-src \'self\' \'unsafe-eval\'; style-src \'self\' \'unsafe-inline\'; frame-src *; img-src *; font-src data:",
/* 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 ebcc2b879c8..be65d14a9f6 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 *; font-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 data:');
header('Content-Security-Policy:'.$policy); // Standard
header('X-WebKit-CSP:'.$policy); // Older webkit browsers