@forge/csp 3.7.0-next.0-experimental-8477be1 → 3.7.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,10 +1,10 @@
1
1
  # @forge/csp
2
2
 
3
- ## 3.7.0-next.0-experimental-8477be1
3
+ ## 3.7.0-next.1
4
4
 
5
- ### Minor Changes
5
+ ### Patch Changes
6
6
 
7
- - a779dc3: Allow listing emoji API y default for Custom UI apps
7
+ - 8c34ca3: Changed manifest to allow egress objects to be a list of string, egress objects containing at least the 'address' field, or a remote reference
8
8
 
9
9
  ## 3.7.0-next.0
10
10
 
@@ -15,6 +15,7 @@ export declare class CSPProcessingService {
15
15
  getCspDetails(body: DocumentBody, permissions: Permissions): CSPDetails;
16
16
  getInvalidCspPermissions(contentPermissions: ContentPermissions): string[];
17
17
  private assertValidFetchClient;
18
+ private egressesToStringMap;
18
19
  private mapExternalPermissionsToCsp;
19
20
  private getStyleSrc;
20
21
  private getScriptSrc;
@@ -1 +1 @@
1
- {"version":3,"file":"csp-processing-service.d.ts","sourceRoot":"","sources":["../../src/csp/csp-processing-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAS,MAAM,iBAAiB,CAAC;AAK1D,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,YAAY,EAAuB,MAAM,UAAU,CAAC;AAE7F,qBAAa,iBAAkB,SAAQ,KAAK;;CAI3C;AAMD,qBAAa,oBAAoB;IAanB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAXnC,OAAO,CAAC,mBAAmB,CAAuB;IAElD,OAAO,CAAC,2BAA2B,CAAqD;IACxF,OAAO,CAAC,6BAA6B,CAAa;IAClD,OAAO,CAAC,oBAAoB,CAAgF;IAE5G,OAAO,CAAC,qBAAqB,CAI3B;gBAC2B,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;IAElD,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,GAAG,UAAU;IAoBvE,wBAAwB,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,MAAM,EAAE;IASjF,OAAO,CAAC,sBAAsB;IAW9B,OAAO,CAAC,2BAA2B;IAgBnC,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,oBAAoB;CAa7B"}
1
+ {"version":3,"file":"csp-processing-service.d.ts","sourceRoot":"","sources":["../../src/csp/csp-processing-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAS,MAAM,iBAAiB,CAAC;AAK1D,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,YAAY,EAAuB,MAAM,UAAU,CAAC;AAE7F,qBAAa,iBAAkB,SAAQ,KAAK;;CAI3C;AAMD,qBAAa,oBAAoB;IAanB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAXnC,OAAO,CAAC,mBAAmB,CAAuB;IAElD,OAAO,CAAC,2BAA2B,CAAqD;IACxF,OAAO,CAAC,6BAA6B,CAAa;IAClD,OAAO,CAAC,oBAAoB,CAAgF;IAE5G,OAAO,CAAC,qBAAqB,CAI3B;gBAC2B,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;IAElD,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,GAAG,UAAU;IAoBvE,wBAAwB,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,MAAM,EAAE;IASjF,OAAO,CAAC,sBAAsB;IAW9B,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,2BAA2B;IAgBnC,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,oBAAoB;CAa7B"}
@@ -51,17 +51,20 @@ class CSPProcessingService {
51
51
  }
52
52
  }
53
53
  }
54
+ egressesToStringMap(externalPermissions) {
55
+ return externalPermissions?.map((egress) => (typeof egress === 'object' ? egress.address : egress));
56
+ }
54
57
  mapExternalPermissionsToCsp(externalPermissions) {
55
58
  const { images, media, scripts, fetch, styles, fonts, frames } = externalPermissions;
56
59
  this.assertValidFetchClient(fetch);
57
60
  return {
58
- 'img-src': images ?? [],
59
- 'media-src': media ?? [],
60
- 'script-src': scripts ?? [],
61
- 'style-src': styles ?? [],
61
+ 'img-src': this.egressesToStringMap(images) ?? [],
62
+ 'media-src': this.egressesToStringMap(media) ?? [],
63
+ 'script-src': this.egressesToStringMap(scripts) ?? [],
64
+ 'style-src': this.egressesToStringMap(styles) ?? [],
62
65
  'connect-src': fetch?.client ?? [],
63
- 'font-src': fonts ?? [],
64
- 'frame-src': frames ?? []
66
+ 'font-src': this.egressesToStringMap(fonts) ?? [],
67
+ 'frame-src': this.egressesToStringMap(frames) ?? []
65
68
  };
66
69
  }
67
70
  getStyleSrc($, userStyleSrc) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/csp",
3
- "version": "3.7.0-next.0-experimental-8477be1",
3
+ "version": "3.7.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,8 +11,8 @@
11
11
  "clean": "rm -rf ./out && rm -f tsconfig.tsbuildinfo"
12
12
  },
13
13
  "devDependencies": {
14
- "@forge/cli-shared": "6.8.0-next.15-experimental-8477be1",
15
- "@forge/manifest": "8.9.0-next.8-experimental-8477be1",
14
+ "@forge/cli-shared": "6.8.0-next.24",
15
+ "@forge/manifest": "8.9.0-next.12",
16
16
  "@types/jest": "^29.5.12",
17
17
  "@types/node": "14.18.63"
18
18
  },