Allow loading of external media ressources

diff --git a/config/config.sample.php b/config/config.sample.php
index b70b3cf533dd0720ede8321b6423fa142f0c4f8e..d85a518634f69240fc12ce3e4a33e255f64df448 100644 (file)
--- 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 f007618ff19e9f1b694b583816b6446fb48d6516..781e43d2dbdbef1a325c5afd0c7721984551f4a1 100644 (file)
--- 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);