Merge pull request #274 from adamdavidcole/email_tld_validation

Dont match email address with invalid TLD

Author: gregjacobs

dist/Autolinker.js

@@ -3,6 +3,7 @@ import { alphaNumericAndMarksCharsStr, domainNameCharRegex } from "../regex-lib"
 import { EmailMatch } from "../match/email-match";
 import { Match } from "../match/match";
 import { throwUnhandledCaseError } from '../utils';
+import { tldRegex } from "./tld-regex";
 
 // For debugging: search for other "For debugging" lines
 // import CliTable from 'cli-table';
@@ -23,6 +24,12 @@ export class EmailMatcher extends Matcher {
 	 */
 	protected localPartCharRegex = new RegExp( `[${alphaNumericAndMarksCharsStr}!#$%&'*+/=?^_\`{|}~-]` );
 
+	/**
+	 * Stricter TLD regex which adds a beginning and end check to ensure
+	 * the string is a valid TLD
+	 */
+	protected strictTldRegex = new RegExp( `^${tldRegex.source}$` );
+
 	/**
 	 * Valid URI scheme for email address URLs
 	 */
@@ -35,6 +42,7 @@ export class EmailMatcher extends Matcher {
 	parseMatches( text: string ) {
 		const tagBuilder = this.tagBuilder,
 			  localPartCharRegex = this.localPartCharRegex,
+			  strictTldRegex = this.strictTldRegex,
 			  mailToScheme = this.mailToScheme,
 			  matches: Match[] = [],
 			  len = text.length,
@@ -214,6 +222,19 @@ export class EmailMatcher extends Matcher {
 			currentEmailAddress = noCurrentEmailAddress
 		}
 
+		/**
+		 * Determines if the given email address has a valid TLD or not
+		 * @param {string} emailAddress - email address
+		 * @return {Boolean} - true is email have valid TLD, false otherwise
+		 */
+		function doesEmailHaveValidTld( emailAddress: string ) {
+			const emailAddressTld : string = emailAddress.split( '.' ).pop() || '';
+			const emailAddressNormalized = emailAddressTld.toLowerCase();
+			const isValidTld = strictTldRegex.test( emailAddressNormalized );
+
+			return isValidTld;
+		}
+
 
 		/*
 		 * Captures the current email address as an EmailMatch if it's valid,
@@ -244,12 +265,15 @@ export class EmailMatcher extends Matcher {
 					matchedText = text.slice( offset, charIdx );
 				}
 
-				matches.push( new EmailMatch( {
-					tagBuilder  : tagBuilder,
-					matchedText : matchedText,
-					offset      : offset,
-					email       : emailAddress
-				} ) );
+				// if the email address has a valid TLD, add it to the list of matches
+				if ( doesEmailHaveValidTld( emailAddress ) ) {
+					matches.push( new EmailMatch( {
+						tagBuilder  : tagBuilder,
+						matchedText : matchedText,
+						offset      : offset,
+						email       : emailAddress
+					} ) );
+				}
 			}
 
 			resetToNonEmailAddressState();

dist/Autolinker.js.map

@@ -102,4 +102,12 @@ describe( "Autolinker Email Matching -", () => {
 		expect( result ).toBe( 'My email is <a href="mailto:[email protected]">[email protected]</a>');
 	} );
 
+	it( "should NOT link an email address with an invalid tld", function () {
+		let result1 = autolinker.link( "My email is [email protected]" );
+		expect( result1 ).toBe( 'My email is [email protected]');
+
+		let result2 = autolinker.link( "My email is [email protected]" );
+		expect( result2 ).toBe( 'My email is [email protected]');
+	} );
+
 } );