Issue 3710 - Unify hostname logic

lib/abp2blocklist.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 74 matching lines @@
   let canSafelyMatchAsLowercase = false;
 
   for (let i = 0; i < text.length; i++)
   {
     let c = text[i];
 
     // If we're currently inside the hostname we have to be careful not to
     // escape any characters until after we have converted it to punycode.
     if (hostnameStart != null && !hostnameFinished)
     {
-      let endingChar = (c == "*" || c == "^" || c == "?" || c == "/");

[Sebastian Noack, 2016/02/27 23:06:16]

I know we didn't handle it before, but what's if we have a | in the last
position. It implies the end of the URL, and therefore also end of the hostname.

[kzar, 2016/03/07 17:06:48]

So do we want to always consider "|" to end the hostname, or only when it also
happens to be the last character?

[Sebastian Noack, 2016/03/08 09:31:22]

I guess, for simplicity we can just assume that any "|" (except in the
beginning) implies the end of the URL. It cannot occur in a domain, and if it
occurs in the path/query it has to be escaped, anyway.

[kzar, 2016/03/08 12:36:01]

Yea, sounds good to me. Also we already know that we've passed the first
character here as hostnameStart isn't null which makes things even easier.

+      let endingChar = (c == "*" || c == "^" ||
+                        c == "?" || c == "/" || c == "|");
       if (!endingChar && i != lastIndex)
         continue;
 
       let hostname = text.substring(hostnameStart, endingChar ? i : i + 1);
       hostnameFinished = true;
       result.push(escapeRegExp(punycode.toASCII(hostname)));
       if (!endingChar)
         break;
     }
 
@@ skipping 330 matching lines @@
 
   for (let filter of this.elemhideExceptions)
     addRule(convertFilter(filter, "ignore-previous-rules", false));
   for (let filter of this.requestFilters)
     addRule(convertFilter(filter, "block", true));
   for (let filter of this.requestExceptions)
     addRule(convertFilter(filter, "ignore-previous-rules", true));
 
   return rules;
 };