fix: error if file source is invalid

pact-foundation · Aug 21, 2022 · f1ad86a · f1ad86a
1 parent 4d020ca
commit f1ad86a
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 39 deletions.
diff --git a/src/verifier/argumentMapper/arguments.ts b/src/verifier/argumentMapper/arguments.ts
@@ -1,5 +1,6 @@
 import logger from '../../logger';
 import fs = require('fs');
+import url = require('url');
 
 import { FnMapping, FnValidationStatus } from './types';
 import { InternalPactVerifierOptions } from '../types';
@@ -91,49 +92,52 @@ export const ffiFnMapping: FnMapping<
       if (options.pactUrls) {
         options.pactUrls.forEach((file) => {
           logger.debug(`checking source type of given pactUrl: ${file}`);
-          try {
-            const u = new URL(file);
 
-            if (u.hostname) {
-              logger.debug(`adding ${file} as a Url source`);
-              ffi.pactffiVerifierUrlSource(
-                handle,
-                file,
-                options.pactBrokerUsername ||
-                  process.env.PACT_BROKER_USERNAME ||
-                  '',
-                options.pactBrokerPassword ||
-                  process.env.PACT_BROKER_PASSWORD ||
-                  '',
-                options.pactBrokerToken || process.env.PACT_BROKER_TOKEN || ''
-              );
-            }
-          } catch {
-            messages.push(`${file} is not a valid URL`);
-          }
+          if (/https?:/.test(url.parse(file).protocol || '')) {
+            try {
+              const u = new URL(file);
 
-          try {
-            const f = fs.lstatSync(file);
+              if (u.hostname) {
+                logger.debug(`adding ${file} as a Url source`);
+                ffi.pactffiVerifierUrlSource(
+                  handle,
+                  file,
+                  options.pactBrokerUsername ||
+                    process.env.PACT_BROKER_USERNAME ||
+                    '',
+                  options.pactBrokerPassword ||
+                    process.env.PACT_BROKER_PASSWORD ||
+                    '',
+                  options.pactBrokerToken || process.env.PACT_BROKER_TOKEN || ''
+                );
+              }
+            } catch {
+              messages.push(`${file} is not a valid URL`);
+            }
+          } else {
+            try {
+              const f = fs.lstatSync(file);
 
-            if (f.isDirectory()) {
-              logger.debug(`adding ${file} as Directory source`);
-              ffi.pactffiVerifierAddDirectorySource(handle, file);
-            } else if (f.isFile() || f.isSymbolicLink()) {
-              logger.debug(`adding ${file} as File source`);
-              ffi.pactffiVerifierAddFileSource(handle, file);
+              if (f.isDirectory()) {
+                logger.debug(`adding ${file} as Directory source`);
+                ffi.pactffiVerifierAddDirectorySource(handle, file);
+              } else if (f.isFile() || f.isSymbolicLink()) {
+                logger.debug(`adding ${file} as File source`);
+                ffi.pactffiVerifierAddFileSource(handle, file);
+              }
+            } catch {
+              messages.push(
+                `'${file}' does not exist, or is not a file or directory`
+              );
             }
-          } catch {
-            messages.push(
-              `'${file}' does not exist, or is not a file or directory`
-            );
           }
         });
 
-        return { status: FnValidationStatus.SUCCESS };
-      }
+        if (messages.length > 0) {
+          return { status: FnValidationStatus.FAIL, messages };
+        }
 
-      if (messages.length > 0) {
-        return { status: FnValidationStatus.FAIL, messages };
+        return { status: FnValidationStatus.SUCCESS };
       }
 
       return { status: FnValidationStatus.IGNORE };

diff --git a/src/verifier/argumentMapper/index.ts b/src/verifier/argumentMapper/index.ts
@@ -14,7 +14,8 @@ export const setupVerification = (
   const functionsToCall = invert(orderOfExecution);
 
   order.map((k) => {
-    const validation = ffiFnMapping[functionsToCall[k]].validateAndExecute(
+    const fn = functionsToCall[k];
+    const validation = ffiFnMapping[fn].validateAndExecute(
       ffi,
       handle,
       options
@@ -23,14 +24,14 @@ export const setupVerification = (
     switch (validation.status) {
       case FnValidationStatus.FAIL:
         logErrorAndThrow(
-          `the required ffi function '${k}' failed validation with errors: ${
+          `the required ffi function '${fn}' failed validation with errors: ${
             validation.messages || [].join(',')
           }`
         );
         break;
       case FnValidationStatus.IGNORE:
         logger.debug(
-          `the optional ffi function '${k}' was not executed as it had non-fatal validation errors: ${
+          `the optional ffi function '${fn}' was not executed as it had non-fatal validation errors: ${
             validation.messages || [].join(',')
           }`
         );
@@ -39,7 +40,7 @@ export const setupVerification = (
         break;
       default:
         logCrashAndThrow(
-          `the ffi function '${k}' returned the following unrecognised validation signal: '${validation.status}'`
+          `the ffi function '${fn}' returned the following unrecognised validation signal: '${validation.status}'`
         );
     }
   });