Merge pull request #3111 from owncloud/csp-audio

Allow loading of external media ressources
This commit is contained in:
icewind1991 2013-04-24 08:17:42 -07:00
commit 3b576c5f77
2 changed files with 3 additions and 2 deletions

View File

@ -146,7 +146,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 *; font-src 'self' data:", "custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:; media-src *",
/* Enable/disable X-Frame-Restriction */ /* Enable/disable X-Frame-Restriction */
/* HIGH SECURITY RISK IF DISABLED*/ /* HIGH SECURITY RISK IF DISABLED*/

View File

@ -203,7 +203,8 @@ class OC_Template{
.'style-src \'self\' \'unsafe-inline\'; ' .'style-src \'self\' \'unsafe-inline\'; '
.'frame-src *; ' .'frame-src *; '
.'img-src *; ' .'img-src *; '
.'font-src \'self\' data:'); .'font-src \'self\' data:; '
.'media-src *');
header('Content-Security-Policy:'.$policy); // Standard header('Content-Security-Policy:'.$policy); // Standard
$this->findTemplate($name); $this->findTemplate($name);