Parse internal entity declarations in internal DTD

lib/dom-parser.js

@@ -80,7 +80,12 @@ DOMParser.prototype.parseFromString = function(source,mimeType){
 	var locator = options.locator;
 	var defaultNSMap = options.xmlns||{};
 	var isHTML = /\/x?html?$/.test(mimeType);//mimeType.toLowerCase().indexOf('html') > -1;
-  	var entityMap = isHTML ? entities.HTML_ENTITIES : entities.XML_ENTITIES;
+	var entityMap = isHTML ? entities.HTML_ENTITIES : entities.XML_ENTITIES;
+	// Using prototypical inheritance to avoid copying nedlessly
+	function EntityMap() {}
+	EntityMap.prototype = entityMap;
+	entityMap = new EntityMap();
+	domBuilder.entityMap = entityMap;
 	if(locator){
 		domBuilder.setDocumentLocator(locator)
 	}
@@ -243,6 +248,20 @@ DOMHandler.prototype = {
 					this.doc.doctype = dt;
 	    }
 	},
+
+	/**
+	 * If the same entity is declared more than once, the first declaration
+	 * encountered is binding, and a warning is issued.
+	 * @link https://www.w3.org/TR/2006/REC-xml11-20060816/#sec-entity-decl
+	 */
+	internalEntityDecl:function(name, value) {
+		if (name in this.entityMap) {
+			this.warning("entity '"+ name +"' has already been declared");
+			return;
+		}
+		this.entityMap[name] = value;
+	},
+
 	/**
 	 * @see org.xml.sax.ErrorHandler
 	 * @link http://www.saxproject.org/apidoc/org/xml/sax/ErrorHandler.html
@@ -293,7 +312,6 @@ function _toString(chars,start,length){
  * 	#attributeDecl(eName, aName, type, mode, value)
  *  #elementDecl(name, model)
  *  #externalEntityDecl(name, publicId, systemId)
- *  #internalEntityDecl(name, value)
  * @link http://www.saxproject.org/apidoc/org/xml/sax/ext/EntityResolver2.html
  * IGNORED method of org.xml.sax.EntityResolver2
  *  #resolveEntity(String name,String publicId,String baseURI,String systemId)
@@ -304,7 +322,7 @@ function _toString(chars,start,length){
  *  #notationDecl(name, publicId, systemId) {};
  *  #unparsedEntityDecl(name, publicId, systemId, notationName) {};
  */
-"endDTD,startEntity,endEntity,attributeDecl,elementDecl,externalEntityDecl,internalEntityDecl,resolveEntity,getExternalSubset,notationDecl,unparsedEntityDecl".replace(/\w+/g,function(key){
+"endDTD,startEntity,endEntity,attributeDecl,elementDecl,externalEntityDecl,resolveEntity,getExternalSubset,notationDecl,unparsedEntityDecl".replace(/\w+/g,function(key){
 	DOMHandler.prototype[key] = function(){return null}
 })
 

lib/sax.js

@@ -78,7 +78,7 @@ function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){
 		if(end>start){
 			var xt = source.substring(start,end).replace(/&#?\w+;/g,entityReplacer);
 			locator&&position(start);
-			domBuilder.characters(xt,0,end-start);
+			domBuilder.characters(xt,0,xt.length);
 			start = end
 		}
 	}
@@ -554,6 +554,38 @@ function parseDCC(source,start,domBuilder,errorHandler){//sure start with '<!'
 			domBuilder.endCDATA() 
 			return end+3;
 		}
+		if(source.substr(start+2,6) == 'ENTITY'){
+			var end = source.indexOf('>', start+8);
+			var chunk = source.substring(start+8, end);
+			var match = chunk.match(/^\s+(?:(%)\s+)?(\S+)\s+(["'])/);
+			if (!match) {
+				// NOTE: Ignoring unhandled forms of entity declarations
+				return -1;
+			}
+			var declStart = start+8+match[0].length;
+			var name = match[2];
+			var delim = match[3];
+			var delimEnd = source.indexOf(delim, declStart);
+			if (delimEnd > end) {
+				end = source.indexOf('>', delimEnd);
+			}
+			if (match[1] === '%') {
+				// NOTE: Ignoring the PEDef form of entity declaration after forwarding
+				// to the declaratino end.
+				return end;
+			}
+			var value = source.substring(declStart, delimEnd);
+			// NOTE: This value is not further processed, but treated as PCDATA.
+			// If recursive processing is implemented, ENSURE to avoid an XML Bomb
+			// attack vector!
+			domBuilder.internalEntityDecl(name, value);
+			var nextTagStart = source.indexOf('<', end);
+			var dtdEnd = source.indexOf(']>', end);
+			if (dtdEnd < nextTagStart) {
+				domBuilder.endDTD();
+			}
+			return end+2;
+		}
 		//<!DOCTYPE
 		//startDTD(java.lang.String name, java.lang.String publicId, java.lang.String systemId) 
 		var matchs = split(source,start);
@@ -570,11 +602,21 @@ function parseDCC(source,start,domBuilder,errorHandler){//sure start with '<!'
 					sysid = matchs[3][0];
 				}
 			}
-			var lastMatch = matchs[len-1]
 			domBuilder.startDTD(name, pubid, sysid);
-			domBuilder.endDTD();
+
+			var hasInternalDTD = matchs[2][0] === '[';
+			// NOTE: Currently only handles entity declarations and not the full
+			// [internal DTD subset](https://www.w3.org/TR/xml/#NT-doctypedecl).
+			if (hasInternalDTD) {
+				// NOTE: endDTD must be called by the last internal subset item.
+				return matchs[2].index;
+			} else {
+				domBuilder.endDTD();
+			}
 
-			return lastMatch.index+lastMatch[0].length
+			var lastMatch = matchs[len-1];
+			var end = lastMatch.index+lastMatch[0].length;
+			return end;
 		}
 	}
 	return -1;

test/xmltest/__snapshots__/not-wf.test.js.snap

@@ -439,7 +439,7 @@ Object {
 
 exports[`xmltest/not-wellformed standalone should match 055.xml with snapshot 1`] = `
 Object {
-  "actual": "<!DOCTYPE doc>",
+  "actual": "<!DOCTYPE doc><doc/>",
 }
 `;
 
@@ -1213,11 +1213,7 @@ Object {
 
 exports[`xmltest/not-wellformed standalone should match 159.xml with snapshot 1`] = `
 Object {
-  "actual": "<!DOCTYPE doc><doc>&amp;e;</doc>",
-  "error": Array [
-    "[xmldom error]	entity not found:&e;
-@#[line:5,col:1]",
-  ],
+  "actual": "<!DOCTYPE doc><doc>&lt;![CDATA[Tim &amp; Michael]]&gt;</doc>",
 }
 `;