@forge/egress 1.1.2 → 1.2.0-next.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @forge/egress
 
+## 1.2.0-next.1
+
+### Minor Changes
+
+- 3bdedf0: Fix URL-constructor in Firefox browsers
+
+## 1.1.3-next.0
+
+### Patch Changes
+
+- 0da2b48: Removed support for the CLI running on node 14
+
 ## 1.1.2
 
 ### Patch Changes

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

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

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

@@ -1 +1 @@
-{"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;IAU/B,OAAO,CAAC,OAAO;IAQR,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAQvC,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,eAAe;CAWxB"}
+{"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,CAAY;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAY;IAC5C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAU;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAc;gBAEnC,SAAS,EAAE,MAAM,EAAE;IAU/B,OAAO,CAAC,QAAQ;IAQT,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IASvC,OAAO,CAAC,aAAa;CAKtB"}

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

@@ -3,40 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EgressFilteringService = void 0;
 const tslib_1 = require("tslib");
 const minimatch_1 = tslib_1.__importDefault(require("minimatch"));
-const url_1 = require("url");
+const url_parser_1 = require("./url-parser");
 class EgressFilteringService {
     constructor(allowList) {
-        this.URLs = allowList.filter((domainOrURL) => !domainOrURL.startsWith('*')).map((url) => this.safeURL(url));
+        this.DEFAULT_PROTOCOL = 'https://';
+        this.URLs = allowList.filter((domainOrURL) => !domainOrURL.startsWith('*')).map((url) => this.parseUrl(url));
         this.wildcardDomains = allowList
             .filter((domainOrURL) => domainOrURL !== '*')
-            .map((url) => this.safeURL(url))
+            .map((url) => this.parseUrl(url))
             .filter((url) => decodeURIComponent(url.hostname).startsWith('*'));
         this.allowsEverything = allowList.includes('*');
     }
-    safeURL(url, defaultProtocol = 'https://') {
+    parseUrl(url) {
         const protocolRegex = /^(.*:\/\/)/;
-        const urlParser = url_1.URL !== null && url_1.URL !== void 0 ? url_1.URL : window.URL;
-        return new urlParser(protocolRegex.test(url) ? url : `${defaultProtocol}${url}`);
+        const urlWithProtocol = protocolRegex.test(url) ? url : `${this.DEFAULT_PROTOCOL}${url}`;
+        return (0, url_parser_1.parseUrl)(urlWithProtocol);
     }
     isValidUrl(url) {
         if (this.allowsEverything) {
             return true;
         }
-        return this.domainIsAllowed(this.safeURL(url));
+        const parsedUrl = this.parseUrl(url);
+        return this.allowedDomain(parsedUrl, this.URLs) || this.allowedDomain(parsedUrl, this.wildcardDomains);
     }
-    domainCheck(domain, allowList) {
+    allowedDomain(domain, allowList) {
         return allowList
             .filter((allowed) => allowed.protocol === domain.protocol)
             .some((url) => (0, minimatch_1.default)(domain.hostname, decodeURIComponent(url.hostname)));
     }
-    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/url-parser.d.ts

@@ -0,0 +1,3 @@
+export declare type URLLike = Pick<URL, 'hostname' | 'protocol'>;
+export declare function parseUrl(url: string): URLLike;
+//# sourceMappingURL=url-parser.d.ts.map

package/out/egress/url-parser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"url-parser.d.ts","sourceRoot":"","sources":["../../src/egress/url-parser.ts"],"names":[],"mappings":"AAAA,oBAAY,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,UAAU,GAAG,UAAU,CAAC,CAAC;AAKzD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAK7C"}

package/out/egress/url-parser.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseUrl = void 0;
+function parseUrl(url) {
+    var _a, _b;
+    const protocol = (_b = (_a = url.match(/^(.*:\/\/)/)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : 'https://';
+    const hostname = url.replace(protocol, '').split(/[\/?]/)[0];
+    return { protocol, hostname };
+}
+exports.parseUrl = parseUrl;

package/out/egress/utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sortAndGroupEgressPermissionsByDomain = void 0;
 const minimatch_1 = require("minimatch");
-const url_1 = require("url");
+const url_parser_1 = require("./url-parser");
 const sortAndGroupEgressPermissionsByDomain = (egressAddresses) => {
     if ((egressAddresses === null || egressAddresses === void 0 ? void 0 : egressAddresses.length) === 0) {
         return [];
@@ -12,7 +12,7 @@ const sortAndGroupEgressPermissionsByDomain = (egressAddresses) => {
     const wildcardDomains = [];
     egressAddresses.forEach((item) => {
         const itemWithProtocol = protocolRegex.test(item) ? item : `https://${item}`;
-        const url = new url_1.URL(itemWithProtocol);
+        const url = (0, url_parser_1.parseUrl)(itemWithProtocol);
         if (url.hostname.startsWith('*')) {
             domains.add(url.hostname.substring(2));
             wildcardDomains.push((0, minimatch_1.makeRe)(url.hostname));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/egress",
-  "version": "1.1.2",
+  "version": "1.2.0-next.1",
   "description": "Helpers and utils for egress implementation in Forge apps",
   "main": "out/index.js",
   "author": "Atlassian",