@contentful/app-scripts 1.8.2 → 1.9.0

package/lib/utills.test.js

@@ -0,0 +1,62 @@
+const assert = require('assert');
+
+const { isValidNetwork, stripProtocol } = require('./utils');
+
+describe('isValidIpAddress', () => {
+  it('returns true for a valid IP address', () => {
+    const result = isValidNetwork('192.168.0.1');
+    assert.strictEqual(result, true);
+  });
+
+  it('returns true for a valid domain', () => {
+    const result = isValidNetwork('google.com');
+    assert.strictEqual(result, true);
+  });
+
+  it('returns true for a valid ipv6 address', () => {
+    const result = isValidNetwork('2001:0db8:85a3:0000:0000:8a2e:0370:7334');
+    assert.strictEqual(result, true);
+  });
+
+  it('returns true for a valid domain with port', () => {
+    const result = isValidNetwork('google.com:4000');
+    assert.strictEqual(result, true);
+  });
+
+  it('returns true for a valid IP address with port', () => {
+    const result = isValidNetwork('192.168.0.1:2000');
+    assert.strictEqual(result, true);
+  });
+
+  it('returns false for an invalid IP address', () => {
+    const result = isValidNetwork('not an ip address');
+    assert.strictEqual(result, false);
+  });
+
+  it('returns true for an valid ipv6 address with port', () => {
+    const result = isValidNetwork('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:443');
+    assert.strictEqual(result, true);
+  });
+});
+
+describe('removeProtocolFromUrl', () => {
+  it('returns the host of a URL without a protocol', () => {
+    const result = stripProtocol('http://example.com');
+    assert.strictEqual(result, 'example.com');
+  });
+
+  it('returns valid ipv6 address', () => {
+    const result = stripProtocol('http://[2001:0db8:85a3:0000:0000:8a2e:0370]:7334');
+    assert.strictEqual(result, '[2001:0db8:85a3:0000:0000:8a2e:0370]:7334');
+  });
+
+  it('returns valid domain', () => {
+    const result = stripProtocol('example.com');
+    assert.strictEqual(result, 'example.com');
+  });
+
+  it('returns valid domain with port', () => {
+    const result = stripProtocol('example.com:40');
+    assert.strictEqual(result, 'example.com:40');
+  });
+});

package/lib/utils.js

@@ -13,6 +13,18 @@ const throwValidationException = (subject, message, details) => {
   throw new TypeError(message);
 };
 
+const isValidNetwork = (address) => {
+  const addressRegex =
+    /^(?:localhost|(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}|(?:\d{1,3}\.){3}\d{1,3}|(\[(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}\]|(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}))(?::\d{1,5})?$/;
+  return addressRegex.test(address);
+};
+
+const stripProtocol = (url) => {
+  const protocolRemovedUrl = url.replace(/^https?:\/\//, '');
+
+  return protocolRemovedUrl.split('/')[0];
+};
+
 const showCreationError = (subject, message) => {
   console.log(`
     ${chalk.red('Creation error:')}
@@ -81,7 +93,33 @@ function getActionsManifest() {
   ----------------------------`);
     console.log('');
 
-    return manifest.actions.map((action) => ({ parameters: [], ...action })); // adding required parameters
+    const actions = manifest.actions.map((action) => {
+      const allowedNetworks = Array.isArray(action.allowedNetworks)
+        ? allowedNetworks.map(stripProtocol)
+        : [];
+
+      const hasInvalidNetwork = allowedNetworks.find((netWork) => !isValidNetwork(netWork));
+
+      if (hasInvalidNetwork) {
+        console.log(
+          `${chalk.red(
+            'Error:'
+          )} Invalid IP address ${hasInvalidNetwork} found in the allowedNetworks array for action "${
+            action.name
+          }".`
+        );
+        // eslint-disable-next-line no-process-exit
+        process.exit(1);
+      }
+
+      return {
+        parameters: [],
+        ...action,
+        allowedNetworks,
+      };
+    });
+
+    return actions;
   } catch {
     console.log(
       `${chalk.red('Error:')} Invalid JSON in manifest file at ${chalk.bold(
@@ -99,4 +137,6 @@ module.exports = {
   selectFromList,
   showCreationError,
   getActionsManifest,
+  isValidNetwork,
+  stripProtocol,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/app-scripts",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "description": "A collection of scripts for building Contentful Apps",
   "author": "Contentful GmbH",
   "license": "MIT",
@@ -61,5 +61,5 @@
     "open": "8.4.2",
     "ora": "5.4.1"
   },
-  "gitHead": "43e318bc4b0ce268d1e40cf91b2116debf48e93f"
+  "gitHead": "63817dc3be779cc5bf2258d955618069bbeecbe5"
 }