Merge pull request #87 from pwa-builder/ignore_shortcut_entries

Null hardening changes

Author: JudahGabriel

lib/manifestTools/validationRules/w3cManifestSchema.js

@@ -40,7 +40,7 @@ module.exports = function (manifestContent, callback) {
       });
     }
 
-    var member = err.dataPath.split('/').pop();
+    var member = err.dataPath && typeof err.dataPath === "string" && err.dataPath.split('/').pop();
     if (err.code !== tv4.errorCodes.UNKNOWN_PROPERTY || (member && member.indexOf('_') < 0)) {
       validationResults.push({
         'description': message,

lib/processTools.js

@@ -14,7 +14,7 @@ var node_modules = 'node_modules';
 
 function writeOutput(text, bufferedOutput, source, title) {
 
-  var lines = (title + bufferedOutput + text).split(/\r?\n/);
+  var lines = ("" + title + bufferedOutput + text).split(/\r?\n/);
   bufferedOutput = lines.pop();    
 
   lines.forEach(function (line) {

lib/projectBuilder.js

@@ -115,6 +115,10 @@ function createApps(w3cManifestInfo, rootDir, platforms, options, href, callback
     }
   }
 
+  if (!w3cManifestInfo || !w3cManifestInfo.content) {
+    return Q.reject(new Error("missing manifest information")).nodeify(callback);
+  }
+
   if (!href) {
     href = '/';
   }

lib/validations.js

@@ -1,4 +1,4 @@
-'use strict';
+'use strict';
 
 var platformTools = require('./platformTools'),
   manifestTools = require('./manifestTools');
@@ -36,13 +36,21 @@ function manifestFormatValid(format) {
 }
 
 function isExpectedValidationError(errorResult) {
-  const checkForPurposeList = errorResult.member.includes("icons") && errorResult.member.includes("purpose")
+  if (!errorResult.member) {
+    return false;
+  }
+
+  const checkForPurposeList = errorResult.member.includes("icons") && errorResult.member.includes("purpose");
 
   return checkForPurposeList
 }
 
 function isExpectedCase(errorResult, w3cManifestInfo) {
-  const errorParams = errorResult.member.split('/').slice(1) //example: /icons/0/purpose -> ['icons', '0', 'purpose']
+  if (!errorResult.member) {
+    return true;
+  }
+
+  const errorParams = errorResult.member.split('/').slice(1); //example: /icons/0/purpose -> ['icons', '0', 'purpose']
   const isIconsPurpose = errorResult.member.includes("icons") && errorResult.member.includes("purpose");
   const isShortcuts = errorResult.member.includes("shortcuts");
   const isScreenshots = errorResult.member.includes("screenshots"); // in the case we need to extend it to screenshots as well...
@@ -52,13 +60,14 @@ function isExpectedCase(errorResult, w3cManifestInfo) {
     return true;
 
   } else  if (isIconsPurpose) {
-    const [icons, index, purpose] = errorParams
+    const [icons, index, purpose] = errorParams;
 
     return w3cManifestInfo.content.icons
       && w3cManifestInfo.content.icons[index]
+      && w3cManifestInfo.content.icons[index].purpose 
       && w3cManifestInfo.content.icons[index].purpose.split(" ").filter(entry => {
         return (entry === "any" || entry === "maskable" || entry === "monochrome");
-    }).length > 0
+    }).length > 0;
   }
 
   return false;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "pwabuilder-lib",
-  "version": "2.1.10",
+  "version": "2.1.11",
   "description": "PWA Builder Core Library",
   "repository": {
     "type": "git",