summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2013-04-24 16:45:51 +0200
committerLukas Reschke <lukas@statuscode.ch>2013-04-24 16:45:51 +0200
commit4f96d7fb85fcde44bed5317c7cf42843d8085534 (patch)
tree003006e8a5db2f704e0dd805340acf6dc000d714
parentff6fb0906b2442b06f7bbac43d178dc919e4c4df (diff)
downloadnextcloud-server-4f96d7fb85fcde44bed5317c7cf42843d8085534.tar.gz
nextcloud-server-4f96d7fb85fcde44bed5317c7cf42843d8085534.zip
Allow loading of external media ressources
-rw-r--r--config/config.sample.php2
-rw-r--r--lib/template.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index b70b3cf533d..d85a518634f 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -146,7 +146,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 '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 *",
/* 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 f007618ff19..781e43d2dbd 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -198,7 +198,8 @@ class OC_Template{
.'style-src \'self\' \'unsafe-inline\'; '
.'frame-src *; '
.'img-src *; '
- .'font-src \'self\' data:');
+ .'font-src \'self\' data:; '
+ .'media-src *');
header('Content-Security-Policy:'.$policy); // Standard
$this->findTemplate($name);