Issue 1393 - Block element dialog suggests decoded URLs

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 369 matching lines @@
     }
     return r;
   } else {
     return u;
   }
 }
 
 // Does some degree of URL normalization
 function normalizeURL(url)
 {
+  url = encodeURI(url);

[Wladimir Palant, 2014/09/18 18:53:02]

What if the URL we get is already encoded? This function will turn "%20" into
"%2520".

[Sebastian Noack, 2014/09/19 10:13:32]

Thomas, can you please explain / figure out why this is necessary anyway? I just
realized that the URL comes form Element.src and therefore should always already
be quoted.

[Thomas Greiner, 2014/09/19 10:47:13]

Now I see what you mean. Element.src does give us the encoded URL but we're
using Element.getAttribute("src") in the getElementURL() function instead which
gives us the decoded URL.

On 2014/09/19 10:13:32, Sebastian Noack wrote:

[Sebastian Noack, 2014/09/19 11:14:50]

Yes, .src always returns a quoted URL no matter how the URL was specified in the
document.

So the correct solution would be just using .src instead .getAttribute("src")
here, I guess.

[Wladimir Palant, 2014/09/21 18:37:42]

The other advantage here is that element.src returns the full URL and we don't
have to apply our error-prone normalization to it. So maybe we only need to keep
that normalization for objects/applets - no way to get the full URL from the
browser there IMHO.

[Thomas Greiner, 2014/09/22 09:37:33]

I didn't find any reason against applying it to objects/applets-only so I moved
it accordingly. However, I'm not sure what issue 328 is about. Do you happen to
know where I can find it?

On 2014/09/19 11:14:50, Sebastian Noack wrote:
I observed the same behavior with .href and .getAttribute("href") and therefore
changed that as well.

   var components = url.match(/(.+:\/\/.+?)\/(.*)/);
   if(!components)
     return url;
   var newPath = removeDotSegments(components[2]);
   if(newPath.length == 0)
     return components[1];
   if(newPath[0] != '/')
     newPath = '/' + newPath;
   return components[1] + newPath;
 }
@@ skipping 159 matching lines @@
 
           clickHide_deactivate();
         }
         break;
       default:
         sendResponse({});
         break;
     }
   });
 }