Fix to not autolink URLs inside a <!DOCTYPE> tag

gregjacobs · Sep 7, 2014 · deef0e3 · deef0e3
1 parent 609fbd6
commit deef0e3
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 13 deletions.
diff --git a/dist/Autolinker.js b/dist/Autolinker.js
@@ -1,6 +1,6 @@
 /*!
  * Autolinker.js
- * 0.11.0
+ * 0.11.2
  *
  * Copyright(c) 2014 Gregory Jacobs <greg@greg-jacobs.com>
  * MIT Licensed. http://www.opensource.org/licenses/mit-license.php
@@ -237,22 +237,26 @@
 		htmlRegex : (function() {
 			var tagNameRegex = /[0-9a-zA-Z:]+/,
 			    attrNameRegex = /[^\s\0"'>\/=\x01-\x1F\x7F]+/,   // the unicode range accounts for excluding control chars, and the delete char
-			    attrValueRegex = /(?:".*?"|'.*?'|[^'"=<>`\s]+)/; // double quoted, single quoted, or unquoted attribute values
+			    attrValueRegex = /(?:".*?"|'.*?'|[^'"=<>`\s]+)/, // double quoted, single quoted, or unquoted attribute values
+			    nameEqualsValueRegex = attrNameRegex.source + '(?:\\s*=\\s*' + attrValueRegex.source + ')?';  // optional '=[value]'
 
 			return new RegExp( [
-				'<(/)?',  // Beginning of a tag. Either '<' for a start tag, or '</' for an end tag. The slash or an empty string is Capturing Group 1.
+				'<(?:!|(/))?',  // Beginning of a tag. Either '<' for a start tag, '</' for an end tag, or <! for the <!DOCTYPE ...> tag. The slash or an empty string is Capturing Group 1.
 
 					// The tag name (Capturing Group 2)
 					'(' + tagNameRegex.source + ')',
 
 					// Zero or more attributes following the tag name
 					'(?:',
 						'\\s+',  // one or more whitespace chars before an attribute
-						attrNameRegex.source,
-						'(?:\\s*=\\s*' + attrValueRegex.source + ')?',  // optional '=[value]'
+
+						// Either:
+						// A. tag="value", or 
+						// B. "value" alone (for <!DOCTYPE> tag. Ex: <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">) 
+						'(?:', nameEqualsValueRegex, '|', attrValueRegex.source + ')',
 					')*',
 
-					'\\s*',  // any trailing spaces before the closing '>'
+					'\\s*/?',  // any trailing spaces and optional '/' before the closing '>'
 				'>'
 			].join( "" ), 'g' );
 		} )(),

diff --git a/dist/Autolinker.min.js b/dist/Autolinker.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "autolinker",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "Simple utility to automatically link the URLs, email addresses, and Twitter handles in a given block of text/HTML",
   "main": "dist/Autolinker.js",
   "directories": {

diff --git a/src/Autolinker.js b/src/Autolinker.js
@@ -228,19 +228,23 @@
 		htmlRegex : (function() {
 			var tagNameRegex = /[0-9a-zA-Z:]+/,
 			    attrNameRegex = /[^\s\0"'>\/=\x01-\x1F\x7F]+/,   // the unicode range accounts for excluding control chars, and the delete char
-			    attrValueRegex = /(?:".*?"|'.*?'|[^'"=<>`\s]+)/; // double quoted, single quoted, or unquoted attribute values
+			    attrValueRegex = /(?:".*?"|'.*?'|[^'"=<>`\s]+)/, // double quoted, single quoted, or unquoted attribute values
+			    nameEqualsValueRegex = attrNameRegex.source + '(?:\\s*=\\s*' + attrValueRegex.source + ')?';  // optional '=[value]'
 
 			return new RegExp( [
-				'<(/)?',  // Beginning of a tag. Either '<' for a start tag, or '</' for an end tag. The slash or an empty string is Capturing Group 1.
+				'<(?:!|(/))?',  // Beginning of a tag. Either '<' for a start tag, '</' for an end tag, or <! for the <!DOCTYPE ...> tag. The slash or an empty string is Capturing Group 1.
 
 					// The tag name (Capturing Group 2)
 					'(' + tagNameRegex.source + ')',
 
 					// Zero or more attributes following the tag name
 					'(?:',
 						'\\s+',  // one or more whitespace chars before an attribute
-						attrNameRegex.source,
-						'(?:\\s*=\\s*' + attrValueRegex.source + ')?',  // optional '=[value]'
+
+						// Either:
+						// A. tag="value", or 
+						// B. "value" alone (for <!DOCTYPE> tag. Ex: <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">) 
+						'(?:', nameEqualsValueRegex, '|', attrValueRegex.source + ')',
 					')*',
 
 					'\\s*/?',  // any trailing spaces and optional '/' before the closing '>'

diff --git a/tests/AutolinkerSpec.js b/tests/AutolinkerSpec.js
@@ -581,6 +581,36 @@ describe( "Autolinker", function() {
 			} );
 
 
+			it( "should NOT automatically link anything in a !DOCTYPE tag (Issue #53)", function() {
+				var input = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
+
+				var result = autolinker.link( input );
+				expect( result ).toBe( input );
+			} );
+
+
+			it( "should automatically link tags after a !DOCTYPE tag", function() {
+				var input = [
+					'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+					'<html>',
+						'<body>',
+							'Welcome to mysite.com',
+						'</body>',
+					'</html>'
+				].join( "" );
+
+				var result = autolinker.link( input );
+				expect( result ).toBe( [
+					'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+					'<html>',
+						'<body>',
+							'Welcome to <a href="http://mysite.com">mysite.com</a>',
+						'</body>',
+					'</html>'
+				].join( "" ) );
+			} );
+
+
 			it( "should allow the full range of HTML attribute name characters as specified in the W3C HTML syntax document (http://www.w3.org/TR/html-markup/syntax.html)", function() {
 				// Note: We aren't actually expecting the HTML to be modified by this test
 				var inAndOutHtml = '<ns:p>Foo <a data-qux-="" href="http://www.example.com">Bar<\/a> Baz<\/ns:p>';