Merge pull request #10844 from arcturus/bug-890342

Bug 890342 - [SMS] LinkHelper regression: misrecognized links

apps/sms/js/link_helper.js

@@ -6,14 +6,21 @@
  anchor links for url, phone, email.
 */
 
+var ipv4RegExp = new RegExp(
+  '^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$');
 // ensure that each part of the domain is long enough
 function checkDomain(domain) {
-  var parts = domain.split('.');
-  // either the tld is more than one character or it is an IPv4
-  return parts[parts.length - 1].length > 1 ||
-    parts.length === 4 && parts.every(function(part) {
-      return part >= 0 && part < 256;
-    });
+  // Check for a specific IPv4 address
+  if (ipv4RegExp.test(domain)) {
+    return true;
+  } else {
+    // Don't add many restrictions,
+    // just the tld to be non numeric and length > 1
+    var parts = domain.split('.');
+    var lastPart = parts[parts.length - 1];
+    // We want the last part not to be a number
+    return lastPart.length > 1 && !isFinite(lastPart);
+  }
 }
 
 // defines things that can match right before to be a "safe" link

apps/sms/test/unit/link_helper_test.js

@@ -166,6 +166,12 @@ suite('link_helper_test.js', function() {
       test('Simple URL with IPv6', function() {
         testURLNOK('http://[::1]/');
       });
+      test('Bug 890342 1', function() {
+        testURLNOK('2.74');
+      });
+      test('Bug 890342 2', function() {
+        testURLNOK('21.72');
+      });
     });
   });