fix(validators): only validating when URL is present

a regression introduced via PR #53 due to flat package list now being all-inclusive of packages, some of which have no protocol or URL to resolve to (the nested deps) and so the validators failed.
lirantal · Feb 4, 2020 · 373e589 · 373e589
1 parent 8b00015
commit 373e589
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/packages/lockfile-lint-api/src/validators/ValidateHttps.js b/packages/lockfile-lint-api/src/validators/ValidateHttps.js
@@ -28,18 +28,18 @@ module.exports = class ValidateHttps {
 
       try {
         packageResolvedURL = new URL(packageMetadata.resolved)
+
+        if (packageResolvedURL.protocol !== HTTPS_PROTOCOL) {
+          validationResult.errors.push({
+            message: `detected invalid protocol for package: ${packageName}\n    expected: ${HTTPS_PROTOCOL}\n    actual: ${
+              packageResolvedURL.protocol
+            }\n`,
+            package: packageName
+          })
+        }
       } catch (error) {
         // swallow error (assume that the version is correct)
       }
-
-      if (packageResolvedURL.protocol !== HTTPS_PROTOCOL) {
-        validationResult.errors.push({
-          message: `detected invalid protocol for package: ${packageName}\n    expected: ${HTTPS_PROTOCOL}\n    actual: ${
-            packageResolvedURL.protocol
-          }\n`,
-          package: packageName
-        })
-      }
     }
 
     if (validationResult.errors.length !== 0) {

diff --git a/packages/lockfile-lint-api/src/validators/ValidateScheme.js b/packages/lockfile-lint-api/src/validators/ValidateScheme.js
@@ -30,19 +30,18 @@ module.exports = class ValidateProtocol {
 
       try {
         packageResolvedURL = new URL(packageMetadata.resolved)
+
+        if (packageResolvedURL.protocol && schemes.indexOf(packageResolvedURL.protocol) === -1) {
+          validationResult.errors.push({
+            message: `detected invalid scheme(s) for package: ${packageName}\n    expected: ${schemes}\n    actual: ${
+              packageResolvedURL.protocol
+            }\n`,
+            package: packageName
+          })
+        }
       } catch (error) {
         // swallow error (assume that the version is correct)
       }
-
-      if (packageResolvedURL.protocol && schemes.indexOf(packageResolvedURL.protocol) === -1) {
-        // throw new Error(`detected invalid origin for package: ${packageName}`)
-        validationResult.errors.push({
-          message: `detected invalid scheme(s) for package: ${packageName}\n    expected: ${schemes}\n    actual: ${
-            packageResolvedURL.protocol
-          }\n`,
-          package: packageName
-        })
-      }
     }
 
     if (validationResult.errors.length !== 0) {