Merge pull request #88 from trufae/parse-hard

mreinstein · web-flow · commit 4031a9d12b92 · 2022-04-26T10:19:58.000-07:00
Be more strict when parsing plists
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,6 +2,7 @@ name: ci
 
 on:
   push:
+  pull_request:
 
 jobs:
   build:
diff --git a/lib/parse.js b/lib/parse.js
@@ -220,5 +220,7 @@ function parsePlistXML (node) {
 
   } else if (node.nodeName === 'false') {
     return false;
+  } else {
+    throw new Error('Invalid PLIST tag ' + node.nodeName);
   }
 }
diff --git a/test/parse.js b/test/parse.js
@@ -519,4 +519,30 @@ int main(int argc, char *argv[])
       });
     });
   });
+  describe('invalid formats', function () {
+    it('should fail parsing invalid xml plist', function () {
+      var xml = multiline(function () {
+/*
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>test</key>
+  <strong>Testing</strong>
+  <key>bar</key>
+  <string></string>
+</dict>
+</plist>
+*/
+      });
+      assert.throws(function () {
+        var parsed = parse(xml);
+      });
+    });
+    it('ensure empty strings arent valid plist', function () {
+      assert.throws(function () {
+        var parsed = parse('');
+      });
+    });
+  });
 });

-Original file line number
+Diff line change
 on:
   push:
 +  pull_request:
 jobs:
   build:
Original file line number	Diff line number	Diff line change
`@@ -220,5 +220,7 @@ function parsePlistXML (node) {`
`220`	`220`
`221`	`221`	`} else if (node.nodeName === 'false') {`
`222`	`222`	`return false;`
	`223`	`+ } else {`
	`224`	`+ throw new Error('Invalid PLIST tag ' + node.nodeName);`
`223`	`225`	`}`
`224`	`226`	`}`