@forge/csp 1.11.0-next.0 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @forge/csp
 
+## 2.0.0
+
+### Major Changes
+
+- 3c0ac54: Move egress related services out of @forge/csp into new @forge/egress package
+
+## 2.0.0-next.0
+
+### Major Changes
+
+- 3c0ac54: Move egress related services out of @forge/csp into new @forge/egress package
+
+## 1.11.0
+
+### Minor Changes
+
+- 671a6a63: Skip generating hashes for inline scripts if unsafe-inline is provided
+
 ## 1.11.0-next.0
 
 ### Minor Changes

package/out/index.d.ts

@@ -1,4 +1,3 @@
 export * from './csp';
-export * from './egress';
 export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/out/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,cAAc,OAAO,CAAC;AACtB,cAAc,SAAS,CAAC"}

package/out/index.js

@@ -2,5 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./csp"), exports);
-tslib_1.__exportStar(require("./egress"), exports);
 tslib_1.__exportStar(require("./types"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/csp",
-  "version": "1.11.0-next.0",
+  "version": "2.0.0",
   "description": "Contains the CSP configuration for Custom UI resources in Forge",
   "main": "out/index.js",
   "author": "Atlassian",
@@ -11,13 +11,12 @@
     "clean": "rm -rf ./out && rm -f tsconfig.tsbuildinfo"
   },
   "devDependencies": {
-    "@forge/cli-shared": "^2.5.0-next.1",
-    "@forge/manifest": "^3.8.0-next.0",
+    "@forge/cli-shared": "^3.1.0",
+    "@forge/manifest": "^4.2.0",
     "@types/jest": "^26.0.0"
   },
   "dependencies": {
     "cheerio": "^0.22.0",
-    "content-security-policy-parser": "^0.3.0",
-    "micromatch": "^4.0.2"
+    "content-security-policy-parser": "^0.3.0"
   }
 }

package/out/egress/egress-filtering-service.d.ts

@@ -1,11 +0,0 @@
-export declare class EgressFilteringService {
-    private readonly URLs;
-    private readonly wildcardDomains;
-    private readonly allowsEverything;
-    constructor(allowList: string[]);
-    private safeURL;
-    isValidUrl(url: string): boolean;
-    private domainCheck;
-    private domainIsAllowed;
-}
-//# sourceMappingURL=egress-filtering-service.d.ts.map

package/out/egress/egress-filtering-service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"egress-filtering-service.d.ts","sourceRoot":"","sources":["../../src/egress/egress-filtering-service.ts"],"names":[],"mappings":"AAGA,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAQ;IACxC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAU;gBAE/B,SAAS,EAAE,MAAM,EAAE;IAY/B,OAAO,CAAC,OAAO;IAOR,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAQvC,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,eAAe;CAWxB"}

package/out/egress/egress-filtering-service.js

@@ -1,46 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EgressFilteringService = void 0;
-const tslib_1 = require("tslib");
-const micromatch_1 = tslib_1.__importDefault(require("micromatch"));
-const url_1 = require("url");
-class EgressFilteringService {
-    constructor(allowList) {
-        this.URLs = allowList
-            .filter((domainOrURL) => !domainOrURL.startsWith('*'))
-            .map((url) => this.safeURL(url));
-        this.wildcardDomains = allowList
-            .filter((domainOrURL) => domainOrURL !== '*')
-            .map((url) => this.safeURL(url))
-            .filter((url) => url.hostname.startsWith('*'));
-        this.allowsEverything = allowList.includes('*');
-    }
-    safeURL(url, defaultProtocol = 'https://') {
-        const protocolRegex = /^(.*:\/\/)/;
-        return new url_1.URL(protocolRegex.test(url) ? url : `${defaultProtocol}${url}`);
-    }
-    isValidUrl(url) {
-        if (this.allowsEverything) {
-            return true;
-        }
-        return this.domainIsAllowed(this.safeURL(url));
-    }
-    domainCheck(domain, allowList) {
-        const hostnameMatchedProtocol = allowList
-            .filter((allowed) => allowed.protocol === domain.protocol)
-            .map((url) => url.hostname);
-        return (micromatch_1.default([domain.hostname], hostnameMatchedProtocol, {
-            dot: true
-        }).length > 0);
-    }
-    domainIsAllowed(domain) {
-        if (this.domainCheck(domain, this.URLs)) {
-            return true;
-        }
-        if (this.domainCheck(domain, this.wildcardDomains)) {
-            return true;
-        }
-        return false;
-    }
-}
-exports.EgressFilteringService = EgressFilteringService;

package/out/egress/index.d.ts

@@ -1,3 +0,0 @@
-export * from './egress-filtering-service';
-export * from './utils';
-//# sourceMappingURL=index.d.ts.map

package/out/egress/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/egress/index.ts"],"names":[],"mappings":"AAEA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,SAAS,CAAC"}

package/out/egress/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./egress-filtering-service"), exports);
-tslib_1.__exportStar(require("./utils"), exports);

package/out/egress/utils.d.ts

@@ -1,3 +0,0 @@
-declare const sortAndGroupEgressPermissionsByDomain: (egressAddresses: string[]) => Array<string>;
-export { sortAndGroupEgressPermissionsByDomain };
-//# sourceMappingURL=utils.d.ts.map

package/out/egress/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/egress/utils.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,qCAAqC,oBAAqB,MAAM,EAAE,KAAG,KAAK,CAAC,MAAM,CA2BtF,CAAC;AAEF,OAAO,EAAE,qCAAqC,EAAE,CAAC"}

package/out/egress/utils.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortAndGroupEgressPermissionsByDomain = void 0;
-const tslib_1 = require("tslib");
-const micromatch_1 = tslib_1.__importDefault(require("micromatch"));
-const url_1 = require("url");
-const sortAndGroupEgressPermissionsByDomain = (egressAddresses) => {
-    const protocolRegex = /^(.*?:\/\/)/;
-    const domainSet = new Set();
-    const groupSet = new Set();
-    const removeSet = new Set();
-    if ((egressAddresses === null || egressAddresses === void 0 ? void 0 : egressAddresses.length) === 0) {
-        return [];
-    }
-    egressAddresses.forEach((item) => {
-        const itemWithProtocol = protocolRegex.test(item) ? item : `https://${item}`;
-        const url = new url_1.URL(itemWithProtocol);
-        if (url.hostname.startsWith('*')) {
-            groupSet.add(url.hostname.substring(2));
-            removeSet.add('!' + url.hostname);
-        }
-        else {
-            domainSet.add(url.hostname);
-        }
-    });
-    if (removeSet.size === 0) {
-        return [...domainSet];
-    }
-    return [...new Set(micromatch_1.default([...domainSet], [...removeSet]).concat([...groupSet]))].sort();
-};
-exports.sortAndGroupEgressPermissionsByDomain = sortAndGroupEgressPermissionsByDomain;