@forge/egress 1.1.0-next.1 → 1.1.1-next.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @forge/egress
 
+## 1.1.1-next.0
+
+### Patch Changes
+
+- 63d168c: Fix browser compatibility
+
+## 1.1.0
+
+### Minor Changes
+
+- 174deac: Add support for browser environments
+
+### Patch Changes
+
+- 3c0ac54: Move egress related services out of @forge/csp into new @forge/egress package
+
 ## 1.1.0-next.1
 
 ### Minor Changes

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;IAWnB,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,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"}

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EgressFilteringService = void 0;
 const tslib_1 = require("tslib");
-const micromatch_1 = tslib_1.__importDefault(require("micromatch"));
+const minimatch_1 = tslib_1.__importDefault(require("minimatch"));
 const url_1 = require("url");
 class EgressFilteringService {
     constructor(allowList) {
@@ -25,12 +25,9 @@ class EgressFilteringService {
         return this.domainIsAllowed(this.safeURL(url));
     }
     domainCheck(domain, allowList) {
-        const hostnameMatchedProtocol = allowList
+        return allowList
             .filter((allowed) => allowed.protocol === domain.protocol)
-            .map((url) => decodeURIComponent(url.hostname));
-        return (micromatch_1.default([domain.hostname], hostnameMatchedProtocol, {
-            dot: true
-        }).length > 0);
+            .some((url) => minimatch_1.default(domain.hostname, decodeURIComponent(url.hostname)));
     }
     domainIsAllowed(domain) {
         if (this.domainCheck(domain, this.URLs)) {

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,KAAK,CAAC,MAAM,CA2BtF,CAAC;AAEF,OAAO,EAAE,qCAAqC,EAAE,CAAC"}
+{"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,CA6BtF,CAAC;AAEF,OAAO,EAAE,qCAAqC,EAAE,CAAC"}

package/out/egress/utils.js

@@ -1,31 +1,31 @@
 "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 minimatch_1 = require("minimatch");
 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 [];
     }
+    const protocolRegex = /^(.*?:\/\/)/;
+    const domains = new Set();
+    const wildcardDomains = [];
     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);
+            domains.add(url.hostname.substring(2));
+            wildcardDomains.push(minimatch_1.makeRe(url.hostname));
         }
         else {
-            domainSet.add(url.hostname);
+            domains.add(url.hostname);
         }
     });
-    if (removeSet.size === 0) {
-        return [...domainSet];
-    }
-    return [...new Set(micromatch_1.default([...domainSet], [...removeSet]).concat([...groupSet]))].sort();
+    return [...domains].sort().reduce((grouped, domain) => {
+        if (!wildcardDomains.some((wcd) => wcd.test(domain))) {
+            grouped.push(domain);
+        }
+        return grouped;
+    }, []);
 };
 exports.sortAndGroupEgressPermissionsByDomain = sortAndGroupEgressPermissionsByDomain;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/egress",
-  "version": "1.1.0-next.1",
+  "version": "1.1.1-next.0",
   "description": "Helpers and utils for egress implementation in Forge apps",
   "main": "out/index.js",
   "author": "Atlassian",
@@ -14,6 +14,6 @@
     "@types/jest": "^26.0.0"
   },
   "dependencies": {
-    "micromatch": "^4.0.2"
+    "minimatch": "^5.1.0"
   }
 }