May 2013 - tor-commits - lists.torproject.org

[oonib/master] Specify pysqlite>=2.6.0, and add information on using oonib without SQLite.
by isis＠torproject.org 16 May '13

16 May '13

commit 7ab522e8ac399bef847203585957a5740e9b543b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 15 22:40:06 2013 +0000 Specify pysqlite>=2.6.0, and add information on using oonib without SQLite. --- requirements.txt | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/requirements.txt b/requirements.txt index 471433f..b0d7f75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,4 +40,11 @@ pyOpenSSL>=0.13 zope.component>=4.0.0 zope.event>=4.0.0 zope.interface>=4.0.1 -pysqlite +## +## pysqlite2 is required for sqlite support in Storm, see +## https://storm.canonical.com/Manual#Dependencies-2 +## +## If not installed, Storm and ooni-backend will still work, but will keep an +## in-memory database, which in some cases may slow the server. +## +pysqlite>=2.6.0

1 0

[oonib/master] Add info and references on why the strange links are in requirements.txt.
by isis＠torproject.org 16 May '13

16 May '13

commit a89a084889f1715fa1a54ac410142f038bcb66bf Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 15 22:37:02 2013 +0000 Add info and references on why the strange links are in requirements.txt. --- requirements.txt | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 813d840..471433f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,20 @@ -i https://pypi.python.org/packages +## +## The above line replaces pip's default package index, and this line is +## removed from the .requirements.travis file, due to its incompatibility +## with the '--use-mirrors' option that TravisCI recommends. +## +## The URLs in this file which have been commented out are due to a design +## problem in pip-1.3.0, where it ships with a default package index of +## 'https://pypi.python.org/simple', which though *it* was over SSL as +## promised, it still crawled the links on a module's PyPI page, which contains +## arbitrary links, such as project homepages, created by the PyPI maintainer +## of the module. see +## +## https://github.com/TheTorProject/ooni-backend/pull/1#discussion_r4084881 for +## a detailed description of the problem, and why these links may still be +## useful until pip is updated again. +## PyYAML>=3.10 #https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz#md5=74c94a383886519e9e7b3dd1ee540247#egg=PyYAML Twisted>=12.2.0 @@ -9,9 +25,11 @@ ipaddr>=2.1.10 #https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr pygeoip>=0.2.6 #https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.2.6.zip#md5=b3ac1bfcd535782bc59af78e722cf5c1#egg=pygeoip -# Originally fetched from the hg repo on secdev.org: -# https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy -# This is a Tor Project mirror with valid SSL/TLS certs that is stable and fast: +## +## Originally fetched from the hg repo on secdev.org: +## https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy +## This is a Tor Project mirror with valid SSL/TLS certs that is stable and fast: +## https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/scapy-02-25-20… transaction>=1.4.1 #https://pypi.python.org/packages/source/t/transaction/transaction-1.4.1.zip#md5=8db2680bc0f999219861a67b8f335a88#egg=transaction

1 0

[oonib/master] Remove extra EOL whitespace from README.md
by isis＠torproject.org 16 May '13

16 May '13

commit d775b1f1337d7b11c049e586a77aad7d49a8278c Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 15 21:41:31 2013 +0000 Remove extra EOL whitespace from README.md --- README.md | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4e65b58..323d242 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ rm server.csr If you decide to put your certificate and key somewhere else, don't forget to update oonib.conf options ```helpers.ssl.private_key``` and ```helpers.ssl.certificate``` ! -## Redirect low ports with iptables +## Redirect low ports with iptables The following iptables commands will map connections on low ports to those bound by oonib: @@ -114,12 +114,12 @@ iptables -t nat -A PREROUTING -p tcp -m tcp --dport 80 -j REDIRECT --to-ports 57 # Map port 443 to config.helpers.ssl.port (default: 57006) iptables -t nat -A PREROUTING -p tcp -m tcp --dport 443 -j REDIRECT --to-ports 57006 # Map port 53 udp to config.helpers.dns.udp_port (default: 57004) -iptables -t nat -A PREROUTING -p tcp -m udp --dport 53 -j REDIRECT --tor-ports +iptables -t nat -A PREROUTING -p tcp -m udp --dport 53 -j REDIRECT --tor-ports # Map port 53 tcp to config.helpers.dns.tcp_port (default: 57005) -iptables -t nat -A PREROUTING -p tcp -m tcp --dport 53 -j REDIRECT --tor-ports +iptables -t nat -A PREROUTING -p tcp -m tcp --dport 53 -j REDIRECT --tor-ports ``` -# (For Experts Only) Tor2webmode: +# (For Experts Only) Tor2webmode: **WARNING**: provides no anonymity! Use only if you know what you are doing! Tor2webmode will improve the performance of the collector Hidden Service by discarding server-side anonymity. @@ -142,7 +142,7 @@ object 17c24b3118224d6536c41fa4e1493a831fb29f0a type commit tag tor-0.2.3.25 tagger Roger Dingledine <arma(a)torproject.org> 1353399116 -0500 - + tag 0.2.3.25 gpg: Signature made Tue 20 Nov 2012 08:11:59 AM UTC using RSA key ID 19F78451 gpg: Good signature from "Roger Dingledine <arma(a)mit.edu>" @@ -165,9 +165,9 @@ sub 4096R/9B11185C 2012-05-02 [expires: 2013-05-02] Build Tor with enable-tor2web-mode ``` -./autogen.sh ; ./configure --enable-tor2web-mode ; make +./autogen.sh ; ./configure --enable-tor2web-mode ; make ``` - + Copy the tor binary from src/or/tor somewhere and set the corresponding options in oonib.conf.

1 0

[oonib/master] Update README.md with example output which includes arma's new subkey.
by isis＠torproject.org 16 May '13

16 May '13

commit 03dc532d78501cc4004ff02dbaaf6a068fd91cd7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 15 21:59:09 2013 +0000 Update README.md with example output which includes arma's new subkey. --- README.md | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 323d242..c093568 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ you'll want to make sure to get our keyring package in Debian: ``` echo "deb http://deb.torproject.org/torproject.org wheezy main" | \ sudo tee -a /etc/apt/sources.list -gpg --keyserver keys.gnupg.net --recv 886DDD89 +gpg --keyserver keys.gnupg.net --recv EE8CBC9E886DDD89 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - sudo apt-get update sudo apt-get install deb.torproject.org-keyring tor tor-geoipdb @@ -144,7 +144,8 @@ tag tor-0.2.3.25 tagger Roger Dingledine <arma(a)torproject.org> 1353399116 -0500 tag 0.2.3.25 -gpg: Signature made Tue 20 Nov 2012 08:11:59 AM UTC using RSA key ID 19F78451 +gpg: Signature made Tue 20 Nov 2012 08:11:59 UTC +gpg: using RSA key C218525819F78451 gpg: Good signature from "Roger Dingledine <arma(a)mit.edu>" gpg: aka "Roger Dingledine <arma(a)freehaven.net>" gpg: aka "Roger Dingledine <arma(a)torproject.org>" @@ -153,13 +154,15 @@ gpg: aka "Roger Dingledine <arma(a)torproject.org>" It is always good idea to verify. ``` -gpg --fingerprint 19F78451 -pub 4096R/19F78451 2010-05-07 +$ gpg --recv-keys C218525819F78451 +[...] +$ gpg --fingerprint C218525819F78451 +pub 4096R/C218525819F78451 2010-05-07 Key fingerprint = F65C E37F 04BA 5B36 0AE6 EE17 C218 5258 19F7 8451 -uid Roger Dingledine <arma(a)mit.edu> -uid Roger Dingledine <arma(a)freehaven.net> -uid Roger Dingledine <arma(a)torproject.org> -sub 4096R/9B11185C 2012-05-02 [expires: 2013-05-02] + uid [ full ] Roger Dingledine <arma(a)mit.edu> + uid [ full ] Roger Dingledine <arma(a)freehaven.net> + uid [ full ] Roger Dingledine <arma(a)torproject.org> + sub 4096R/690234AC0DCC0FE1 2013-05-09 [expires: 2014-05-09] ``` Build Tor with enable-tor2web-mode

1 0

[oonib/master] Use gh syntax for code.
by isis＠torproject.org 16 May '13

16 May '13

commit 3f7dec557fa87d0f8c4b141b77c52ada1cece4b4 Author: Arturo Filastò <hellais(a)gmail.com> Date: Sun May 5 03:06:40 2013 +0300 Use gh syntax for code. --- README.md | 170 +++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 98 insertions(+), 72 deletions(-) diff --git a/README.md b/README.md index 14a30be..4e65b58 100644 --- a/README.md +++ b/README.md @@ -4,25 +4,31 @@ There are a few dependencies which we recommend you get from your distribution's archives. - sudo apt-get install build-essential python-dev python-setuptools openssl +``` +sudo apt-get install build-essential python-dev python-setuptools openssl +``` ### Tor You will need a Tor binary on your system. For complete instructions, see also: - https://www.torproject.org/docs/tor-doc-unix.html.en - https://www.torproject.org/docs/rpms.html.en +``` +https://www.torproject.org/docs/tor-doc-unix.html.en +https://www.torproject.org/docs/rpms.html.en +``` If you've already got Tor, or plan to compile it yourself from source, great! You can skip this step. Otherwise, if you're installing Tor (or reinstalling), you'll want to make sure to get our keyring package in Debian: - echo "deb http://deb.torproject.org/torproject.org wheezy main" | \ - sudo tee -a /etc/apt/sources.list - gpg --keyserver keys.gnupg.net --recv 886DDD89 - gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - - sudo apt-get update - sudo apt-get install deb.torproject.org-keyring tor tor-geoipdb - +``` +echo "deb http://deb.torproject.org/torproject.org wheezy main" | \ + sudo tee -a /etc/apt/sources.list +gpg --keyserver keys.gnupg.net --recv 886DDD89 +gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - +sudo apt-get update +sudo apt-get install deb.torproject.org-keyring tor tor-geoipdb +``` + ### Pip (>=1.3.0) We recommend using the Pip>=1.3.0 because it included several important security and privacy related patches: @@ -34,30 +40,34 @@ security and privacy related patches: The least painful way (that we know of) to install a newer Pip is to use Pip's get-pip script: - # Grab the get-pip installer to make sure we have pip>=1.3.0 - curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py - sudo python ./get-pip.py ## pip (>=1.3.0) is recommended for security reasons - # And make sure we're actually using the newer one: - sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 +``` +# Grab the get-pip installer to make sure we have pip>=1.3.0 +curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py +sudo python ./get-pip.py ## pip (>=1.3.0) is recommended for security reasons +# And make sure we're actually using the newer one: +sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 +``` ### Virtualenv We recommend that you use a python virtualenv. The recommended commands for setting up this up and installing are: - sudo pip install --upgrade virtualenv virtualenvwrapper - # Setup the virtualenv directory: - export WORKON_HOME=~/.virtualenvs && mkdir -p $WORKON_HOME - source /usr/local/bin/virtualenvwrapper.sh - # Clone ooni-backend: - git clone https://github.com/TheTorProject/ooni-backend.git && cd ooni-backend - # Create the virtualenv for ooni-backend... - mkvirtualenv -a $PWD --unzip-setuptools --setuptools --no-site-packages oonib - # ...and install ooni-backend (sudo is not necessary since we're in a virtualenv): - pip install -r requirements.txt --use-mirrors - # Note: it is important that you install the requirements before you run - # the setup.py script. If you fail to do so they will be downloaded over - # plaintext. - python setup.py install +``` +sudo pip install --upgrade virtualenv virtualenvwrapper +# Setup the virtualenv directory: +export WORKON_HOME=~/.virtualenvs && mkdir -p $WORKON_HOME +source /usr/local/bin/virtualenvwrapper.sh +# Clone ooni-backend: +git clone https://github.com/TheTorProject/ooni-backend.git && cd ooni-backend +# Create the virtualenv for ooni-backend... +mkvirtualenv -a $PWD --unzip-setuptools --setuptools --no-site-packages oonib +# ...and install ooni-backend (sudo is not necessary since we're in a virtualenv): +pip install -r requirements.txt --use-mirrors +# Note: it is important that you install the requirements before you run +# the setup.py script. If you fail to do so they will be downloaded over +# plaintext. +python setup.py install +``` # Running an OONI collector @@ -65,7 +75,9 @@ setting up this up and installing are: Copy the example config file to ```oonib.conf```. - cp oonib.conf.example oonib.conf +``` +cp oonib.conf.example oonib.conf +``` Then edit your configuration to fit your needs. The fields you should probably end up changing are ```report_dir``` (the public web server directory where you @@ -78,14 +90,16 @@ you'll likely want to specify it for the ```tor_binary``` option. ## Generate self signed certs for OONIB If you want to use the HTTPS test helper, you will need to create a certificate: - openssl genrsa -des3 -out private.key 4096 - openssl req -new -key private.key -out server.csr - cp private.key private.key.org - # Remove passphrase from key - openssl rsa -in private.key.org -out private.key - openssl x509 -req -days 365 -in server.csr -signkey private.key -out certificate.crt - rm private.key.org - rm server.csr +``` +openssl genrsa -des3 -out private.key 4096 +openssl req -new -key private.key -out server.csr +cp private.key private.key.org +# Remove passphrase from key +openssl rsa -in private.key.org -out private.key +openssl x509 -req -days 365 -in server.csr -signkey private.key -out certificate.crt +rm private.key.org +rm server.csr +``` If you decide to put your certificate and key somewhere else, don't forget to update oonib.conf options ```helpers.ssl.private_key``` and ```helpers.ssl.certificate``` ! @@ -94,14 +108,16 @@ update oonib.conf options ```helpers.ssl.private_key``` and ```helpers.ssl.certi The following iptables commands will map connections on low ports to those bound by oonib: - # Map port 80 to config.helpers.http_return_request.port (default: 57001) - iptables -t nat -A PREROUTING -p tcp -m tcp --dport 80 -j REDIRECT --to-ports 57001 - # Map port 443 to config.helpers.ssl.port (default: 57006) - iptables -t nat -A PREROUTING -p tcp -m tcp --dport 443 -j REDIRECT --to-ports 57006 - # Map port 53 udp to config.helpers.dns.udp_port (default: 57004) - iptables -t nat -A PREROUTING -p tcp -m udp --dport 53 -j REDIRECT --tor-ports - # Map port 53 tcp to config.helpers.dns.tcp_port (default: 57005) - iptables -t nat -A PREROUTING -p tcp -m tcp --dport 53 -j REDIRECT --tor-ports +``` +# Map port 80 to config.helpers.http_return_request.port (default: 57001) +iptables -t nat -A PREROUTING -p tcp -m tcp --dport 80 -j REDIRECT --to-ports 57001 +# Map port 443 to config.helpers.ssl.port (default: 57006) +iptables -t nat -A PREROUTING -p tcp -m tcp --dport 443 -j REDIRECT --to-ports 57006 +# Map port 53 udp to config.helpers.dns.udp_port (default: 57004) +iptables -t nat -A PREROUTING -p tcp -m udp --dport 53 -j REDIRECT --tor-ports +# Map port 53 tcp to config.helpers.dns.tcp_port (default: 57005) +iptables -t nat -A PREROUTING -p tcp -m tcp --dport 53 -j REDIRECT --tor-ports +``` # (For Experts Only) Tor2webmode: **WARNING**: provides no anonymity! Use only if you know what you are doing! @@ -113,37 +129,45 @@ stable Tor is tor-0.2.3.25. You should use the most recent stable Tor. Example: - git clone https://git.torproject.org/tor.git - git checkout tor-0.2.3.25 - git verify-tag -v tor-0.2.3.25 +``` +git clone https://git.torproject.org/tor.git +git checkout tor-0.2.3.25 +git verify-tag -v tor-0.2.3.25 +``` You should see: - object 17c24b3118224d6536c41fa4e1493a831fb29f0a - type commit - tag tor-0.2.3.25 - tagger Roger Dingledine <arma(a)torproject.org> 1353399116 -0500 +``` +object 17c24b3118224d6536c41fa4e1493a831fb29f0a +type commit +tag tor-0.2.3.25 +tagger Roger Dingledine <arma(a)torproject.org> 1353399116 -0500 - tag 0.2.3.25 - gpg: Signature made Tue 20 Nov 2012 08:11:59 AM UTC using RSA key ID 19F78451 - gpg: Good signature from "Roger Dingledine <arma(a)mit.edu>" - gpg: aka "Roger Dingledine <arma(a)freehaven.net>" - gpg: aka "Roger Dingledine <arma(a)torproject.org>" +tag 0.2.3.25 +gpg: Signature made Tue 20 Nov 2012 08:11:59 AM UTC using RSA key ID 19F78451 +gpg: Good signature from "Roger Dingledine <arma(a)mit.edu>" +gpg: aka "Roger Dingledine <arma(a)freehaven.net>" +gpg: aka "Roger Dingledine <arma(a)torproject.org>" +``` It is always good idea to verify. - gpg --fingerprint 19F78451 - pub 4096R/19F78451 2010-05-07 - Key fingerprint = F65C E37F 04BA 5B36 0AE6 EE17 C218 5258 19F7 8451 - uid Roger Dingledine <arma(a)mit.edu> - uid Roger Dingledine <arma(a)freehaven.net> - uid Roger Dingledine <arma(a)torproject.org> - sub 4096R/9B11185C 2012-05-02 [expires: 2013-05-02] +``` +gpg --fingerprint 19F78451 +pub 4096R/19F78451 2010-05-07 + Key fingerprint = F65C E37F 04BA 5B36 0AE6 EE17 C218 5258 19F7 8451 +uid Roger Dingledine <arma(a)mit.edu> +uid Roger Dingledine <arma(a)freehaven.net> +uid Roger Dingledine <arma(a)torproject.org> +sub 4096R/9B11185C 2012-05-02 [expires: 2013-05-02] +``` Build Tor with enable-tor2web-mode - ./autogen.sh ; ./configure --enable-tor2web-mode ; make - +``` +./autogen.sh ; ./configure --enable-tor2web-mode ; make +``` + Copy the tor binary from src/or/tor somewhere and set the corresponding options in oonib.conf. @@ -152,11 +176,13 @@ To launch oonib on startup, you may want to use supervisord (www.supervisord.org The following supervisord config will use the virtual environment in /home/ooni/venv_oonib and start oonib on boot: - [program:oonib] - command=/home/ooni/venv_oonib/bin/python /home/ooni/ooni-probe/bin/oonib - autostart=true - user=oonib - directory=/home/oonib/ +``` +[program:oonib] +command=/home/ooni/venv_oonib/bin/python /home/ooni/ooni-probe/bin/oonib +autostart=true +user=oonib +directory=/home/oonib/ +``` # Testing with vagrant

1 0

[tor-launcher/master] Avoid vertical scrollbar within wizard on Linux.
by brade＠torproject.org 15 May '13

15 May '13

commit ed9c8d9c9687dbcafeb264820117407c3e610841 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed May 15 15:05:18 2013 -0400 Avoid vertical scrollbar within wizard on Linux. Use em instead of px to specify dialog dimensions. --- src/chrome/skin/network-settings.css | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 570adaf..4c51e4a 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -6,26 +6,25 @@ */ dialog { - width: 580px; - height: 464px; + width: 45em; + height: 36em; font: -moz-dialog; } dialog.os-windows { - width: 540px; - height: 435px; + width: 49em; } wizard { - width: 540px; - height: 440px; + width: 43em; + height: 33em; font: -moz-dialog; padding-top: 0px; } wizard.os-windows { - width: 490px; - height: 420px; + width: 45em; + height: 39em; } .wizard-page-box {

1 0

[tor/master] Fix unit tests to pass after fix for #8879
by nickm＠torproject.org 15 May '13

15 May '13

commit 31a6b4e11fd875addd1ae9f35677a3944cafb0d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 15 14:34:59 2013 -0400 Fix unit tests to pass after fix for #8879 --- src/test/test.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test.c b/src/test/test.c index 0e48533..3ff39e6 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -468,7 +468,7 @@ test_socks_5_no_authenticate(void *ptr) get_options()->SafeSocks)); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); - test_eq(5, socks->reply[0]); + test_eq(1, socks->reply[0]); test_eq(0, socks->reply[1]); test_eq(2, socks->usernamelen); @@ -507,7 +507,7 @@ test_socks_5_authenticate(void *ptr) get_options()->SafeSocks)); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); - test_eq(5, socks->reply[0]); + test_eq(1, socks->reply[0]); test_eq(0, socks->reply[1]); test_eq(2, socks->usernamelen); @@ -547,7 +547,7 @@ test_socks_5_authenticate_with_data(void *ptr) get_options()->SafeSocks) == 1); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); - test_eq(5, socks->reply[0]); + test_eq(1, socks->reply[0]); test_eq(0, socks->reply[1]); test_streq("2.2.2.2", socks->address);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 15 May '13

15 May '13

commit 95c34399cfb66a46371562f1532e8aa396243876 Merge: 69f66b9 31a6b4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 15 14:35:37 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' src/test/test.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.4] Fix unit tests to pass after fix for #8879
by nickm＠torproject.org 15 May '13

15 May '13

commit 31a6b4e11fd875addd1ae9f35677a3944cafb0d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 15 14:34:59 2013 -0400 Fix unit tests to pass after fix for #8879 --- src/test/test.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test.c b/src/test/test.c index 0e48533..3ff39e6 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -468,7 +468,7 @@ test_socks_5_no_authenticate(void *ptr) get_options()->SafeSocks)); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); - test_eq(5, socks->reply[0]); + test_eq(1, socks->reply[0]); test_eq(0, socks->reply[1]); test_eq(2, socks->usernamelen); @@ -507,7 +507,7 @@ test_socks_5_authenticate(void *ptr) get_options()->SafeSocks)); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); - test_eq(5, socks->reply[0]); + test_eq(1, socks->reply[0]); test_eq(0, socks->reply[1]); test_eq(2, socks->usernamelen); @@ -547,7 +547,7 @@ test_socks_5_authenticate_with_data(void *ptr) get_options()->SafeSocks) == 1); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); - test_eq(5, socks->reply[0]); + test_eq(1, socks->reply[0]); test_eq(0, socks->reply[1]); test_streq("2.2.2.2", socks->address);

1 0

[tor/master] Fix socks5 handshake for username/password auth
by nickm＠torproject.org 15 May '13

15 May '13

commit 0bfaf86612eddbd586d648f3b642dac26f134fca Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 15 03:34:37 2013 -0400 Fix socks5 handshake for username/password auth The fix for bug 8117 exposed this bug, and it turns out real-world applications like Pidgin do care. Bugfix on 0.2.3.2-alpha; fixes bug 8879. --- changes/bug8879 | 5 +++++ src/or/buffers.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug8879 b/changes/bug8879 new file mode 100644 index 0000000..0d2a700 --- /dev/null +++ b/changes/bug8879 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Follow the socks5 protocol when offering username/password + authentication. The fix for bug 8117 exposed this bug, and it + turns out real-world applications like Pidgin do care. Bugfix on + 0.2.3.2-alpha; fixes bug 8879. diff --git a/src/or/buffers.c b/src/or/buffers.c index d063d23..c4c847e 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1751,7 +1751,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, return 0; } req->replylen = 2; /* 2 bytes of response */ - req->reply[0] = 5; + req->reply[0] = 1; /* authversion == 1 */ req->reply[1] = 0; /* authentication successful */ log_debug(LD_APP, "socks5: Accepted username/password without checking.");

1 0