September 2012 - tor-commits - lists.torproject.org

[torbutton/master] Bug 6254: Listen for TOR_TRANSPROXY env var to enable transproxy mode
by mikeperry＠torproject.org 12 Sep '12

12 Sep '12

commit d7c7c5770640619d2433a4ef70f7364401b2abaa Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Sep 11 19:17:30 2012 -0700 Bug 6254: Listen for TOR_TRANSPROXY env var to enable transproxy mode Listen for the existence of the TOR_TRANSPROXY env var, and set prefs appropriately. --- src/chrome/content/torbutton_util.js | 23 +++++++++++++++++++---- src/components/crash-observer.js | 21 ++++++++++++++++++++- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js index b6b4966..7d1effd 100644 --- a/src/chrome/content/torbutton_util.js +++ b/src/chrome/content/torbutton_util.js @@ -151,7 +151,14 @@ function torbutton_check_status() { else remote_dns = true; - return ((liveprefs.getIntPref("type") == 1) && + var proxy_type = 1; + if (torprefs.getCharPref('settings_method') == 'transparent') { + remote_dns = true; // Hack. Transparent has remote_dns disabled + proxy_type = 0; + } + + return ( + (liveprefs.getIntPref("type") == proxy_type) && torbutton_log(1, "Type is true") && (liveprefs.getCharPref("http") == torprefs.getCharPref('http_proxy')) && torbutton_log(1, "Http proxy") && @@ -207,10 +214,18 @@ function torbutton_activate_tor_settings() liveprefs.setIntPref('socks_version', torprefs.getIntPref('socks_version')); liveprefs.setCharPref('no_proxies_on', torprefs.getCharPref('no_proxies_on')); liveprefs.setBoolPref('share_proxy_settings', false); - if (torbutton_check_socks_remote_dns()) { - liveprefs.setBoolPref('socks_remote_dns', true); + + if (torprefs.getCharPref('settings_method') == 'transparent') { + liveprefs.setIntPref('type', 0); + if (torbutton_check_socks_remote_dns()) { + liveprefs.setBoolPref('socks_remote_dns', false); + } + } else { + liveprefs.setIntPref('type', 1); + if (torbutton_check_socks_remote_dns()) { + liveprefs.setBoolPref('socks_remote_dns', true); + } } - liveprefs.setIntPref('type', 1); torbutton_log(2, 'Done activating tor settings'); } diff --git a/src/components/crash-observer.js b/src/components/crash-observer.js index ab97fba..5ecac6a 100644 --- a/src/components/crash-observer.js +++ b/src/components/crash-observer.js @@ -124,6 +124,12 @@ CrashObserver.prototype = { parseInt(environ.get("TOR_SOCKS_PORT"))); if (this.is_tbb) { this._prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); + + // XXX: Hack for TBB people who alternate between transproxy and non + this._prefs.setCharPref('extensions.torbutton.settings_method', 'recommended'); + this._prefs.setBoolPref('extensions.torbutton.saved.transparentTor', false); + this._prefs.setBoolPref('network.proxy.socks_remote_dns', true); + this._prefs.setIntPref('network.proxy.type', 1); } } else if (this._prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { this._prefs.setIntPref('extensions.torbutton.socks_port', 9050); @@ -137,7 +143,20 @@ CrashObserver.prototype = { } else if (this._prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { this._prefs.setCharPref('extensions.torbutton.socks_host', '127.0.0.1'); } - + + if (environ.exists("TOR_TRANSPROXY")) { + this.logger.log(3, "Resetting Tor settings to transproxy"); + this._prefs.setCharPref('extensions.torbutton.settings_method', 'transparent'); + this._prefs.setBoolPref('extensions.torbutton.saved.transparentTor', true); + this._prefs.setIntPref('extensions.torbutton.socks_port', 0); + this._prefs.setCharPref('extensions.torbutton.socks_host', ""); + if (this.is_tbb) { + this._prefs.setBoolPref('network.proxy.socks_remote_dns', false); + this._prefs.setIntPref('network.proxy.type', 0); + this._prefs.setIntPref('network.proxy.socks_port', 0); + this._prefs.setCharPref('network.proxy.socks', ""); + } + } }, observe: function(subject, topic, data) {

1 0

[tor-cloud/master] Really bundle with ubuntu precise
by runa＠torproject.org 12 Sep '12

12 Sep '12

commit edc8ba1e11233824e6393cfde4e63b566b6edd7f Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Wed Sep 12 20:17:57 2012 +0100 Really bundle with ubuntu precise --- build.sh | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index 26c7e79..2ea398c 100755 --- a/build.sh +++ b/build.sh @@ -20,8 +20,8 @@ # Tor Cloud is developed and maintained by partnership between # ExpressionTech and The Tor Project. # -# Bundle and publish instance of canonical AMI Ubuntu 10.04 LTS (Lucid Lynx), -# modified to run as a Tor bridge relay, private relay or middle realy on Amazon EC2 +# Bundle and publish instance of Ubuntu modified to run as a Tor bridge +# on Amazon EC2 # Define your Amazon credentials for ec2-api-tools to function export EC2_PRIVATE_KEY=/path/to/pk.cert @@ -83,7 +83,7 @@ echo "After attaching the volume, sleep for 20 seconds..." sleep 20 # Get the files we need -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "cd /mnt && sudo wget https://cloud-images.ubuntu.com/releases/10.04/release/SHA256SUMS && sudo wget https://cloud-images.ubuntu.com/releases/10.04/release/SHA256SUMS.gpg && sudo wget https://cloud-images.ubuntu.com/releases/10.04/release/ubuntu-10.04-server-… -O ubuntu-10.04-server-cloudimg-i386.tar.gz" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "cd /mnt && sudo wget https://cloud-images.ubuntu.com/releases/12.04/release/SHA256SUMS && sudo wget https://cloud-images.ubuntu.com/releases/12.04/release/SHA256SUMS.gpg && sudo wget https://cloud-images.ubuntu.com/releases/12.04/release/ubuntu-12.04-server-… -O ubuntu-12.04-server-cloudimg-i386.tar.gz" # Verify the signature echo "Get the GPG key" @@ -96,11 +96,11 @@ echo "Check the return code" ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo grep Good /mnt/verify.txt" echo "See if the hashes match. If all else fails, lock ourselves out of the instance" -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "if [ `echo $?` -eq "0" ]; then if [ `grep ubuntu-10.04-server-cloudimg-i386.tar.gz /mnt/SHA256SUMS | awk '{print $1}'` != `sha256sum /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz | awk '{print $1}'` ]; then 'Hash in SHA256SUMS file does not match sha256sum of .tar.gz, will lock you out of the instance' ; sudo rm /home/ubuntu/.ssh/authorized_keys ; fi ; else echo 'No good signature in verify.txt, will lock you out of the instance' ; sudo rm /home/ubuntu/.ssh/authorized_keys ; fi" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "if [ `echo $?` -eq "0" ]; then if [ `grep ubuntu-12.04-server-cloudimg-i386.tar.gz /mnt/SHA256SUMS | awk '{print $1}'` != `sha256sum /mnt/ubuntu-12.04-server-cloudimg-i386.tar.gz | awk '{print $1}'` ]; then 'Hash in SHA256SUMS file does not match sha256sum of .tar.gz, will lock you out of the instance' ; sudo rm /home/ubuntu/.ssh/authorized_keys ; fi ; else echo 'No good signature in verify.txt, will lock you out of the instance' ; sudo rm /home/ubuntu/.ssh/authorized_keys ; fi" # Set the correct permission for /mnt, extract image and continue the build process echo "Verified the signature, continue with the build process" -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && tar -Sxvzf /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz && sudo mkdir /mnt/src /mnt/target && sudo mount -o loop,rw /mnt/lucid-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L cloudimg-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && tar -Sxvzf /mnt/ubuntu-12.04-server-cloudimg-i386.tar.gz && sudo mkdir /mnt/src /mnt/target && sudo mount -o loop,rw /mnt/lucid-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L cloudimg-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" # this is our startup file that loads tor-prep.sh on first boot ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://gitweb.torproject.org/tor-cloud.git/blob_plain/HEAD:/rc.local -O /mnt/src/etc/rc.local" @@ -144,7 +144,7 @@ RANDOM=$(echo `</dev/urandom tr -dc A-Za-z0-9 | head -c8`) # Finally register and publish the image echo "Registering and publishing the image..." -ec2-register --region ${region} --snapshot ${snap} --architecture=i386 --kernel=${aki} --name "Tor-Cloud-EC2-${rel}-${region}-${NOW}-${RANDOM}" --description "Tor Cloud Server - [bridge] - Ubuntu 10.04.3 LTS [Lucid Lynx] - [${region}]" +ec2-register --region ${region} --snapshot ${snap} --architecture=i386 --kernel=${aki} --name "Tor-Cloud-EC2-${rel}-${region}-${NOW}-${RANDOM}" --description "Tor Cloud Server - [bridge] - Ubuntu 12.04 LTS [Precise Pangolin] - [${region}]" # cleanup ec2-detach-volume --region ${region} ${vol}

1 0

[compass/master] Remove filterArgs()
by karsten＠torproject.org 12 Sep '12

12 Sep '12

commit 7115b47ebd6bc40388dd14a45299a77ebe13c040 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Wed Sep 12 20:47:31 2012 +0530 Remove filterArgs() I previously added a 'hacky' filterArgs() to remove the unnecessary parameters from the GET request by setting the 'name' parameter to null for empty args, but it's broken now and I need to remove the empty params and reconstruct the URL manually using javascript. I'd rather just let them be for now. --- static/js/custom.js | 11 ----------- templates/index.html | 1 - 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/static/js/custom.js b/static/js/custom.js index 6ef85be..2144e89 100644 --- a/static/js/custom.js +++ b/static/js/custom.js @@ -26,17 +26,6 @@ function doAjax(){ } } -function filterArgs() { - var myForm = document.getElementById('form'); - var allInputs = myForm.getElementsByTagName('input'); - var input, i; - for(i = 0; input = allInputs[i]; i++) { - if(input.getAttribute('name') && !input.value) { - input.setAttribute('name', ''); - } - } -} - function parseArgs(query){ var newQuery = {}, key, value; query = String(query); diff --git a/templates/index.html b/templates/index.html index 65a5c6a..9ffe0d2 100644 --- a/templates/index.html +++ b/templates/index.html @@ -165,7 +165,6 @@ <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script> <script src="{{ url_for('static', filename='js/custom.js') }}"></script> <script> - filterArgs(); doAjax(); setOptions(); </script>

1 0

[tor/master] Check ewma_enabled before doing circ-has-become-inactive check
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 5ade2786050dcf07ee6491145add86da5c21739d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 11 09:57:58 2012 -0400 Check ewma_enabled before doing circ-has-become-inactive check This avoids a possible crash bug in flush_from_first_active_circuit. Fixes bug 6341; bugfix on 0.2.2.7-alpha. Bug reported and fixed by a pseudonymous user on IRC. --- changes/bug6341 | 5 +++++ src/or/relay.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug6341 b/changes/bug6341 new file mode 100644 index 0000000..04e52c7 --- /dev/null +++ b/changes/bug6341 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix a possible crash bug when checking for deactivated circuits + in connection_or_flush_from_first_active_circuit(). Fixes bug + 6341; bugfix on 0.2.2.7-alpha. Bug report and fix received + pseudonymously. diff --git a/src/or/relay.c b/src/or/relay.c index 3e418ea..b1913e7 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2464,7 +2464,7 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max, tor_assert(tmp == cell_ewma); add_cell_ewma_to_conn(conn, cell_ewma); } - if (circ != conn->active_circuits) { + if (!ewma_enabled && circ != conn->active_circuits) { /* If this happens, the current circuit just got made inactive by * a call in connection_write_to_buf(). That's nothing to worry about: * circuit_make_inactive_on_conn() already advanced conn->active_circuits

1 0

[tor/master] Merge remote-tracking branch 'public/bug6341_a_v2' into maint-0.2.3
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 1f5a7917f5e742c9d64c835439a5ea337e9e934a Merge: 4aff97c 5ade278 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 11:10:59 2012 -0400 Merge remote-tracking branch 'public/bug6341_a_v2' into maint-0.2.3 changes/bug6341 | 5 +++++ src/or/relay.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 35e19b9498e3d23d87d7adacd4ec27969d63d315 Merge: 6a88615 1f5a791 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 11:11:16 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6341 | 5 +++++ src/or/relay.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.3] Check ewma_enabled before doing circ-has-become-inactive check
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 5ade2786050dcf07ee6491145add86da5c21739d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 11 09:57:58 2012 -0400 Check ewma_enabled before doing circ-has-become-inactive check This avoids a possible crash bug in flush_from_first_active_circuit. Fixes bug 6341; bugfix on 0.2.2.7-alpha. Bug reported and fixed by a pseudonymous user on IRC. --- changes/bug6341 | 5 +++++ src/or/relay.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug6341 b/changes/bug6341 new file mode 100644 index 0000000..04e52c7 --- /dev/null +++ b/changes/bug6341 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix a possible crash bug when checking for deactivated circuits + in connection_or_flush_from_first_active_circuit(). Fixes bug + 6341; bugfix on 0.2.2.7-alpha. Bug report and fix received + pseudonymously. diff --git a/src/or/relay.c b/src/or/relay.c index 3e418ea..b1913e7 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2464,7 +2464,7 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max, tor_assert(tmp == cell_ewma); add_cell_ewma_to_conn(conn, cell_ewma); } - if (circ != conn->active_circuits) { + if (!ewma_enabled && circ != conn->active_circuits) { /* If this happens, the current circuit just got made inactive by * a call in connection_write_to_buf(). That's nothing to worry about: * circuit_make_inactive_on_conn() already advanced conn->active_circuits

1 0

[tor/maint-0.2.3] Merge remote-tracking branch 'public/bug6341_a_v2' into maint-0.2.3
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 1f5a7917f5e742c9d64c835439a5ea337e9e934a Merge: 4aff97c 5ade278 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 11:10:59 2012 -0400 Merge remote-tracking branch 'public/bug6341_a_v2' into maint-0.2.3 changes/bug6341 | 5 +++++ src/or/relay.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/master] 6819: typo in torrc.sample.in
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 4aff97cfc7965414ad8506ce28a296da1bc4a161 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 11:08:30 2012 -0400 6819: typo in torrc.sample.in --- changes/bug6819 | 3 +++ src/config/torrc.sample.in | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug6819 b/changes/bug6819 new file mode 100644 index 0000000..8b5c224 --- /dev/null +++ b/changes/bug6819 @@ -0,0 +1,3 @@ + o Documentation fixes: + - Resolve a typo in torrc.sample.in. Fixes bug 6819; bugfix on + 0.2.3.14-alpha. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index a1a08aa..f30fc32 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -16,7 +16,7 @@ ## configure one below. Set "SocksPort 0" if you plan to run Tor only ## as a relay, and not make any local application connections yourself. #SocksPort 9050 # Default: Bind to localhost:9050 for local connections. -#SocksPort 192.168.0.1:9100 # Bind to this adddress:port too. +#SocksPort 192.168.0.1:9100 # Bind to this address:port too. ## Entry policies to allow/deny SOCKS requests based on IP address. ## First entry that matches wins. If no SocksPolicy is set, we accept

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 6a8861574bba27cbe924c147ee85b9fd72fff563 Merge: 5977da6 4aff97c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 11:09:10 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6819 | 3 +++ src/config/torrc.sample.in | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)

1 0