@forge/csp 2.1.5 → 2.2.0-next.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @forge/csp
2
2
 
3
+ ## 2.2.0-next.1
4
+
5
+ ### Patch Changes
6
+
7
+ - 439098ca: Add missing dev dependencies
8
+
9
+ ## 2.2.0-next.0
10
+
11
+ ### Minor Changes
12
+
13
+ - b45820c1: Allow \*.atlassian-fex.com domains to frame Custom UI apps
14
+
3
15
  ## 2.1.5
4
16
 
5
17
  ### Patch Changes
@@ -1 +1 @@
1
- {"version":3,"file":"csp-injection-service.d.ts","sourceRoot":"","sources":["../../src/csp/csp-injection-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAmB,MAAM,UAAU,CAAC;AAUvD,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,iBAAiB;IAkBlB,gBAAgB,uBACD,UAAU,aACnB,iBAAiB,yBACL,MAAM,KAC5B,MAAM,EAAE,CAoDT;CACH"}
1
+ {"version":3,"file":"csp-injection-service.d.ts","sourceRoot":"","sources":["../../src/csp/csp-injection-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAmB,MAAM,UAAU,CAAC;AAmBvD,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,aAAa;IAgBrB,OAAO,CAAC,iBAAiB;IAyBlB,gBAAgB,uBACD,UAAU,aACnB,iBAAiB,yBACL,MAAM,KAC5B,MAAM,EAAE,CAoDT;CACH"}
@@ -2,10 +2,17 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CSPInjectionService = void 0;
4
4
  const types_1 = require("../types");
5
+ const apiGatewayHost = {
6
+ dev: 'https://api.dev.atlassian.com',
7
+ stg: 'https://api.stg.atlassian.com',
8
+ prod: 'https://api.atlassian.com',
9
+ fex: 'https://api.atlassian-fex.com'
10
+ };
5
11
  const atlassianImageHosts = {
6
- dev: ['https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net', 'https://api.dev.atlassian.com'],
7
- stg: ['https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net', 'https://api.stg.atlassian.com'],
8
- prod: ['https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net', 'https://api.atlassian.com']
12
+ dev: ['https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net', apiGatewayHost['dev']],
13
+ stg: ['https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net', apiGatewayHost['stg']],
14
+ prod: ['https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net', apiGatewayHost['prod']],
15
+ fex: ['https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net', apiGatewayHost['fex']]
9
16
  };
10
17
  const gravatarUrl = 'https://secure.gravatar.com';
11
18
  class CSPInjectionService {
@@ -64,7 +71,7 @@ class CSPInjectionService {
64
71
  };
65
72
  }
66
73
  getCSPReportUri(microsEnv) {
67
- if (microsEnv === 'dev' || microsEnv === 'stg')
74
+ if (microsEnv === 'dev' || microsEnv === 'stg' || microsEnv === 'fex')
68
75
  return 'https://web-security-reports.stg.services.atlassian.com/csp-report/forge-cdn';
69
76
  return 'https://web-security-reports.services.atlassian.com/csp-report/forge-cdn';
70
77
  }
@@ -95,6 +102,12 @@ class CSPInjectionService {
95
102
  '*.stg.atlassian.com'
96
103
  ];
97
104
  }
105
+ if (microsEnv === 'fex') {
106
+ return [
107
+ '*.atlassian-fex.com',
108
+ 'http://localhost:*'
109
+ ];
110
+ }
98
111
  return ['*.atlassian.net', 'bitbucket.org', '*.jira.com', '*.atlassian.com'];
99
112
  }
100
113
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/csp",
3
- "version": "2.1.5",
3
+ "version": "2.2.0-next.1",
4
4
  "description": "Contains the CSP configuration for Custom UI resources in Forge",
5
5
  "main": "out/index.js",
6
6
  "author": "Atlassian",
@@ -11,9 +11,11 @@
11
11
  "clean": "rm -rf ./out && rm -f tsconfig.tsbuildinfo"
12
12
  },
13
13
  "devDependencies": {
14
- "@forge/cli-shared": "3.17.0",
15
- "@forge/manifest": "4.18.0",
16
- "@types/jest": "^29.5.3"
14
+ "@forge/cli-shared": "3.17.2-next.7",
15
+ "@forge/manifest": "4.19.1-next.3",
16
+ "@types/ignore-walk": "^4.0.0",
17
+ "@types/jest": "^29.5.3",
18
+ "@types/node": "14.18.54"
17
19
  },
18
20
  "dependencies": {
19
21
  "cheerio": "^0.22.0",