@forge/egress 2.1.1 → 2.2.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @forge/egress
 
+## 2.2.0-next.0
+
+### Minor Changes
+
+- d7f1cb8: Replacing minimatch package with regexp
+
 ## 2.1.1
 
 ### Patch Changes

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

@@ -6,6 +6,7 @@ export declare class EgressFilteringService {
     private parseUrl;
     containsWildCardEgress(): boolean;
     isValidUrl(url: string): boolean;
-    private allowedDomain;
+    private allowedDomainExact;
+    private allowedDomainPattern;
 }
 //# 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,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;IAIT,sBAAsB,IAAI,OAAO;IAKjC,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":"AAOA,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAY;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAe;IAC/C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAU;gBAE/B,SAAS,EAAE,MAAM,EAAE;IAc/B,OAAO,CAAC,QAAQ;IAIT,sBAAsB,IAAI,OAAO;IAKjC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IASvC,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,oBAAoB;CAK7B"}

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

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EgressFilteringService = void 0;
-const minimatch_1 = require("minimatch");
 const url_parser_1 = require("./url-parser");
+const utils_1 = require("./utils");
 class EgressFilteringService {
     constructor(allowList) {
         this.URLs = allowList.filter((domainOrURL) => !domainOrURL.startsWith('*')).map((url) => this.parseUrl(url));
         this.wildcardDomains = allowList
             .filter((domainOrURL) => domainOrURL !== '*')
             .map((url) => this.parseUrl(url))
-            .filter((url) => decodeURIComponent(url.hostname).startsWith('*'));
+            .filter((url) => decodeURIComponent(url.hostname).startsWith('*'))
+            .map((url) => ({
+            ...url,
+            regex: (0, utils_1.globToRegex)(decodeURIComponent(url.hostname))
+        }));
         this.allowsEverything = allowList.includes('*');
     }
     parseUrl(url) {
@@ -23,12 +27,17 @@ class EgressFilteringService {
             return true;
         }
         const parsedUrl = this.parseUrl(url);
-        return this.allowedDomain(parsedUrl, this.URLs) || this.allowedDomain(parsedUrl, this.wildcardDomains);
+        return this.allowedDomainExact(parsedUrl, this.URLs) || this.allowedDomainPattern(parsedUrl, this.wildcardDomains);
     }
-    allowedDomain(domain, allowList) {
+    allowedDomainExact(domain, allowList) {
         return allowList
             .filter((allowed) => allowed.protocol === domain.protocol)
-            .some((url) => (0, minimatch_1.minimatch)(domain.hostname, decodeURIComponent(url.hostname)));
+            .some((url) => url.hostname === domain.hostname);
+    }
+    allowedDomainPattern(domain, allowList) {
+        return allowList
+            .filter((allowed) => allowed.protocol === domain.protocol)
+            .some((pattern) => pattern.regex.test(domain.hostname));
     }
 }
 exports.EgressFilteringService = EgressFilteringService;

package/out/egress/utils.d.ts

@@ -1,3 +1,4 @@
+export declare function globToRegex(pattern: string): RegExp;
 declare const sortAndGroupEgressPermissionsByDomain: (egressAddresses: string[]) => Array<string>;
 export declare enum EgressType {
     FetchBackendSide = "FETCH_BACKEND_SIDE",

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/egress/utils.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,qCAAqC,oBAAqB,MAAM,EAAE,KAAG,MAAM,MAAM,CA6BtF,CAAC;AAEF,oBAAY,UAAU;IACpB,gBAAgB,uBAAuB;IACvC,eAAe,sBAAsB;IACrC,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,UAAU,eAAe;IACzB,OAAO,YAAY;IACnB,MAAM,WAAW;CAClB;AAED,oBAAY,cAAc;IACxB,SAAS,cAAc;CACxB;AAED,oBAAY,iBAAiB,GAAG;IAC9B,IAAI,EAAE,UAAU,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,oBAAY,2BAA2B,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC;AAEzG,UAAU,eAAe;IACvB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,eAAe,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,QAAA,MAAM,yBAAyB,UAAW;IACxC,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC5B,kBAAkB,CAAC,EAAE,qBAAqB,EAAE,CAAC;CAC9C,KAAG,2BAA2B,EA4B9B,CAAC;AAEF,OAAO,EAAE,qCAAqC,EAAE,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/egress/utils.ts"],"names":[],"mappings":"AAMA,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAOnD;AAED,QAAA,MAAM,qCAAqC,oBAAqB,MAAM,EAAE,KAAG,MAAM,MAAM,CA6BtF,CAAC;AAEF,oBAAY,UAAU;IACpB,gBAAgB,uBAAuB;IACvC,eAAe,sBAAsB;IACrC,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,UAAU,eAAe;IACzB,OAAO,YAAY;IACnB,MAAM,WAAW;CAClB;AAED,oBAAY,cAAc;IACxB,SAAS,cAAc;CACxB;AAED,oBAAY,iBAAiB,GAAG;IAC9B,IAAI,EAAE,UAAU,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,oBAAY,2BAA2B,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC;AAEzG,UAAU,eAAe;IACvB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,eAAe,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,QAAA,MAAM,yBAAyB,UAAW;IACxC,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC5B,kBAAkB,CAAC,EAAE,qBAAqB,EAAE,CAAC;CAC9C,KAAG,2BAA2B,EA4B9B,CAAC;AAEF,OAAO,EAAE,qCAAqC,EAAE,yBAAyB,EAAE,CAAC"}

package/out/egress/utils.js

@@ -1,8 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEgressesBasedOnToggles = exports.sortAndGroupEgressPermissionsByDomain = exports.EgressCategory = exports.EgressType = void 0;
-const minimatch_1 = require("minimatch");
+exports.getEgressesBasedOnToggles = exports.sortAndGroupEgressPermissionsByDomain = exports.EgressCategory = exports.EgressType = exports.globToRegex = void 0;
 const url_parser_1 = require("./url-parser");
+function globToRegex(pattern) {
+    const escaped = pattern.replace(/[.+?^${}()|[\]\\]/g, '\\$&');
+    const regexPattern = escaped.replace(/\*/g, '.*');
+    return new RegExp(`^${regexPattern}$`);
+}
+exports.globToRegex = globToRegex;
 const sortAndGroupEgressPermissionsByDomain = (egressAddresses) => {
     if ((egressAddresses === null || egressAddresses === void 0 ? void 0 : egressAddresses.length) === 0) {
         return [];
@@ -15,14 +20,14 @@ const sortAndGroupEgressPermissionsByDomain = (egressAddresses) => {
         const url = (0, url_parser_1.parseUrl)(itemWithProtocol);
         if (url.hostname.startsWith('*')) {
             domains.add(url.hostname.substring(2));
-            wildcardDomains.push(new minimatch_1.Minimatch(url.hostname));
+            wildcardDomains.push(globToRegex(url.hostname));
         }
         else {
             domains.add(url.hostname);
         }
     });
     return [...domains].sort().reduce((grouped, domain) => {
-        if (!wildcardDomains.some((wcd) => wcd.match(domain))) {
+        if (!wildcardDomains.some((pattern) => pattern.test(domain))) {
             grouped.push(domain);
         }
         return grouped;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/egress",
-  "version": "2.1.1",
+  "version": "2.2.0-next.0",
   "description": "Helpers and utils for egress implementation in Forge apps",
   "main": "out/index.js",
   "author": "Atlassian",
@@ -16,9 +16,6 @@
     "@types/jest": "^29.5.14",
     "@types/node": "20.19.1"
   },
-  "dependencies": {
-    "minimatch": "^9.0.5"
-  },
   "publishConfig": {
     "registry": "https://packages.atlassian.com/api/npm/npm-public/"
   }