Provide method to set frame ancestors in global Educates settings val…

…ues.
educates · Jul 30, 2023 · 0310500 · 0310500
1 parent 9de2e88
commit 0310500
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/carvel-packages/training-platform/bundle/config/00-schema.yaml b/carvel-packages/training-platform/bundle/config/00-schema.yaml
@@ -275,6 +275,9 @@ websiteStyling:
     - name: ""
       namespace: ""
 
+  frameAncestors:
+  - ""
+
 #! Pre-pull selected Educates images to nodes in the cluster. Should be empty
 #! list if no images should be prepulled. This is done to reduce start up times
 #! for workhop sessions the first time on each node in the cluster.

diff --git a/client-programs/pkg/config/installationconfig.go b/client-programs/pkg/config/installationconfig.go
@@ -191,8 +191,9 @@ type WebsiteStylingConfig struct {
 	TrainingPortal       WebsiteStyleOverridesConfig `yaml:"trainingPortal,omitempty"`
 	WorkshopStarted      WebsiteHTMLSnippetConfig    `yaml:"workshopStarted,omitempty"`
 	WorkshopFinished     WebsiteHTMLSnippetConfig    `yaml:"workshopFinished,omitempty"`
-	DefaultTheme         string                      `yaml:"defaultTheme"`
+	DefaultTheme         string                      `yaml:"defaultTheme,omitempty"`
 	ThemeDataRefs        []ThemeDataRefConfig        `yaml:"themeDataRefs,omitempty"`
+	FrameAncestors       []string                    `yaml:"frameAncestors,omitempty"`
 }
 
 type ClusterEssentialsConfig struct {

diff --git a/session-manager/handlers/operator_config.py b/session-manager/handlers/operator_config.py
@@ -91,6 +91,8 @@
 
 DEFAULT_THEME_NAME = xget(config_values, "websiteStyling.defaultTheme", "")
 
+FRAME_ANCESTORS = xget(config_values, "websiteStyling.frameAncestors", [])
+
 GOOGLE_TRACKING_ID = xget(config_values, "workshopAnalytics.google.trackingId", "")
 CLARITY_TRACKING_ID = xget(config_values, "workshopAnalytics.clarity.trackingId", "")
 AMPLITUDE_TRACKING_ID = xget(config_values, "workshopAnalytics.amplitude.trackingId", "")

diff --git a/session-manager/handlers/trainingportal.py b/session-manager/handlers/trainingportal.py
@@ -22,6 +22,7 @@
     CLUSTER_STORAGE_GROUP,
     CLUSTER_SECURITY_POLICY_ENGINE,
     DEFAULT_THEME_NAME,
+    FRAME_ANCESTORS,
     GOOGLE_TRACKING_ID,
     CLARITY_TRACKING_ID,
     AMPLITUDE_TRACKING_ID,
@@ -117,7 +118,7 @@ def training_portal_create(name, uid, body, spec, status, patch, runtime, retry,
     if not theme_name:
         theme_name = "default-website-theme"
 
-    frame_ancestors = ",".join(xget(spec, "portal.theme.frame.ancestors", []))
+    frame_ancestors = ",".join(xget(spec, "portal.theme.frame.ancestors", FRAME_ANCESTORS))
 
     cookie_domain = xget(spec, "portal.cookies.domain")