[AG] fix validator: invalidate XML with no closing tag

Author: amitguptagwl

spec/attr_spec.js

@@ -214,7 +214,7 @@ describe("XMLParser", function() {
         const expected = {
             "err": {
                 "code": "InvalidTag",
-                "msg":  "closing tag issue can't have attributes or invalid starting."
+                "msg":  "closing tag \"issue\" can't have attributes or invalid starting."
             }
         };
         const result = validator.validate(xmlData);
@@ -253,7 +253,7 @@ describe("XMLParser", function() {
         const expected = {
             "err": {
                 "code": "InvalidAttr",
-                "msg":  "Attributes for rootNode have open quote"
+                "msg":  "Attributes for \"rootNode\" have open quote."
             }
         };
         const result = validator.validate(xmlData);

spec/validator_spec.js

@@ -89,7 +89,7 @@ describe("XMLParser", function() {
         expect(result).toEqual(expected);
 
         xmlData = "<rootNode></rootnode 123>";
-        expected = {code: "InvalidTag", msg: "closing tag rootnode can't have attributes or invalid starting."};
+        expected = {code: "InvalidTag", msg: "closing tag \"rootnode\" can't have attributes or invalid starting."};
         result = validator.validate(xmlData).err;
         //console.log(JSON.stringify(result,null,4));
         expect(result).toEqual(expected);
@@ -411,4 +411,17 @@ describe("XMLParser", function() {
         var result = validator.validate(xmlData);
         expect(result).toEqual(true);
       });
+
+      it('should validate xml not properly closed', () => {
+        const xmlData = `
+    <name
+    attribute1="attribute1"
+    attribute2="attribute2"
+    ></name
+            `;
+    
+        const expected = {code: "InvalidTag", msg: "closing tag \"name\" don't have proper closing."};
+        var result = validator.validate(xmlData).err;
+        expect(result).toEqual(expected);
+      });
 });

src/validator.js

@@ -74,7 +74,7 @@ exports.validate = function(xmlData, options) {
 
         const result = readAttributeStr(xmlData, i);
         if (result === false) {
-          return {err: {code: 'InvalidAttr', msg: 'Attributes for ' + tagName + ' have open quote'}};
+          return {err: {code: 'InvalidAttr', msg: 'Attributes for "' + tagName + '" have open quote.'}};
         }
         let attrStr = result.value;
         i = result.index;
@@ -90,9 +90,13 @@ exports.validate = function(xmlData, options) {
             return isValid;
           }
         } else if (closingTag) {
-          if (attrStr.trim().length > 0) {
+          if(!result.tagClosed){
             return {
-              err: {code: 'InvalidTag', msg: 'closing tag ' + tagName + " can't have attributes or invalid starting."},
+              err: {code: 'InvalidTag', msg: 'closing tag "' + tagName + "\" don't have proper closing."},
+            };
+          }else if (attrStr.trim().length > 0) {
+            return {
+              err: {code: 'InvalidTag', msg: 'closing tag "' + tagName + "\" can't have attributes or invalid starting."},
             };
           } else {
             const otg = tags.pop();
@@ -235,6 +239,7 @@ var singleQuote = "'";
 function readAttributeStr(xmlData, i) {
   let attrStr = '';
   let startChar = '';
+  let tagClosed = false;
   for (; i < xmlData.length; i++) {
     if (xmlData[i] === doubleQuote || xmlData[i] === singleQuote) {
       if (startChar === '') {
@@ -247,6 +252,7 @@ function readAttributeStr(xmlData, i) {
       }
     } else if (xmlData[i] === '>') {
       if (startChar === '') {
+        tagClosed = true;
         break;
       }
     }
@@ -256,7 +262,7 @@ function readAttributeStr(xmlData, i) {
     return false;
   }
 
-  return {value: attrStr, index: i};
+  return {value: attrStr, index: i, tagClosed: tagClosed};
 }
 
 /**