Bug 320739 - plain text email containing link with numerical IP should not be marked as scam

p=Magnus Melin <mkmelin+mozilla@iki.fi>
r=mscott

mail/base/content/phishingDetector.js

@@ -122,14 +122,13 @@ var gPhishingDetector = {
    * @param aLinkText (optional) user visible link text associated with aHref in case
    *        we are dealing with a link node.
    * @return asynchronously calls gMessageNotificationBar.setPhishingMsg if the link node
-   *         conains a phishing URL.  
+   *         contains a phishing URL.
    */
   analyzeUrl: function (aUrl, aLinkText)
   {
     if (!aUrl)
       return;
 
-
     var ioService = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
     var hrefURL;
     // make sure relative link urls don't make us bail out
@@ -141,15 +140,17 @@ var gPhishingDetector = {
     // this prevents us from flagging imap and other internally handled urls
     if (hrefURL.schemeIs('http') || hrefURL.schemeIs('https'))
     {
-       var failsStaticTests = false;      
       var linkTextURL = {};
       var unobscuredHostName = {};
       unobscuredHostName.value = hrefURL.host;
 
-       if (this.mCheckForIPAddresses && this.hostNameIsIPAddress(hrefURL.host, unobscuredHostName) && !this.isLocalIPAddress(unobscuredHostName))
-         failsStaticTests = true;
-       else if (this.mCheckForMismatchedHosts && aLinkText && this.misMatchedHostWithLinkText(hrefURL, aLinkText, linkTextURL))
-         failsStaticTests = true;
+      // The link is not suspicious if the visible text is the same as the URL,
+      // even if the URL is an IP address.
+      var failsStaticTests = (aLinkText != aUrl) &&
+         ((this.mCheckForIPAddresses && this.hostNameIsIPAddress(hrefURL.host, unobscuredHostName) &&
+           !this.isLocalIPAddress(unobscuredHostName)) ||
+          (this.mCheckForMismatchedHosts && aLinkText &&
+           this.misMatchedHostWithLinkText(hrefURL, aLinkText, linkTextURL)));
 
       // Lookup the url against our local list. We want to do this even if the url fails our static
       // test checks because the url might be in the white list.