Issue 704 - Generate protocol-agnostic request blocking filters with "Block element"

include.postload.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 261 matching lines @@
   var elt = currentElement;
   var url = null;
   if (currentElement.className && currentElement.className == "__adblockplus__overlay")
   {
     elt = currentElement.prisoner;
     url = currentElement.prisonerURL;
   }
   else if (elt.src)
     url = elt.src;
 
-  // Only normalize when the element contains a URL (issue 328.)
-  // The URL is not always normalized, so do it here
-  if (url)
-    url = normalizeURL(relativeToAbsoluteUrl(url));
-
   // Construct filters. The popup will retrieve these.
   // Only one ID
   var elementId = elt.id ? elt.id.split(' ').join('') : null;
   // Can have multiple classes, and there might be extraneous whitespace
   var elementClasses = null;
   if (elt.className)
     elementClasses = elt.className.replace(/\s+/g, ' ').replace(/^\s+|\s+$/g, '').split(' ');
 
   clickHideFilters = new Array();
   selectorList = new Array();
@@ skipping 11 matching lines @@
   {
     var selector = "";
 
     for (var i = 0; i < elt.classList.length; i++)
       selector += "." + elt.classList[i].replace(/([^\w-])/g, "\\$1");
 
     addSelector(selector);
   }
 
   if (url)
-  {
-    clickHideFilters.push(relativeToAbsoluteUrl(url));
-    selectorList.push(elt.localName + '[src="' + url + '"]');
-  }
+    clickHideFilters.push(normalizeURL(relativeToAbsoluteUrl(url)));
 
   // restore the original style, before generating the fallback filter that
   // will include the style, and to prevent highlightElements from saving those
   currentElement.style.setProperty("-webkit-box-shadow", currentElement_boxShadow);
   currentElement.style.backgroundColor = currentElement_backgroundColor;
 
   // as last resort, create a filter based on inline styles
   if (clickHideFilters.length == 0 && elt.hasAttribute("style"))
     addSelector(elt.localName + '[style="' + elt.getAttribute("style").replace(/"/g, '\\"') + '"]');
 
@@ skipping 56 matching lines @@
         r = r + m[1];
       }
     }
     return r;
   } else {
     return u;
   }
 }
 
 // Does some degree of URL normalization
 function normalizeURL(url)

[Wladimir Palant, 2014/09/30 21:27:42]

The function name and comment no longer make sense. It's really urlToFilter()
now.

 {
-  var components = url.match(/(.+:\/\/.+?)\/(.*)/);
+  var components = url.match(/(.+:\/\/)(.+?)\/(.*)/);

[Wladimir Palant, 2014/09/30 21:27:42]

This regexp won't work correctly for something like http://foo/?http://bar/",
the protocol part shouldn't be greedy. Besides, I would prefer an explicit ^ at
the beginning of the regexp.

   if(!components)
     return url;

[Wladimir Palant, 2014/09/30 21:27:42]

I guess this would make more sense:

  return "|" + url;

-  var newPath = removeDotSegments(components[2]);
-  if(newPath.length == 0)
-    return components[1];
-  if(newPath[0] != '/')
-    newPath = '/' + newPath;
-  return components[1] + newPath;
+  var newPath = removeDotSegments(components[3]);

[Wladimir Palant, 2014/09/30 21:27:42]

Do we still need the "dot removal"? This should be taken care of the
relativeToAbsoluteURL() function.

+  if(newPath[0] != "/")
+    newPath = "/" + newPath;
+  return "||" + components[2] + newPath;
 }
 
 // Content scripts are apparently invoked on non-HTML documents, so we have to
 // check for that before doing stuff. |document instanceof HTMLDocument| check
 // will fail on some sites like planet.mozilla.org because WebKit creates
 // Document instances for XHTML documents, have to test the root element.
 if (document.documentElement instanceof HTMLElement)
 {
   // Use a contextmenu handler to save the last element the user right-clicked on.
   // To make things easier, we actually save the DOM event.
@@ skipping 150 matching lines @@
 
           clickHide_deactivate();
         }
         break;
       default:
         sendResponse({});
         break;
     }
   });
 }