@forge/egress 1.2.0 → 1.2.1-next.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @forge/egress
 
+## 1.2.1-next.0
+
+### Patch Changes
+
+- f18ccd86: Fixed bug greedily extracting the protocol from provided egress domains
+
 ## 1.2.0
 
 ### Minor Changes

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

@@ -2,7 +2,6 @@ export declare class EgressFilteringService {
     private readonly URLs;
     private readonly wildcardDomains;
     private readonly allowsEverything;
-    private readonly DEFAULT_PROTOCOL;
     constructor(allowList: string[]);
     private parseUrl;
     isValidUrl(url: string): boolean;

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,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"}
+{"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;gBAE/B,SAAS,EAAE,MAAM,EAAE;IAU/B,OAAO,CAAC,QAAQ;IAKT,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IASvC,OAAO,CAAC,aAAa;CAKtB"}

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

@@ -6,7 +6,6 @@ const minimatch_1 = tslib_1.__importDefault(require("minimatch"));
 const url_parser_1 = require("./url-parser");
 class EgressFilteringService {
     constructor(allowList) {
-        this.DEFAULT_PROTOCOL = 'https://';
         this.URLs = allowList.filter((domainOrURL) => !domainOrURL.startsWith('*')).map((url) => this.parseUrl(url));
         this.wildcardDomains = allowList
             .filter((domainOrURL) => domainOrURL !== '*')
@@ -15,9 +14,7 @@ class EgressFilteringService {
         this.allowsEverything = allowList.includes('*');
     }
     parseUrl(url) {
-        const protocolRegex = /^(.*:\/\/)/;
-        const urlWithProtocol = protocolRegex.test(url) ? url : `${this.DEFAULT_PROTOCOL}${url}`;
-        return (0, url_parser_1.parseUrl)(urlWithProtocol);
+        return (0, url_parser_1.parseUrl)(url);
     }
     isValidUrl(url) {
         if (this.allowsEverything) {

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

@@ -1 +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"}
+{"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,CAQ7C"}

package/out/egress/url-parser.js

@@ -3,8 +3,11 @@ 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];
+    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, '')
+        .replace(/^\/*/, '')
+        .split(/[\?\/]/)[0];
     return { protocol, hostname };
 }
 exports.parseUrl = parseUrl;

package/package.json

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