From 26e8e4fb45d8f8149656787c60b0d6e76be78682 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Mon, 1 May 2017 08:04:19 -0700
Subject: [PATCH] Refactor PAC generation, fix minor directIfAllowed bug

---
 .../extension-common/35-pac-kitchen-api.js    | 38 +++++++++----------
 .../pages/choose-pac-provider/index.html      |  1 +
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
index 98e03c2..33fe42c 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
@@ -235,8 +235,11 @@
         `;
       }
       res += `
-    const directIfAllowed = ${pacMods.ifProxyOrDie ? '""/* Not allowed. */' : '"; DIRECT"'};
-      `;
+    const directIfAllowed = ${pacMods.ifProxyOrDie ? '""/* Not allowed. */' : '"; DIRECT"'};`;
+      if (pacMods.filteredCustomsString) {
+        res += `
+    const filteredCustomProxies = "; ${pacMods.filteredCustomsString}";`;
+      }
 
       const ifIncluded = pacMods.included && pacMods.included.length;
       const ifExcluded = pacMods.excluded && pacMods.excluded.length;
@@ -244,6 +247,7 @@
 
       if (ifExceptions) {
         res += `
+
     /* EXCEPTIONS START */
     const dotHost = '.' + host;
     const isHostInDomain = (domain) => dotHost.endsWith('.' + domain);
@@ -262,22 +266,21 @@
 
     const excWeight = ${JSON.stringify(Object.entries(pacMods.exceptions))}.reduce( domainReducer, 0 );
     if (excWeight !== 0) {
-      if (excWeight > 0) {
-        // Always proxy it!
-        ${ pacMods.filteredCustomsString
-          ? `return "${pacMods.filteredCustomsString}" + directIfAllowed;`
-          : '/* No proxies -- continue. */'
-        }
-      } else {
+      if (excWeight < 0) {
         // Never proxy it!
         return "DIRECT";
       }
+      // Always proxy it!
+      ${ pacMods.filteredCustomsString
+        ? `return filteredCustomProxies + directIfAllowed;`
+        : '/* No custom proxies -- continue. */'
+      }
     }
     /* EXCEPTIONS END */
 `;
       }
       res += `
-    const pacProxyString = originalFindProxyForURL(url, host)${
+    const pacScriptProxies = originalFindProxyForURL(url, host)${
           pacMods.ifProxyOrDie ? '.replace(/DIRECT/g, "")' : ' + directIfAllowed'
       };`;
       if(
@@ -286,11 +289,11 @@
          pacMods.ifUsePacScriptProxies
       ) {
         return res + `
-    return pacProxyString;`;
+    return pacScriptProxies + directIfAllowed;`;
       }
 
       return res + `
-    let pacProxyArray = pacProxyString.split(/(?:\\s*;\\s*)+/g).filter( (p) => p );
+    let pacProxyArray = pacScriptProxies.split(/(?:\\s*;\\s*)+/g).filter( (p) => p );
     const ifNoProxies = pacProxyArray${pacMods.ifProxyOrDie ? '.length === 0' : '.every( (p) => /^DIRECT$/i.test(p) )'};
     if (ifNoProxies) {
       // Directs only or null, no proxies.
@@ -300,19 +303,16 @@
       function() {
 
         if (!pacMods.ifUsePacScriptProxies) {
-          return `"${pacMods.filteredCustomsString}"`;
+          return '';
         }
-        let filteredPacExp = 'pacProxyString';
+        let filteredPacExp = 'pacScriptProxies';
         if (pacMods.ifUseSecureProxiesOnly) {
           filteredPacExp =
             'pacProxyArray.filter( (pStr) => /^HTTPS\\s/.test(pStr) ).join("; ")';
         }
-        if ( !pacMods.filteredCustomsString ) {
-          return filteredPacExp;
-        }
-        return `${filteredPacExp} + "; ${pacMods.filteredCustomsString}"`;
+        return filteredPacExp + ' + ';
 
-      }() + ' + directIfAllowed;'; // Without DIRECT you will get 'PROXY CONN FAILED' pac-error.
+      }() + `${pacMods.filteredCustomsString ? 'filteredCustomProxies + ' : ''}directIfAllowed;`; // Without DIRECT you will get 'PROXY CONN FAILED' pac-error.
 
     }()}
 
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.html b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.html
index 8123b0f..a1d1577 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.html
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.html
@@ -519,6 +519,7 @@
             <div id="exc-address">
               <span>*.</span><input placeholder="navalny.com" list="exc-list" name="browser" id="exc-editor" style=""/>
             </div>
+            <!--a href class="emoji">⇄</a-->
             <a href="../exceptions/index.html" title="импорт/экспорт"><svg
               class="icon"
               ><use xlink:href="#icon-import-export"></use></svg>