[tor-commits] [torbrowser/maint-2.4] Make the SOCKS and Control ports fixed at 915x on all platforms.

erinn at torproject.org erinn at torproject.org
Tue Feb 19 17:57:53 UTC 2013


commit 11dc86220229b12124e52c173485ea29c09e6572
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Sun Feb 10 15:35:46 2013 -0800

    Make the SOCKS and Control ports fixed at 915x on all platforms.
    
    It turns out Firefox 17 caches proxy settings somewhere for requests. Changing
    them at startup produces a race condition for the Tor test in
    HTTPS-Everywhere's SSL observatory. If HTTPS-Everywhere tests
    check.torproject.org before we managed to set our socks port to the new auto
    value, check.torproject.org fails to ever work again (with a proxy unreachable
    error).
    
    We could fix this in HTTPS-Everywhere, I guess, but this fix is simpler and
    deals with the root issue, and will also make it easier to make Vidalia an
    optional download at a later date.
    
    Note I only changed the alpha config files here... We'll need to backport
    this/copy them somehow for TBB-stable.
---
 build-scripts/config/alpha/torrc                   |    2 ++
 build-scripts/config/alpha/torrc-linux             |    4 ++--
 build-scripts/config/alpha/torrc-obfsproxy         |    2 ++
 build-scripts/config/alpha/torrc-obfsproxy-linux   |    4 ++--
 build-scripts/config/alpha/torrc-obfsproxy-osx     |    4 ++--
 build-scripts/config/alpha/torrc-osx               |    5 +++--
 build-scripts/config/alpha/vidalia.conf.ff         |    2 +-
 build-scripts/config/alpha/vidalia.conf.ff+pidgin  |    2 +-
 .../config/alpha/vidalia.conf.ff+pidgin-linux      |    2 +-
 build-scripts/config/alpha/vidalia.conf.ff-linux   |    3 +--
 .../config/alpha/vidalia.conf.ff-obfsproxy         |    2 +-
 .../config/alpha/vidalia.conf.ff-obfsproxy-linux   |    3 +--
 .../config/alpha/vidalia.conf.ff-obfsproxy-osx     |    3 +--
 build-scripts/config/alpha/vidalia.conf.ff-osx     |    3 +--
 build-scripts/config/extension-overrides.js        |    2 +-
 build-scripts/config/pound_tor.js                  |    4 ++--
 build-scripts/config/prefs.xml                     |    2 +-
 src/osx-sandboxes/tor-sandbox/tor-enforce-10.5.sb  |    4 ++--
 src/osx-sandboxes/tor-sandbox/tor-enforce.sb       |    4 ++--
 19 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/build-scripts/config/alpha/torrc b/build-scripts/config/alpha/torrc
index 2d63da9..16f9486 100644
--- a/build-scripts/config/alpha/torrc
+++ b/build-scripts/config/alpha/torrc
@@ -9,3 +9,5 @@ Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
 SocksListenAddress 127.0.0.1
+SocksPort 9150
+ControlPort 9151
diff --git a/build-scripts/config/alpha/torrc-linux b/build-scripts/config/alpha/torrc-linux
index 05f5345..7d11921 100644
--- a/build-scripts/config/alpha/torrc-linux
+++ b/build-scripts/config/alpha/torrc-linux
@@ -8,6 +8,6 @@ GeoIPFile ./Data/Tor/geoip
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksPort auto
 SocksListenAddress 127.0.0.1
-ControlPort auto
+SocksPort 9150
+ControlPort 9151
diff --git a/build-scripts/config/alpha/torrc-obfsproxy b/build-scripts/config/alpha/torrc-obfsproxy
index 5df778a..5a53e51 100644
--- a/build-scripts/config/alpha/torrc-obfsproxy
+++ b/build-scripts/config/alpha/torrc-obfsproxy
@@ -9,6 +9,8 @@ Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
 SocksListenAddress 127.0.0.1
+SocksPort 9150
+ControlPort 9151
 
 UseBridges 1
 
diff --git a/build-scripts/config/alpha/torrc-obfsproxy-linux b/build-scripts/config/alpha/torrc-obfsproxy-linux
index 59ca799..8aa0937 100644
--- a/build-scripts/config/alpha/torrc-obfsproxy-linux
+++ b/build-scripts/config/alpha/torrc-obfsproxy-linux
@@ -8,9 +8,9 @@ GeoIPFile ./Data/Tor/geoip
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksPort auto
 SocksListenAddress 127.0.0.1
-ControlPort auto
+SocksPort 9150
+ControlPort 9151
 
 UseBridges 1
 
diff --git a/build-scripts/config/alpha/torrc-obfsproxy-osx b/build-scripts/config/alpha/torrc-obfsproxy-osx
index 80d343d..7a63423 100644
--- a/build-scripts/config/alpha/torrc-obfsproxy-osx
+++ b/build-scripts/config/alpha/torrc-obfsproxy-osx
@@ -8,9 +8,9 @@ GeoIPFile ../../Contents/Resources/Data/Tor/geoip
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksPort auto
 SocksListenAddress 127.0.0.1
-ControlPort auto
+SocksPort 9150
+ControlPort 9151
 
 UseBridges 1
 
diff --git a/build-scripts/config/alpha/torrc-osx b/build-scripts/config/alpha/torrc-osx
index 4c7f0d9..f9c71d5 100644
--- a/build-scripts/config/alpha/torrc-osx
+++ b/build-scripts/config/alpha/torrc-osx
@@ -8,6 +8,7 @@ GeoIPFile ../../Contents/Resources/Data/Tor/geoip
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksPort auto
 SocksListenAddress 127.0.0.1
-ControlPort auto
+SocksPort 9150
+ControlPort 9151
+
diff --git a/build-scripts/config/alpha/vidalia.conf.ff b/build-scripts/config/alpha/vidalia.conf.ff
index 1d9d2fa..d557a0c 100644
--- a/build-scripts/config/alpha/vidalia.conf.ff
+++ b/build-scripts/config/alpha/vidalia.conf.ff
@@ -8,7 +8,7 @@ PluginsDirectory=..\\..\\Data\\plugins
 DefaultPluginsDirectory=..\\DefaultData\\plugins
 
 [Tor]
-ControlPort=9051
+ControlPort=9151
 TorExecutable=.\\tor.exe
 Torrc=..\\Data\\Tor\\torrc
 DataDirectory=..\\Data\\Tor
diff --git a/build-scripts/config/alpha/vidalia.conf.ff+pidgin b/build-scripts/config/alpha/vidalia.conf.ff+pidgin
index d5d4a9b..8ba1157 100644
--- a/build-scripts/config/alpha/vidalia.conf.ff+pidgin
+++ b/build-scripts/config/alpha/vidalia.conf.ff+pidgin
@@ -8,6 +8,6 @@ ProxyExecutableArguments=-c .\\Data\\Polipo\\polipo.conf
 RunProxyAtStart=true
 
 [Tor]
-ControlPort=9051
+ControlPort=9151
 TorExecutable=.\\App\\tor.exe
 Torrc=.\\Data\\Tor\\torrc
diff --git a/build-scripts/config/alpha/vidalia.conf.ff+pidgin-linux b/build-scripts/config/alpha/vidalia.conf.ff+pidgin-linux
index 8354f0b..21f3810 100644
--- a/build-scripts/config/alpha/vidalia.conf.ff+pidgin-linux
+++ b/build-scripts/config/alpha/vidalia.conf.ff+pidgin-linux
@@ -8,6 +8,6 @@ ProxyExecutableArguments=-c Data/Polipo/polipo.conf
 RunProxyAtStart=true
 
 [Tor]
-ControlPort=9051
+ControlPort=9151
 TorExecutable=./App/tor
 Torrc=./Data/Tor/torrc
diff --git a/build-scripts/config/alpha/vidalia.conf.ff-linux b/build-scripts/config/alpha/vidalia.conf.ff-linux
index 26c66be..d0274e6 100644
--- a/build-scripts/config/alpha/vidalia.conf.ff-linux
+++ b/build-scripts/config/alpha/vidalia.conf.ff-linux
@@ -9,8 +9,7 @@ PluginsDirectory=../../Data/profile/extensions
 DefaultPluginsDirectory=./extensions
 
 [Tor]
-ControlPort=9051
+ControlPort=9151
 TorExecutable=./tor
 Torrc=../Data/Tor/torrc
-AutoControl=true
 DataDirectory=../Data/Tor
diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy
index a781b7a..9519101 100644
--- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy
+++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy
@@ -8,7 +8,7 @@ PluginsDirectory=..\\..\\Data\\plugins
 DefaultPluginsDirectory=..\\DefaultData\\plugins
 
 [Tor]
-ControlPort=9051
+ControlPort=9151
 TorExecutable=.\\tor.exe
 Torrc=..\\Data\\Tor\\torrc
 DataDirectory=..\\Data\\Tor
diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux
index cb97dc2..829deb7 100644
--- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux
+++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux
@@ -9,10 +9,9 @@ PluginsDirectory=../../Data/profile/extensions
 DefaultPluginsDirectory=./extensions
 
 [Tor]
-ControlPort=9051
+ControlPort=9151
 TorExecutable=./tor
 Torrc=../Data/Tor/torrc
-AutoControl=true
 DataDirectory=../Data/Tor
 
 [Network]
diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx
index 833fbe4..1d3d806 100644
--- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx
+++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx
@@ -8,10 +8,9 @@ DefaultPluginsDirectory=../../MacOS/Data/plugins
 LanguageCode=en
 
 [Tor]
-ControlPort=9051
+ControlPort=9151
 TorExecutable=../../../tor
 Torrc=../../../../../Library/Vidalia/torrc
-AutoControl=true
 DataDirectory=../../../../Resources/Data/Tor/
 
 [Network]
diff --git a/build-scripts/config/alpha/vidalia.conf.ff-osx b/build-scripts/config/alpha/vidalia.conf.ff-osx
index f698d2b..8b00cc2 100644
--- a/build-scripts/config/alpha/vidalia.conf.ff-osx
+++ b/build-scripts/config/alpha/vidalia.conf.ff-osx
@@ -8,8 +8,7 @@ DefaultPluginsDirectory=../../MacOS/Data/plugins
 LanguageCode=en
 
 [Tor]
-ControlPort=9051
+ControlPort=9151
 TorExecutable=../../../tor
 Torrc=../../../../../Library/Vidalia/torrc
-AutoControl=true
 DataDirectory=../../../../Resources/Data/Tor/
diff --git a/build-scripts/config/extension-overrides.js b/build-scripts/config/extension-overrides.js
index 273e104..4a5939f 100644
--- a/build-scripts/config/extension-overrides.js
+++ b/build-scripts/config/extension-overrides.js
@@ -8,7 +8,7 @@ pref("extensions.torbutton.tor_enabled", true);
 pref("extensions.torbutton.proxies_applied", true);
 pref("extensions.torbutton.settings_applied", true);
 pref("extensions.torbutton.socks_host", "127.0.0.1");
-pref("extensions.torbutton.socks_port", 9050);
+pref("extensions.torbutton.socks_port", 9150);
 pref("extensions.torbutton.tz_string", "UTC+00:00");
 
 # HTTPS Everywhere Preferences:
diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js
index 28390be..762e402 100644
--- a/build-scripts/config/pound_tor.js
+++ b/build-scripts/config/pound_tor.js
@@ -69,10 +69,10 @@ pref("network.http.spdy.enabled", false); // Stores state and may have keepalive
 
 // Proxy and proxy security
 pref("network.proxy.socks", "127.0.0.1");
-pref("network.proxy.socks_port", 9050);
+pref("network.proxy.socks_port", 9150);
 pref("network.proxy.socks_remote_dns", true);
 pref("network.proxy.type", 1);
-pref("network.security.ports.banned", "8118,8123,9050,9051");
+pref("network.security.ports.banned", "8118,8123,9050,9051,9150,9151");
 pref("network.dns.disablePrefetch", true);
 pref("network.protocol-handler.external-default", false);
 pref("network.protocol-handler.external.mailto", false);
diff --git a/build-scripts/config/prefs.xml b/build-scripts/config/prefs.xml
index 52d40a6..a5a5a9f 100644
--- a/build-scripts/config/prefs.xml
+++ b/build-scripts/config/prefs.xml
@@ -5,7 +5,7 @@
 		<pref name='proxy'>
 			<pref name='type' type='string' value='socks5'/>
 			<pref name='host' type='string' value='127.0.0.1'/>
-			<pref name='port' type='int' value='9050'/>
+			<pref name='port' type='int' value='9150'/>
 			<pref name='username' type='string' value=''/>
 			<pref name='password' type='string' value=''/>
             <pref name='socks4_remotedns' type='bool' value='1'/>
diff --git a/src/osx-sandboxes/tor-sandbox/tor-enforce-10.5.sb b/src/osx-sandboxes/tor-sandbox/tor-enforce-10.5.sb
index 83e2f77..ce593d2 100755
--- a/src/osx-sandboxes/tor-sandbox/tor-enforce-10.5.sb
+++ b/src/osx-sandboxes/tor-sandbox/tor-enforce-10.5.sb
@@ -80,8 +80,8 @@
 
 (allow network-inbound
        ; we do want to be more specific than this.
-       ;(to tcp4 "*:9050")
-       ;(to tcp4 "*:9051"))
+       ;(to tcp4 "*:9150")
+       ;(to tcp4 "*:9151"))
        (to tcp4 "*:*"))
 
 (allow network-outbound)
diff --git a/src/osx-sandboxes/tor-sandbox/tor-enforce.sb b/src/osx-sandboxes/tor-sandbox/tor-enforce.sb
index ad31d2c..fcb2129 100644
--- a/src/osx-sandboxes/tor-sandbox/tor-enforce.sb
+++ b/src/osx-sandboxes/tor-sandbox/tor-enforce.sb
@@ -81,8 +81,8 @@
        (global-name "com.apple.system.notification_center"))
 
 (allow network-inbound
-       (local tcp "localhost:9050")
-       (local tcp "localhost:9051"))
+       (local tcp "localhost:9150")
+       (local tcp "localhost:9151"))
 
 (allow network-outbound)
 ;       (remote tcp "*:*")) 





More information about the tor-commits mailing list