gnuzilla

commit 9820d6d892aca6f3ae6b40f8267c96a1b6892342
parent 4407c2989c3c73f0e1d44384a7716fe610767628
Author: Mark H Weaver <mhw@netris.org>
Date:   Thu, 21 Nov 2019 02:35:42 -0500

Update tortm-browser-button extension.

* data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/128.png,
data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/16.png,
data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/32.png,
data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/48.png,
data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/64.png,
data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html,
data/extensions/tortm-browser-button@jeremybenthum/lib/common.js,
data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js: Update.

Diffstat:
M
data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/128.png
 | 
0

M
data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/16.png
 | 
0

M
data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/32.png
 | 
0

M
data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/48.png
 | 
0

M
data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/64.png
 | 
0

M
data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html
 | 
2
++
M
data/extensions/tortm-browser-button@jeremybenthum/lib/common.js
 | 
16
++++++----------
M
data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js
 | 
2
+-

8 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/128.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/128.png
Binary files differ.
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/16.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/16.png
Binary files differ.
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/32.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/32.png
Binary files differ.
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/48.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/48.png
Binary files differ.
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/64.png b/data/extensions/tortm-browser-button@jeremybenthum/data/icons/ON/64.png
Binary files differ.
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html b/data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html
@@ -29,6 +29,8 @@
         </tr>
       </table>
     </div>
+    <div id="explore"></div>
+    <script async src="explore/explore.js"></script>
     <script src="popup.js"></script>
   </body>
 </html>
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js b/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js
@@ -16,19 +16,15 @@ var popupsend = function () {
 };
 
 var setproxy = function (callback) {
-  if (tor.id === "OFF") chrome.proxy.settings.set({"scope": "regular", "value": {"proxyType":"system", "mode": "system"}}, callback);
+  if (tor.id === "OFF") chrome.proxy.settings.set({"scope": "regular", "value": {"mode": "system"}}, callback);
   else chrome.proxy.settings.set({
     "scope": "regular",
     "value":  {
-      "proxyDNS":true,
-      "autoConfigUrl":"",
-      "socksVersion":5,
-      "passthrough":"",
-      "proxyType":"manual",
-      "ftp":"",
-      "ssl":"",
-      "http":"",
-      "socks":"127.0.0.1:9050"
+      "mode": "fixed_servers",
+      "rules": {
+        "bypassList": tor.bypassList,
+        "singleProxy": {"scheme": "socks5", "host": "127.0.0.1", "port": 9050}
+      }
     }
   }, callback);
 };
diff --git a/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js b/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js
@@ -5,7 +5,7 @@ if (/Firefox/.test(navigator.userAgent)) {
       const mode = value.mode;
       const settings = {
         "autoLogin": value.noPrompt,
-        "proxyDNS": true,
+        "proxyDNS": value.remoteDNS,
         "autoConfigUrl": mode === 'pac_script' ? value.pacScript.url : '',
         "socksVersion": mode === 'fixed_servers' && value.rules.singleProxy.scheme === 'socks5' ? 5 : 4,
         "passthrough": mode === 'fixed_servers' && value.rules.bypassList && value.rules.bypassList.length ? value.rules.bypassList.join(', ') : '',