Merge pull request #184 from gregjacobs/dont-allow-multiple-dots

Don't allow multiple dots

Author: gregjacobs

src/matcher/UrlMatchValidator.js

@@ -80,8 +80,8 @@ Autolinker.matcher.UrlMatchValidator = {
 			( protocolUrlMatch && !this.isValidUriScheme( protocolUrlMatch ) ) ||
 			this.urlMatchDoesNotHaveProtocolOrDot( urlMatch, protocolUrlMatch ) ||    // At least one period ('.') must exist in the URL match for us to consider it an actual URL, *unless* it was a full protocol match (like 'http://localhost')
 			(this.urlMatchDoesNotHaveAtLeastOneWordChar( urlMatch, protocolUrlMatch ) && // At least one letter character must exist in the domain name after a protocol match. Ex: skip over something like "git:1.0"
-			 !this.isValidIpAddress( urlMatch ) // Except if it's an IP address
-			)
+			   !this.isValidIpAddress( urlMatch )) || // Except if it's an IP address
+			this.containsMultipleDots( urlMatch )
 		) {
 			return false;
 		}
@@ -97,6 +97,10 @@ Autolinker.matcher.UrlMatchValidator = {
 		return uriScheme !== null;
 	},
 
+	containsMultipleDots : function ( urlMatch ) {
+		return urlMatch.indexOf("..") > -1;
+	},
+
 	/**
 	 * Determines if the URI scheme is a valid scheme to be autolinked. Returns
 	 * `false` if the scheme is 'javascript:' or 'vbscript:'
@@ -164,4 +168,4 @@ Autolinker.matcher.UrlMatchValidator = {
 		}
 	}
 
-};
+};

tests/matcher/UrlSpec.js

@@ -93,6 +93,14 @@ describe( "Autolinker.matcher.Url", function() {
 			MatchChecker.expectUrlMatch( matches[ 0 ], 'https://gitlab.example.com/search?utf8=✓&search=mysearch&group_id=&project_id=42&search_code=true&repository_ref=master', 0 );
 		});
 
+		it( 'should not match an address with multiple dots', function() {
+			var matches = matcher.parseMatches( 'hello:...world' );
+			var othermatches = matcher.parseMatches( 'hello:wo.....rld' );
+
+			expect( matches.length ).toBe( 0 );
+			expect( othermatches.length ).toBe( 0 );
+		});
+
 
 		describe( 'protocol-relative URLs', function() {
 
@@ -130,4 +138,4 @@ describe( "Autolinker.matcher.Url", function() {
 
 	} );
 
-} );
+} );