From 4c7bf9eb7eb407a7abc119868cee3f2d2fa97856 Mon Sep 17 00:00:00 2001
From: Mikhail Golenkov <mikhailgolenkov@catalyst-au.net>
Date: Wed, 11 Aug 2021 11:52:49 +1000
Subject: [PATCH] MDL-70323 core_h5p: Add H5P crossOrigin setting

---
 config-dist.php        | 8 ++++++++
 h5p/classes/helper.php | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/config-dist.php b/config-dist.php
index 869f915b482..c6e321bc100 100644
--- a/config-dist.php
+++ b/config-dist.php
@@ -733,6 +733,14 @@ $CFG->admin = 'admin';
 // automatically generating them. This is only needed if you want to ensure that keys are consistent
 // across a cluster when not using shared storage. If you stop the server generating keys, you will
 // need to manually generate them by running 'php admin/cli/generate_key.php'.
+//
+// H5P crossorigin
+//
+//      $CFG->h5pcrossorigin = 'anonymous';
+//
+// Settings this to anonymous will enable CORS requests for media elements to have the credentials
+// flag set to 'same-origin'. This may be needed when using tool_objectfs as an alternative file
+// system with CloudFront configured.
 
 //=========================================================================
 // 7. SETTINGS FOR DEVELOPMENT SERVERS - not intended for production use!!!
diff --git a/h5p/classes/helper.php b/h5p/classes/helper.php
index f79c761dcfb..c7647902792 100644
--- a/h5p/classes/helper.php
+++ b/h5p/classes/helper.php
@@ -344,7 +344,7 @@ class helper {
             'user' => $usersettings,
             'hubIsEnabled' => true,
             'reportingIsEnabled' => false,
-            'crossorigin' => null,
+            'crossorigin' => !empty($CFG->h5pcrossorigin) ? $CFG->h5pcrossorigin : null,
             'libraryConfig' => $core->h5pF->getLibraryConfig(),
             'pluginCacheBuster' => self::get_cache_buster(),
             'libraryUrl' => autoloader::get_h5p_core_library_url('js')->out(),