From 62ccffde83b672fcf58bf998a6768b944e1d6f14 Mon Sep 17 00:00:00 2001 From: James Tsay Date: Fri, 13 Dec 2024 11:44:59 -0800 Subject: [PATCH] Support aem.live and aem.page --- acrobat/scripts/contentSecurityPolicy/csp.js | 3 +++ acrobat/scripts/contentSecurityPolicy/dev.js | 25 ++++++------------- acrobat/scripts/contentSecurityPolicy/prod.js | 10 ++++++++ .../scripts/contentSecurityPolicy/stage.js | 15 +++++------ 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/acrobat/scripts/contentSecurityPolicy/csp.js b/acrobat/scripts/contentSecurityPolicy/csp.js index 2a667829..8d45df6a 100644 --- a/acrobat/scripts/contentSecurityPolicy/csp.js +++ b/acrobat/scripts/contentSecurityPolicy/csp.js @@ -8,6 +8,9 @@ const STAGE_ENVS = [ 'main--dc--adobecom.hlx.page', 'main--dc--adobecom.hlx.live', 'stage--dc--adobecom.hlx.page', + 'main--dc--adobecom.aem.page', + 'main--dc--adobecom.aem.live', + 'stage--dc--adobecom.aem.page', ]; async function getCspEnv() { diff --git a/acrobat/scripts/contentSecurityPolicy/dev.js b/acrobat/scripts/contentSecurityPolicy/dev.js index 94a027f0..558b3754 100644 --- a/acrobat/scripts/contentSecurityPolicy/dev.js +++ b/acrobat/scripts/contentSecurityPolicy/dev.js @@ -44,18 +44,14 @@ const connectSrc = [ 'pips.taboola.com', 'trc.taboola.com', 'js.adsrvr.org', - 'main--milo--adobecom.hlx.page', - 'main--dc--adobecom.hlx.page', - 'main--dc--adobecom.hlx.live', 'http://localhost:6456/', 'ws://local-test.acrobat.com:*', 'wss://local-test.acrobat.com:*', - 'main--milo--adobecom.hlx.live', - 'fast-track--milo--adobecom.hlx.page', - 'fast-track--milo--adobecom.hlx.live', '*.typekit.net', '*.hlx.page', '*.hlx.live', + '*.aem.page', + '*.aem.live', 'cdn.linkedin.oribi.io', 'adobedc.demdex.net/', '*.facebook.com', @@ -151,15 +147,11 @@ const imgSrc = [ 'www.linkedin.com', 'www.facebook.com', 's.tgm.yahoo-net.jp', - 'main--dc--adobecom.hlx.page', - 'main--acrobat--adobecom.hlx.page', - 'main--milo--adobecom.hlx.page', 'http://localhost:6456/', - 'main--milo--adobecom.hlx.live', - 'fast-track--milo--adobecom.hlx.page', - 'fast-track--milo--adobecom.hlx.live', '*.hlx.page', '*.hlx.live', + '*.aem.page', + '*.aem.live', 'client.messaging.adobe.com/', 'ad.doubleclick.net', ';', @@ -212,12 +204,11 @@ const scriptSrc = [ 'main--milo--adobecom.hlx.page', 'stage.adobeccstatic.com', 'http://localhost:6456/', - 'main--milo--adobecom.hlx.live', - 'fast-track--milo--adobecom.hlx.page', - 'fast-track--milo--adobecom.hlx.live', 'api.demandbase.com', '*.hlx.page', '*.hlx.live', + '*.aem.page', + '*.aem.live', 'tr.snapchat.com', '\'sha256-XZLMiKjK7kZsMSJR/aV6U3pMxjqlvU6v3tJSIimxjHs=\'', ';', @@ -226,8 +217,6 @@ const scriptSrc = [ const styleSrc = [ '\'self\'', '\'unsafe-inline\'', - 'main--milo--adobecom.hlx.page', - 'main--milo--adobecom.hlx.live', '*.adobe.com', 'accounts.google.com/gsi/style', 'dc.dev.dexilab.acrobat.com', @@ -238,6 +227,8 @@ const styleSrc = [ 'http://localhost:6456/', '*.hlx.page', '*.hlx.live', + '*.aem.page', + '*.aem.live', ';', ]; diff --git a/acrobat/scripts/contentSecurityPolicy/prod.js b/acrobat/scripts/contentSecurityPolicy/prod.js index a506a785..1d23f820 100644 --- a/acrobat/scripts/contentSecurityPolicy/prod.js +++ b/acrobat/scripts/contentSecurityPolicy/prod.js @@ -19,6 +19,7 @@ const connectSrc = [ 'tag-logger.demandbase.com', 'accounts.google.com/gsi/', 'acom-reviews--adobe.hlx.live/reviews-api/', + 'acom-reviews--adobe.aem.live/reviews-api/', 'ade0164.d41.co/', 'adobe.tt.omtrdc.net', 'adobedc.demdex.net/', @@ -41,6 +42,9 @@ const connectSrc = [ 'main--dc--adobecom.hlx.page', 'main--milo--adobecom.hlx.page', 'main--dc--adobecom.hlx.live', + 'main--dc--adobecom.aem.page', + 'main--milo--adobecom.aem.page', + 'main--dc--adobecom.aem.live', 'cdn.linkedin.oribi.io', '*.typekit.net/', 'trial-eum-clienttons-s.akamaihd.net/', @@ -52,6 +56,8 @@ const connectSrc = [ 'ad.doubleclick.net', 'main--unity--adobecom.hlx.live', 'main--unity--adobecom.hlx.page', + 'main--unity--adobecom.aem.live', + 'main--unity--adobecom.aem.page', ';', ]; @@ -151,6 +157,8 @@ const imgSrc = [ 'www.linkedin.com', 'main--dc--adobecom.hlx.page', 'main--milo--adobecom.hlx.page', + 'main--dc--adobecom.aem.page', + 'main--milo--adobecom.aem.page', 'a5.behance.net', 'www.googletagmanager.com', 'milo.adobe.com', @@ -237,6 +245,7 @@ const scriptSrc = [ 'trc.taboola.com', 'js.adsrvr.org', 'main--milo--adobecom.hlx.page', + 'main--milo--adobecom.aem.page', 'tag.demandbase.com', '*.typekit.net', 'zn3n5vyia1vy8b4ly-adobe.siteintercept.qualtrics.com/', @@ -258,6 +267,7 @@ const styleSrc = [ 'prod.adobeccstatic.com', 'use.typekit.net', 'main--milo--adobecom.hlx.page', + 'main--milo--adobecom.aem.page', 'p.typekit.net', ';', ]; diff --git a/acrobat/scripts/contentSecurityPolicy/stage.js b/acrobat/scripts/contentSecurityPolicy/stage.js index 43bd7dbd..706fb8f9 100644 --- a/acrobat/scripts/contentSecurityPolicy/stage.js +++ b/acrobat/scripts/contentSecurityPolicy/stage.js @@ -45,14 +45,13 @@ const connectSrc = [ 'siteintercept.qualtrics.com/', 'tr.snapchat.com/', '*.typekit.net', - 'main--dc--adobecom.hlx.page', - 'main--milo--adobecom.hlx.page', - 'main--dc--adobecom.hlx.live', 'http://localhost:6456/', 'ws://local-test.acrobat.com:*', 'wss://local-test.acrobat.com:*', '*.hlx.page', '*.hlx.live', + '*.aem.page', + '*.aem.live', 'cdn.linkedin.oribi.io', '*.akstat.io/', 'facebook.com', @@ -157,12 +156,12 @@ const imgSrc = [ 'www.googletagmanager.com/', 'www.linkedin.com', 'milo.adobe.com', - 'main--dc--adobecom.hlx.page', - 'main--milo--adobecom.hlx.page', 'a5.behance.net', 'http://localhost:6456/', '*.hlx.page', '*.hlx.live', + '*.aem.page', + '*.aem.live', 's.yimg.jp', 'yjtag.yahoo.co.jp', 'client.messaging.adobe.com/', @@ -252,10 +251,11 @@ const scriptSrc = [ 'pips.taboola.com', 'trc.taboola.com', 'js.adsrvr.org', - 'main--milo--adobecom.hlx.page', 'http://localhost:6456/', '*.hlx.page', '*.hlx.live', + '*.aem.page', + '*.aem.live', 's.tgm.yahoo-net.jp', 's.yimg.jp', 'yjtag.yahoo.co.jp', @@ -273,10 +273,11 @@ const styleSrc = [ 'stage.adobeccstatic.com', 'use.typekit.net', 'p.typekit.net', - 'main--milo--adobecom.hlx.page', 'http://localhost:6456/', '*.hlx.page', '*.hlx.live', + '*.aem.page', + '*.aem.live', ';', ];