mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1445 from owncloud/CSP_font 

Allow loading of external fonts
This commit is contained in:
Thomas Müller 2013-02-04 10:36:43 -08:00
parent 301afac291 5fcb35efd6
commit f04a91bd60
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.sample.php
View File

@ -133,7 +133,7 @@ $CONFIG = array(
"remember_login_cookie_lifetime" => 60*60*24*15, "remember_login_cookie_lifetime" => 60*60*24*15,
/* Custom CSP policy, changing this will overwrite the standard policy */ /* 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 \'self\' data:",
/* The directory where the user data is stored, default to data in the owncloud /* 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. * directory. The sqlite database is also stored here, when sqlite is used.

2
lib/template.php
View File

@ -192,7 +192,7 @@ class OC_Template{
// Content Security Policy // Content Security Policy
// If you change the standard policy, please also change it in config.sample.php // 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 \'self\' data:');
header('Content-Security-Policy:'.$policy); // Standard header('Content-Security-Policy:'.$policy); // Standard
header('X-WebKit-CSP:'.$policy); // Older webkit browsers header('X-WebKit-CSP:'.$policy); // Older webkit browsers