@forge/manifest 12.0.0 → 12.1.0-experimental-8b78d46

package/out/validators/permissions-validator.js

@@ -28,9 +28,9 @@ class PermissionsValidator {
     remotesHasValidEntryForKey(remoteMap, key) {
         return (remoteMap !== undefined &&
             remoteMap.has(key) &&
-            (remoteMap.get(key) === null || this.isValidURL(remoteMap.get(key))));
+            (remoteMap.get(key) === null || this.isValidURL(remoteMap.get(key), false)));
     }
-    isValidURL(inputURL) {
+    isValidURL(inputURL, allowGlobalUrl) {
         const protocolRegex = /^(.*?:\/\/)/;
         const validURI = /^(\*\.)?[.a-zA-Z0-9_\-\/:~#%?=&]+$/;
         const allowedProtocols = ['https:', 'wss:'];
@@ -38,8 +38,8 @@ class PermissionsValidator {
         if (inputURL.length > MAX_URL_LENGTH) {
             return false;
         }
-        if (inputURL === '*') {
-            return true;
+        if (inputURL === egress_types_1.GLOBAL_URL) {
+            return allowGlobalUrl;
         }
         const customURLSchemeRegex = /^[a-zA-Z]+:(\\\\)?/;
         if (customURLSchemeRegex.test(inputURL) &&
@@ -70,6 +70,18 @@ class PermissionsValidator {
         ];
         return BASE_64_HASH_PATTERNS.some((pattern) => pattern.test(cspString));
     }
+    hasPathComponent(url) {
+        try {
+            const protocolRegex = /^(.*?:\/\/)/;
+            const urlWithProtocol = protocolRegex.test(url) ? url : `https://${url}`;
+            const parsedUrl = new url_1.URL(urlWithProtocol);
+            const pathname = parsedUrl.pathname;
+            return pathname.length > 0 && pathname !== '/';
+        }
+        catch {
+            return false;
+        }
+    }
     addValidationErrors(result, element, values, manifest) {
         values.forEach((value) => {
             result.push({
@@ -81,7 +93,7 @@ class PermissionsValidator {
         });
     }
     validateExternalPermissionURLs(result, extPermType, perms, manifest) {
-        const invalidPerms = perms?.filter((key) => !this.isValidURL(key));
+        const invalidPerms = perms?.filter((key) => !this.isValidURL(key, true));
         if (invalidPerms?.length) {
             this.addValidationErrors(result, extPermType, invalidPerms, manifest);
         }
@@ -115,6 +127,19 @@ class PermissionsValidator {
                 });
             }
         }
+        if (extPermType === 'external.fetch.backend') {
+            const urlsWithPaths = perms?.filter((key) => this.hasPathComponent(key));
+            if (urlsWithPaths?.length) {
+                urlsWithPaths.forEach((url) => {
+                    result.push({
+                        message: text_1.errors.permissions.backendEgressPathIgnored(url),
+                        reference: text_1.References.Permissions,
+                        level: 'warning',
+                        ...(0, utils_1.findPosition)(url, manifest.yamlContentByLine)
+                    });
+                });
+            }
+        }
     }
     async validate(manifest) {
         if (!manifest || !manifest.typedContent || !manifest.typedContent.permissions) {
@@ -186,7 +211,7 @@ class PermissionsValidator {
             }
         ];
         mapping.forEach((item) => this.validateExternalPermissionURLs(errors, item.element, item.perms, manifest));
-        const { fetch: originalFetch, ...restOfExternalPermissions } = manifest.typedContent.permissions.external || {};
+        const { fetch: originalFetch, configurable: _configurable, ...restOfExternalPermissions } = manifest.typedContent.permissions.external || {};
         Object.entries(originalFetch || {}).forEach(([key, values]) => {
             if (values.some((value) => typeof value === 'string')) {
                 errors.push({
@@ -215,24 +240,14 @@ class PermissionsValidator {
         });
         const remoteMap = manifest.typedContent.remotes?.reduce((prev, item) => {
             if ((0, features_1.configurableRemotesEnabled)()) {
-                if (typeof item.configurable !== 'undefined') {
-                    if (typeof item.configurable.default !== 'undefined') {
-                        const baseUrl = item.configurable.default;
-                        return prev.set(item.key, baseUrl);
-                    }
-                    else {
-                        return prev.set(item.key, null);
-                    }
+                if (item.baseUrl) {
+                    const baseUrl = typeof item.baseUrl === 'string' ? item.baseUrl : item.baseUrl.default;
+                    return prev.set(item.key, baseUrl);
                 }
-                else {
-                    if (typeof item.baseUrl !== 'undefined') {
-                        const baseUrl = typeof item.baseUrl === 'string' ? item.baseUrl : item.baseUrl.default;
-                        return prev.set(item.key, baseUrl);
-                    }
-                    else {
-                        return prev;
-                    }
+                if (!item.baseUrl && item.configurable) {
+                    return prev.set(item.key, null);
                 }
+                return prev;
             }
             else {
                 if (item.baseUrl !== undefined) {

package/out/validators/remotes-is-configurable-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remotes-is-configurable-validator.d.ts","sourceRoot":"","sources":["../../src/validators/remotes-is-configurable-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAmB,MAAM,UAAU,CAAC;AAKrF,qBAAa,kCACX,YAAW,kBAAkB,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,EAAE,cAAc,CAAC;YAI3E,WAAW;IAiCnB,WAAW,CACf,QAAQ,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,GACnD,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;IAgE9C,QAAQ,CACZ,QAAQ,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,GACnD,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;CAOrD"}
+{"version":3,"file":"remotes-is-configurable-validator.d.ts","sourceRoot":"","sources":["../../src/validators/remotes-is-configurable-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAmB,MAAM,UAAU,CAAC;AAKrF,qBAAa,kCACX,YAAW,kBAAkB,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,EAAE,cAAc,CAAC;YAI3E,WAAW;IAiCnB,WAAW,CACf,QAAQ,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,GACnD,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;IA+B9C,QAAQ,CACZ,QAAQ,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,GACnD,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;CAOrD"}

package/out/validators/remotes-is-configurable-validator.js

@@ -38,43 +38,14 @@ class RemotesIsUserConfigurableValidator {
         }
         const remotes = manifest.typedContent.remotes;
         const validationErrors = [];
-        const configurableRemotesAllowed = manifest.typedContent.permissions?.configurable?.enabled ?? false;
         remotes?.forEach((remote) => {
-            if (!configurableRemotesAllowed) {
-                if (remote.configurable !== undefined) {
-                    validationErrors.push({
-                        message: text_1.errors.modules.remote.userConfigurationPermissionsMismatch(remote.key),
-                        reference: text_1.References.App,
-                        level: 'error',
-                        ...(0, utils_1.findPosition)(remote.key, manifest.yamlContentByLine)
-                    });
-                }
-                if (remote.configurable === undefined && remote.baseUrl === undefined) {
-                    validationErrors.push({
-                        message: text_1.errors.modules.remote.baseUrlNotPresent(remote.key),
-                        reference: text_1.References.App,
-                        level: 'error',
-                        ...(0, utils_1.findPosition)(remote.key, manifest.yamlContentByLine)
-                    });
-                }
-            }
-            else {
-                if (remote.configurable === undefined && remote.baseUrl === undefined) {
-                    validationErrors.push({
-                        message: text_1.errors.modules.remote.neitherBaseUrlNorUserConfigurationPresent(remote.key),
-                        reference: text_1.References.App,
-                        level: 'error',
-                        ...(0, utils_1.findPosition)(remote.key, manifest.yamlContentByLine)
-                    });
-                }
-                else if (remote.configurable !== undefined && remote.baseUrl !== undefined) {
-                    validationErrors.push({
-                        message: text_1.errors.modules.remote.bothBaseUrlAndUserConfigurationPresent(remote.key),
-                        reference: text_1.References.App,
-                        level: 'error',
-                        ...(0, utils_1.findPosition)(remote.key, manifest.yamlContentByLine)
-                    });
-                }
+            if (remote.configurable === undefined && remote.baseUrl === undefined) {
+                validationErrors.push({
+                    message: text_1.errors.modules.remote.neitherBaseUrlNorUserConfigurationPresent(remote.key),
+                    reference: text_1.References.App,
+                    level: 'error',
+                    ...(0, utils_1.findPosition)(remote.key, manifest.yamlContentByLine)
+                });
             }
         });
         return {

package/out/validators/twg-preview-scopes-validator.d.ts

@@ -0,0 +1,7 @@
+import { ValidatorInterface } from './validator-interface';
+import { ManifestObject, ManifestValidationResult } from '../types';
+import { ManifestSchema } from '../schema/manifest';
+export declare class TwgPreviewScopesValidator implements ValidatorInterface<ManifestObject<ManifestSchema> | undefined, ManifestSchema> {
+    validate(manifest: ManifestObject<ManifestSchema> | undefined): Promise<ManifestValidationResult<ManifestSchema>>;
+}
+//# sourceMappingURL=twg-preview-scopes-validator.d.ts.map

package/out/validators/twg-preview-scopes-validator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"twg-preview-scopes-validator.d.ts","sourceRoot":"","sources":["../../src/validators/twg-preview-scopes-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAepD,qBAAa,yBACX,YAAW,kBAAkB,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,EAAE,cAAc,CAAC;IAEnF,QAAQ,CACZ,QAAQ,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,GACnD,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;CAyBrD"}

package/out/validators/twg-preview-scopes-validator.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TwgPreviewScopesValidator = void 0;
+const text_1 = require("../text");
+const utils_1 = require("../utils");
+const scopes_1 = require("../utils/scopes");
+const TWG_PREVIEW_SCOPES = ['read:graph:jira', 'read:graph:confluence'];
+class TwgPreviewScopesValidator {
+    async validate(manifest) {
+        if (!manifest?.typedContent?.permissions?.scopes) {
+            return { success: true, manifestObject: manifest };
+        }
+        const manifestScopes = (0, scopes_1.getAllScopeKeys)(manifest.typedContent.permissions.scopes);
+        const foundTwgScopes = manifestScopes.filter((scope) => TWG_PREVIEW_SCOPES.includes(scope));
+        if (foundTwgScopes.length > 0) {
+            return {
+                success: true,
+                manifestObject: manifest,
+                errors: [
+                    {
+                        message: text_1.errors.twgPreviewScopes(foundTwgScopes),
+                        reference: text_1.References.Deprecated,
+                        level: 'warning',
+                        ...(0, utils_1.findPosition)('scopes', manifest?.yamlContentByLine)
+                    }
+                ]
+            };
+        }
+        return { success: true, manifestObject: manifest };
+    }
+}
+exports.TwgPreviewScopesValidator = TwgPreviewScopesValidator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/manifest",
-  "version": "12.0.0",
+  "version": "12.1.0-experimental-8b78d46",
   "description": "Definitions and validations of the Forge manifest",
   "main": "out/index.js",
   "scripts": {