From 926efde37083d3ea6856aafe052649dfca2b633f Mon Sep 17 00:00:00 2001 From: James Tsay Date: Fri, 1 Mar 2024 14:13:29 -0800 Subject: [PATCH 1/8] Update CSP for universal nav --- acrobat/scripts/contentSecurityPolicy/dev.js | 2 ++ acrobat/scripts/contentSecurityPolicy/prod.js | 2 ++ acrobat/scripts/contentSecurityPolicy/stage.js | 2 ++ 3 files changed, 6 insertions(+) diff --git a/acrobat/scripts/contentSecurityPolicy/dev.js b/acrobat/scripts/contentSecurityPolicy/dev.js index ed5884f0..86281fa5 100644 --- a/acrobat/scripts/contentSecurityPolicy/dev.js +++ b/acrobat/scripts/contentSecurityPolicy/dev.js @@ -10,6 +10,7 @@ const connectSrc = [ '14257-chimera-stage.adobeioruntime.net', '14257-chimera.adobeioruntime.net', '*.adobe.com', + '*.adobeccstatic.com', '*.adobe.io', '*.adobelogin.com', '*.amazonaws.com', @@ -116,6 +117,7 @@ const imgSrc = [ 'about:', 'blob:', 'data:', + '*.adobeccstatic.com', '*.clarity.ms', '*.enterprise.adobe.com', '*.services.adobe.com', diff --git a/acrobat/scripts/contentSecurityPolicy/prod.js b/acrobat/scripts/contentSecurityPolicy/prod.js index 5d402f57..723ad4cf 100644 --- a/acrobat/scripts/contentSecurityPolicy/prod.js +++ b/acrobat/scripts/contentSecurityPolicy/prod.js @@ -9,6 +9,7 @@ const connectSrc = [ 'blob:', '14257-chimera.adobeioruntime.net', '*.adobe.com', + '*.adobeccstatic.com', '*.clicktale.net/', '*.adobe.io', '*.adobelogin.com', @@ -109,6 +110,7 @@ const imgSrc = [ 'about:', 'blob:', 'data:', + '*.adobeccstatic.com', '*.clarity.ms', '*.enterprise.adobe.com', '*.services.adobe.com', diff --git a/acrobat/scripts/contentSecurityPolicy/stage.js b/acrobat/scripts/contentSecurityPolicy/stage.js index 05a3aead..69a7dd0c 100644 --- a/acrobat/scripts/contentSecurityPolicy/stage.js +++ b/acrobat/scripts/contentSecurityPolicy/stage.js @@ -10,6 +10,7 @@ const connectSrc = [ '14257-chimera-stage.adobeioruntime.net', '14257-chimera.adobeioruntime.net', '*.adobe.com', + '*.adobeccstatic.com', '*.adobe.io', '*.adobelogin.com', '*.amazonaws.com', @@ -119,6 +120,7 @@ const imgSrc = [ 'blob:', 'data:', '*.adobe.com', + '*.adobeccstatic.com', '*.clarity.ms', '*.enterprise.adobe.com', '*.services.adobe.com', From 74de784e8e379041cc7277f26156be8397fbde8f Mon Sep 17 00:00:00 2001 From: James Tsay Date: Mon, 4 Mar 2024 22:38:21 -0800 Subject: [PATCH 2/8] Use exact hosts --- acrobat/scripts/contentSecurityPolicy/dev.js | 4 ++-- acrobat/scripts/contentSecurityPolicy/prod.js | 7 ++++--- acrobat/scripts/contentSecurityPolicy/stage.js | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/acrobat/scripts/contentSecurityPolicy/dev.js b/acrobat/scripts/contentSecurityPolicy/dev.js index 86281fa5..dc89d774 100644 --- a/acrobat/scripts/contentSecurityPolicy/dev.js +++ b/acrobat/scripts/contentSecurityPolicy/dev.js @@ -10,7 +10,7 @@ const connectSrc = [ '14257-chimera-stage.adobeioruntime.net', '14257-chimera.adobeioruntime.net', '*.adobe.com', - '*.adobeccstatic.com', + 'stage.adobeccstatic.com', '*.adobe.io', '*.adobelogin.com', '*.amazonaws.com', @@ -117,7 +117,7 @@ const imgSrc = [ 'about:', 'blob:', 'data:', - '*.adobeccstatic.com', + 'stage.adobeccstatic.com', '*.clarity.ms', '*.enterprise.adobe.com', '*.services.adobe.com', diff --git a/acrobat/scripts/contentSecurityPolicy/prod.js b/acrobat/scripts/contentSecurityPolicy/prod.js index 723ad4cf..40247b06 100644 --- a/acrobat/scripts/contentSecurityPolicy/prod.js +++ b/acrobat/scripts/contentSecurityPolicy/prod.js @@ -9,7 +9,7 @@ const connectSrc = [ 'blob:', '14257-chimera.adobeioruntime.net', '*.adobe.com', - '*.adobeccstatic.com', + 'prod.adobeccstatic.com', '*.clicktale.net/', '*.adobe.io', '*.adobelogin.com', @@ -110,7 +110,7 @@ const imgSrc = [ 'about:', 'blob:', 'data:', - '*.adobeccstatic.com', + 'prod.adobeccstatic.com', '*.clarity.ms', '*.enterprise.adobe.com', '*.services.adobe.com', @@ -210,6 +210,7 @@ const scriptSrc = [ 'servedby.flashtalking.com', 'snap.licdn.com', 'so.rlcdn.com/', + 'prod.adobeccstatic.com', 'static.ads-twitter.com', 't.co/i', 'tag.clrstm.com', @@ -247,7 +248,7 @@ const styleSrc = [ '\'unsafe-inline\'', '*.adobe.com', 'accounts.google.com/gsi/style', - 'adobeccstatic.com', + 'prod.adobeccstatic.com', 'use.typekit.net', 'main--milo--adobecom.hlx.page', 'p.typekit.net', diff --git a/acrobat/scripts/contentSecurityPolicy/stage.js b/acrobat/scripts/contentSecurityPolicy/stage.js index 69a7dd0c..2a0e2821 100644 --- a/acrobat/scripts/contentSecurityPolicy/stage.js +++ b/acrobat/scripts/contentSecurityPolicy/stage.js @@ -10,7 +10,7 @@ const connectSrc = [ '14257-chimera-stage.adobeioruntime.net', '14257-chimera.adobeioruntime.net', '*.adobe.com', - '*.adobeccstatic.com', + 'stage.adobeccstatic.com', '*.adobe.io', '*.adobelogin.com', '*.amazonaws.com', @@ -120,7 +120,7 @@ const imgSrc = [ 'blob:', 'data:', '*.adobe.com', - '*.adobeccstatic.com', + 'stage.adobeccstatic.com', '*.clarity.ms', '*.enterprise.adobe.com', '*.services.adobe.com', From 8f56b821154791516d3042261ea8aeef45d1abc9 Mon Sep 17 00:00:00 2001 From: Blaine Gunn Date: Wed, 6 Mar 2024 12:30:26 -0700 Subject: [PATCH 3/8] Update scripts.js --- acrobat/scripts/scripts.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/acrobat/scripts/scripts.js b/acrobat/scripts/scripts.js index caaa5346..350e5cdb 100644 --- a/acrobat/scripts/scripts.js +++ b/acrobat/scripts/scripts.js @@ -291,6 +291,9 @@ const CONFIG = { version: '1.0', onDemand: false, }, + htmlExclude: [ + /www\.adobe\.com\/(\w\w(_\w\w)?\/)?go(\/.*)?/, + ], }; // Setting alternative Jarcis client ID for these paths From c41fbd3597e8ebfc18d717ac69302bc4ee93d2fe Mon Sep 17 00:00:00 2001 From: Blaine Gunn Date: Wed, 6 Mar 2024 12:35:00 -0700 Subject: [PATCH 4/8] Update scripts.js --- acrobat/scripts/scripts.js | 1 + 1 file changed, 1 insertion(+) diff --git a/acrobat/scripts/scripts.js b/acrobat/scripts/scripts.js index 350e5cdb..e4d934ef 100644 --- a/acrobat/scripts/scripts.js +++ b/acrobat/scripts/scripts.js @@ -293,6 +293,7 @@ const CONFIG = { }, htmlExclude: [ /www\.adobe\.com\/(\w\w(_\w\w)?\/)?go(\/.*)?/, + /www\.adobe\.com\/(\w\w(_\w\w)?\/)?express(\/.*)?/, ], }; From 1eec058ad042a029e074e6ea82943d69cd816523 Mon Sep 17 00:00:00 2001 From: Blaine Gunn Date: Wed, 6 Mar 2024 12:39:31 -0700 Subject: [PATCH 5/8] Update scripts.js --- acrobat/scripts/scripts.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/acrobat/scripts/scripts.js b/acrobat/scripts/scripts.js index e4d934ef..caaa5346 100644 --- a/acrobat/scripts/scripts.js +++ b/acrobat/scripts/scripts.js @@ -291,10 +291,6 @@ const CONFIG = { version: '1.0', onDemand: false, }, - htmlExclude: [ - /www\.adobe\.com\/(\w\w(_\w\w)?\/)?go(\/.*)?/, - /www\.adobe\.com\/(\w\w(_\w\w)?\/)?express(\/.*)?/, - ], }; // Setting alternative Jarcis client ID for these paths From ebbfa69556528add3c9b1ce16863053b8364e27e Mon Sep 17 00:00:00 2001 From: Blaine Gunn Date: Wed, 6 Mar 2024 14:22:41 -0700 Subject: [PATCH 6/8] MWPW-143839 --- acrobat/scripts/scripts.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/acrobat/scripts/scripts.js b/acrobat/scripts/scripts.js index d679544c..f8e1fccd 100644 --- a/acrobat/scripts/scripts.js +++ b/acrobat/scripts/scripts.js @@ -283,6 +283,10 @@ const CONFIG = { version: '1.0', onDemand: false, }, + htmlExclude: [ + /www\.adobe\.com\/(\w\w(_\w\w)?\/)?express(\/.*)?/, + /www\.adobe\.com\/(\w\w(_\w\w)?\/)?go(\/.*)?/, + ], }; // Setting alternative Jarcis client ID for these paths From 4dc13ae4ec89d72975dc91930c7895e8327bf465 Mon Sep 17 00:00:00 2001 From: James Tsay Date: Wed, 6 Mar 2024 14:28:07 -0800 Subject: [PATCH 7/8] Update CSP --- edgeworkers/Acrobat_DC_web_prod/bundle.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edgeworkers/Acrobat_DC_web_prod/bundle.json b/edgeworkers/Acrobat_DC_web_prod/bundle.json index b3542ec6..5c26b08d 100644 --- a/edgeworkers/Acrobat_DC_web_prod/bundle.json +++ b/edgeworkers/Acrobat_DC_web_prod/bundle.json @@ -1,4 +1,4 @@ { - "edgeworker-version": "0.83", - "description" : "remove hash for legacy.js IE/Trident script" + "edgeworker-version": "0.84", + "description" : "Test stage deployment" } \ No newline at end of file From c1c66498184a30fa5aa6e8aae43216ce7df608be Mon Sep 17 00:00:00 2001 From: Blaine Gunn Date: Thu, 7 Mar 2024 08:02:12 -0700 Subject: [PATCH 8/8] removing test code --- .github/workflows/pull-request.yml | 19 ------------------- CODEOWNERS | 9 --------- CODE_OF_CONDUCT.md | 2 +- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 .github/workflows/pull-request.yml delete mode 100644 CODEOWNERS diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml deleted file mode 100644 index 025b0e49..00000000 --- a/.github/workflows/pull-request.yml +++ /dev/null @@ -1,19 +0,0 @@ -on: - push: - branches: - - stage - -jobs: - pull-request: - runs-on: ubuntu-latest - steps: - - name: pull-request - uses: actions/checkout@v3 - - name: Create Pull Request - uses: diillson/auto-pull-request@v1.0.1 - with: - destination_branch: "main" - pr_title: "Ready for Main: ${{ github.ref_name }} into main. ${{ github.base_ref }}" - pr_body: "Merge to main, commit: ${{ github.sha }} -- ${{ github.head_ref }}" - pr_reviewer: "9606719,T_kwDOBa1KWM4AkpY,document-cloud-sot" - pr_label: "Ready for Main" diff --git a/CODEOWNERS b/CODEOWNERS deleted file mode 100644 index c8078c26..00000000 --- a/CODEOWNERS +++ /dev/null @@ -1,9 +0,0 @@ -# DC CODEOWNERS -# When you create a new block or tool please establish ownership in this file. -# See https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners - -# DC Core -/acrobat/ @NadiiaSokolova - -# DC Blocks -/acrobat/blocks/ @NadiiaSokolova diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f1c949ef..1c12274f 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -7,7 +7,7 @@ contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and -orientation.. +orientation. ## Our Standards