Fix invalid char before root tag

macedigital · Aug 28, 2015 · 9042140 · 9042140
1 parent 84a4e3c
commit 9042140
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/lib/types/xml.js b/lib/types/xml.js
@@ -25,7 +25,7 @@ module.exports.regexp = regexp;
 function xmlparser(options) {
 
   var parserOptions = util._extend({
-      async: true,
+      async: false,
       explicitArray: true,
       normalize: true,
       normalizeTags: true,
@@ -82,7 +82,7 @@ function xmlparser(options) {
     });
 
     // since xml2js v0.4.5 parse errors propagate without being able to catch them otherwise
-    parser.saxParser.onerror = responseHandler;
+    // parser.saxParser.onerror = responseHandler;
 
     // in case `parseString` callback never was called, ensure response is sent
     parser.saxParser.onend = function() {
@@ -92,7 +92,7 @@ function xmlparser(options) {
     };
 
     req.on('end', function () {
-      
+
       // invalid xml, length required
       if (data.trim().length === 0) {
         return next(error(411));

diff --git a/test/test.js b/test/test.js
@@ -104,6 +104,14 @@ describe('XmlParserMiddleware', function () {
         .expect(400, done);
     });
 
+    it('should throw 400 on invalid char before root tag', function (done) {
+      request(app)
+        .post('/')
+        .set('Content-Type', 'application/vendor-spec+xml')
+        .send('"<xml>ok</xml>')
+        .expect(400, done);
+    });
+
     it('should throw 400 on unexpected end', function (done) {
       request(app)
         .post('/')
@@ -118,7 +126,9 @@ describe('XmlParserMiddleware', function () {
         .set('Content-Type', 'application/xml')
         .send('<xml></xml>')
         .expect(200, function (err, res) {
-          assert.deepEqual(res.body, {});
+          assert.deepEqual(res.body, {
+            xml: ''
+          });
           done();
         });
     });
@@ -144,7 +154,7 @@ describe('XmlParserMiddleware', function () {
         .send('<xml>this is invalid')
         .expect(400, done);
     });
-    
+
     it('should throw 400 on invalid xml body', function (done) {
       request(app)
         .post('/')
@@ -237,7 +247,7 @@ describe('XmlParserMiddleware', function () {
     app.post('/', function (req, res) {
       res.json(req.body);
     });
-    
+
     app.post('/xml', xmlparser(), function (req, res) {
       res.json(req.body);
     });