- tor-commits - lists.torproject.org

[gettor/master] Clean up logs a bit (remove logging of sensitive data)
by kaner＠torproject.org 03 Sep '11

03 Sep '11

commit 61f315535165e37ac49f9a415d961b65540d8c20 Author: Christian Fromme <kaner(a)strace.org> Date: Tue Aug 23 21:19:00 2011 +0200 Clean up logs a bit (remove logging of sensitive data) --- lib/gettor/blacklist.py | 4 +--- lib/gettor/filters.py | 1 - lib/gettor/requests.py | 1 + lib/gettor/responses.py | 21 ++++++++++++--------- lib/gettor/utils.py | 4 ++++ 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/lib/gettor/blacklist.py b/lib/gettor/blacklist.py index cbf2c47..83cf188 100644 --- a/lib/gettor/blacklist.py +++ b/lib/gettor/blacklist.py @@ -2,7 +2,6 @@ # Christian Fromme <kaner(a)strace.org> # This is Free Software. See LICENSE for license information. -import hashlib import os import re import glob @@ -109,5 +108,4 @@ class BWList: """Return hash for a given emailaddress """ emailonly = gettor.utils.stripEmail(address) - return str(hashlib.sha1(emailonly).hexdigest()) - + return gettor.utils.getHash(emailonly) diff --git a/lib/gettor/filters.py b/lib/gettor/filters.py index 4deacb0..f2f0534 100644 --- a/lib/gettor/filters.py +++ b/lib/gettor/filters.py @@ -32,7 +32,6 @@ def checkAddressHack(userAddress): XXX: This should merge somehow with the GetTor blacklisting mechanism at some point """ - logging.debug("Checking user address %s.." % userAddress) if re.compile(".*@.*torproject.org.*").match(userAddress): return False diff --git a/lib/gettor/requests.py b/lib/gettor/requests.py index 9cadef5..5b9bb3b 100644 --- a/lib/gettor/requests.py +++ b/lib/gettor/requests.py @@ -22,6 +22,7 @@ class requestMail: self.config = config self.request = {} self.request['user'] = self.parsedMessage["Return-Path"] + self.request['hashed_user'] = gettor.utils.getHash(self.request['user']) self.request['ouraddr'] = self.getRealTo(self.parsedMessage["to"]) self.request['locale'] = self.getLocaleInTo(self.request['ouraddr']) self.request['package'] = None diff --git a/lib/gettor/responses.py b/lib/gettor/responses.py index 47bb7d3..b0dd643 100644 --- a/lib/gettor/responses.py +++ b/lib/gettor/responses.py @@ -5,6 +5,7 @@ import os import re import sys +import copy import smtplib import gettext import logging @@ -112,8 +113,10 @@ class Response: self.config = config self.reqInfo = reqInfo - # Dump info - logging.info(str(self.reqInfo)) + # Delete sensitive data before dumping info + reqInfoClean = copy.deepcopy(self.reqInfo) + del reqInfoClean['user'] + logging.info(str(reqInfoClean)) # Initialize locale subsystem self.t = i18n.getLang(self.reqInfo['locale'], config) @@ -165,7 +168,7 @@ class Response: self.bList.createSublist(fname) if self.bList.lookupListEntry(self.reqInfo['user'], fname): logging.info("User %s is blacklisted for %s" \ - % (self.reqInfo['user'], fname)) + % (self.reqInfo['hashed_user'], fname)) return True else: self.bList.createListEntry(self.reqInfo['user'], fname) @@ -185,7 +188,7 @@ class Response: if self.isBlacklistedForMessageType("sendPackage"): # Don't send anything return False - logging.info("Sending out %s to %s." % (pack, to)) + logging.info("Sending out %s." % (pack)) f = os.path.join(self.config.BASEDIR, "packages", pack + ".z") txt = getPackageMsg(self.t) msg = self.makeMsg(txt, to, fileName=f) @@ -205,7 +208,7 @@ class Response: pack = self.reqInfo['package'] fwd = self.reqInfo['forward'] to = self.reqInfo['user'] - logging.info("Sending out %s to %s." % (pack, fwd)) + logging.info("Sending out %s." % (pack)) f = os.path.join(self.config.BASEDIR, "packages", pack + ".z") text = getPackageMsg(self.t) msg = self.makeMsg(text, fwd, fileName=f) @@ -282,7 +285,7 @@ class Response: if self.isBlacklistedForMessageType("sendDelayAlert"): # Don't send anything return False - logging.info("Sending delay alert to %s" % self.reqInfo['user']) + logging.info("Sending delay alert to %s" % self.reqInfo['hashed_user']) return self.sendTextEmail(getDelayAlertMsg(self.t)) def sendHelp(self): @@ -292,7 +295,7 @@ class Response: if self.isBlacklistedForMessageType("sendHelp"): # Don't send anything return False - logging.info("Sending out help message to %s" % self.reqInfo['user']) + logging.info("Sending out help message to %s" % self.reqInfo['hashed_user']) return self.sendTextEmail(getPackageHelpMsg(self.t)) def sendPackageHelp(self): @@ -302,7 +305,7 @@ class Response: if self.isBlacklistedForMessageType("sendPackageHelp"): # Don't send anything return False - logging.info("Sending package help to %s" % self.reqInfo['user']) + logging.info("Sending package help to %s" % self.reqInfo['hashed_user']) return self.sendTextEmail(i18n.MULTILANGHELP) def sendTextEmail(self, text): @@ -313,7 +316,7 @@ class Response: status = self.sendEmail(self.reqInfo['user'], message) except: logging.error("Could not send message to user %s" \ - % self.reqInfo['user']) + % self.reqInfo['hashed_user']) status = False logging.debug("Send status: %s" % status) diff --git a/lib/gettor/utils.py b/lib/gettor/utils.py index 0a51760..f29ddf6 100644 --- a/lib/gettor/utils.py +++ b/lib/gettor/utils.py @@ -285,3 +285,7 @@ def stripHTMLTags(string): """ return re.sub(r'<[^>]*?>', '', string) +def getHash(string): + """Return hash of given string + """ + return str(hashlib.sha1(string).hexdigest())

1 0

[gettor/master] Added some more explanatory text about what the different packages are.
by kaner＠torproject.org 03 Sep '11

03 Sep '11

commit 00181166857a932401bcf859e69adefb6de41024 Author: Christian Fromme <kaner(a)strace.org> Date: Sat Aug 27 18:18:16 2011 +0200 Added some more explanatory text about what the different packages are. --- lib/gettor/i18n.py | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/lib/gettor/i18n.py b/lib/gettor/i18n.py index 6f40bd1..25364cd 100644 --- a/lib/gettor/i18n.py +++ b/lib/gettor/i18n.py @@ -403,6 +403,59 @@ MULTILANGHELP = """ -- """ + +PACKAGEHELP = _(""" + Hello, This is the "GetTor" robot. + + I will mail you a Tor package, if you tell me which one you want. + Please select one of the following package names: + + tor-browser-bundle + macosx-i386-bundle + macosx-ppc-bundle + linux-browser-bundle-i386 + linux-browser-bundle-x86_64 + source-bundle + + + Please reply to this mail (to gettor), and tell me a single package name anywhere in + the body of your email. To make your decision a bit easier, here's a short explanation + of what these packages are: + + tor-browser-bundle: + + The Tor Browser Bundle package for Windows operating systems. If you're running some + version of Windows, like Windows XP, Windows Vista or Windows 7, this is the package + you should get. + + macosx-i386-bundle: + + The Tor Browser Bundle package for OS X, Intel CPU architecture. In general, newer + Mac hardware will require you to use this package. + + macosx-ppc-bundle: + + The Tor Browser Bundle package for OS X, PowerPC CPU architecture. In general, older + Mac hardware will require you to use this package. + + linux-browser-bundle-i386: + + The Tor Browser Bundle package for Linux, 32bit versions. Note that this package is + rather large and needs your email provider to allow for attachments of about 30MB in + size. + + linux-browser-bundle-x86_64: + + The Tor Browser Bundle package for Linux, 64bit versions. Note that this package is + rather large and needs your email provider to allow for attachements of about 30MB + in size. + + source-bundle: + + The Tor source code. Only request this package if you know what you're doing. This + isn't the package to use for a normal user. +""") + GETTOR_TEXT = [ # GETTOR_TEXT[0] _("""Hello, This is the "GetTor" robot.

1 0

[torbutton/master] Update changelog.
by mikeperry＠torproject.org 03 Sep '11

03 Sep '11

commit 0ab1a3abed970100c2b2291abed5473d82047f4e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Sep 3 05:00:56 2011 -0700 Update changelog. --- src/CHANGELOG | 6 ++++++ src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 91411af..51bef80 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,9 @@ +1.4.2 + 3 Sep 2011 + * bug 3879: Fix broken framed sites (yopmail, gmane, gmaps, etc) + * bug 3337: Fetch check.tp.o page to check versions (TBB only) + * Bug 3754: Fix SafeCache OCSP errors (fix for TBB only) + 1.4.1 28 Aug 2011 * bug 523: Implement New Identity (for TBB only) diff --git a/src/install.rdf b/src/install.rdf index 822eb4c..af40be4 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry & Kory Kirk</em:creator> <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id> - <em:version>1.4.1</em:version> + <em:version>1.4.2</em:version> <em:homepageURL>https://www.torproject.org/torbutton/</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

r25005: {website} 0.2.3.3-alpha is up (in website/trunk: . include)
by Roger Dingledine 03 Sep '11

03 Sep '11

Author: arma Date: 2011-09-03 08:44:45 +0000 (Sat, 03 Sep 2011) New Revision: 25005 Modified: website/trunk/Makefile website/trunk/include/versions.wmi Log: 0.2.3.3-alpha is up Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-09-02 11:15:48 UTC (rev 25004) +++ website/trunk/Makefile 2011-09-03 08:44:45 UTC (rev 25005) @@ -12,7 +12,7 @@ export TORGIT=/home/runa/tordev/tor/.git export STABLETAG=tor-0.2.2.32 -export DEVTAG=tor-0.2.3.2-alpha +export DEVTAG=tor-0.2.3.3-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-09-02 11:15:48 UTC (rev 25004) +++ website/trunk/include/versions.wmi 2011-09-03 08:44:45 UTC (rev 25005) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.2.32</define-tag> -<define-tag version-alpha whitespace=delete>0.2.3.2-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.3.3-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.32</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.2.32</define-tag>

1 0

[torbutton/master] Bug #3754: Fix SafeCache OCSP errors (fix for TBB only)
by mikeperry＠torproject.org 03 Sep '11

03 Sep '11

commit 2a7ed84c5f21d601c4ec92acce457322b822bd36 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 2 21:17:29 2011 -0700 Bug #3754: Fix SafeCache OCSP errors (fix for TBB only) We added a new interface in #3666. This fix uses that string interface and falls back to the old interface if it is not available. --- src/chrome/content/stanford-safecache.js | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js index 4dd388d..1da6b02 100644 --- a/src/chrome/content/stanford-safecache.js +++ b/src/chrome/content/stanford-safecache.js @@ -89,11 +89,16 @@ SSC_RequestListener.prototype = }, setCacheKey: function(channel, str) { - var oldData = this.readCacheKey(channel.cacheKey); - var newKey = this.newCacheKey(this.getHash(str) + oldData); - channel.cacheKey = newKey; - SSC_dump("Set cache key to hash(" + str + ") = " + + try { + channel.cacheDomain = str; + SSC_dump("Set cacheDomain to "+str+" for "+channel.URI.spec); + } catch(e) { + var oldData = this.readCacheKey(channel); + var newKey = this.newCacheKey(this.getHash(str) + oldData); + channel.cacheKey = newKey; + SSC_dump("Set cache key to hash(" + str + ") = " + newKey.data + " for " + channel.URI.spec); + } }, onModifyRequest: function(channel) { @@ -136,7 +141,7 @@ SSC_RequestListener.prototype = // Same-origin policy var referrer; if (parent_host && parent_host != channel.URI.host) { - SSC_dump("Segmenting " + channel.URI.host + + SSC_dump("Segmenting " + channel.URI.spec + " content loaded by " + parent_host); this.setCacheKey(channel, parent_host); referrer = parent_host; @@ -154,7 +159,7 @@ SSC_RequestListener.prototype = } catch (e) {} } else { referrer = channel.URI.host; - if(!this.readCacheKey(channel.cacheKey)) { + if(!this.readCacheKey(channel)) { this.setCacheKey(channel, channel.URI.host); } else { SSC_dump("Existing cache key detected; leaving it unchanged."); @@ -300,9 +305,13 @@ SSC_RequestListener.prototype = }, // Read the integer data contained in a cache key - readCacheKey: function(key) { - key.QueryInterface(Components.interfaces.nsISupportsPRUint32); - return key.data; + readCacheKey: function(channel) { + try { + return channel.cacheDomain; + } catch(e) { + channel.cacheKey.QueryInterface(Components.interfaces.nsISupportsPRUint32); + return channel.cacheKey.data; + } }, // Construct a new cache key with some integer data

1 0

[tor/master] bump to 0.2.3.3-alpha-dev
by arma＠torproject.org 02 Sep '11

02 Sep '11

commit 7ca16affb5722561a5d50b1820328d1833a9099e Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 2 07:41:55 2011 -0400 bump to 0.2.3.3-alpha-dev --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index deac774..f3640cb 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.3-alpha) +AM_INIT_AUTOMAKE(tor, 0.2.3.3-alpha-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 0f022e4..137cb67 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.3-alpha" +!define VERSION "0.2.3.3-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index fb1ad90..aed3002 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -234,7 +234,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.3-alpha" +#define VERSION "0.2.3.3-alpha-dev"

1 0

[tor/master] merge in one more
by arma＠torproject.org 02 Sep '11

02 Sep '11

commit 01357d6b163b1823811435871c92d6972b4eb65d Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 2 07:24:25 2011 -0400 merge in one more --- ChangeLog | 5 +++++ changes/bug3898a | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7084a0f..1e0f850 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,11 @@ Changes in version 0.2.3.3-alpha - 2011-09-01 non-errors. Fixes bug 3700; bugfix on 0.2.3.1-alpha. o Minor bugfixes (on 2.2.x and earlier): + - Correct the man page to explain that HashedControlPassword and + CookieAuthentication can both be set, in which case either method + is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, + when we decided to allow these config options to both be set. Issue + raised by bug 3898. - The "--quiet" and "--hush" options now apply not only to Tor's behavior before logs are configured, but also to Tor's behavior in the absense of configured logs. Fixes bug 3550; bugfix on diff --git a/changes/bug3898a b/changes/bug3898a deleted file mode 100644 index d40445e..0000000 --- a/changes/bug3898a +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - Correct the man page to explain that HashedControlPassword and - CookieAuthentication can both be set, in which case either method - is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, - when we decided to allow these config options to both be set. Issue - raised by bug 3898.

1 0

[tor/master] Correct man page: multiple control auth styles can be set at once
by arma＠torproject.org 02 Sep '11

02 Sep '11

commit e0dae64449958f4c80e6da1ee6a336a60ffc21d5 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 2 07:01:55 2011 -0400 Correct man page: multiple control auth styles can be set at once --- changes/bug3898a | 6 ++++++ doc/tor.1.txt | 17 +++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/changes/bug3898a b/changes/bug3898a new file mode 100644 index 0000000..d40445e --- /dev/null +++ b/changes/bug3898a @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Correct the man page to explain that HashedControlPassword and + CookieAuthentication can both be set, in which case either method + is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, + when we decided to allow these config options to both be set. Issue + raised by bug 3898. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index bfc9766..823a6f5 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -148,10 +148,11 @@ Other options can be specified either on the command-line (--option **ControlPort** __PORT__|**auto**:: If set, Tor will accept connections on this port and allow those connections to control the Tor process using the Tor Control Protocol - (described in control-spec.txt). Note: unless you also specify one of - **HashedControlPassword** or **CookieAuthentication**, setting this - option will - cause Tor to allow any process on the local host to control it. This + (described in control-spec.txt). Note: unless you also specify one or + more of **HashedControlPassword** or **CookieAuthentication**, + setting this option will cause Tor to allow any process on the local + host to control it. (Setting both authentication methods means either + method is sufficient to authenticate to Tor.) This option is required for many Tor controllers; most use the value of 9051. Set it to "auto" to have Tor pick a port for you. (Default: 0). @@ -173,15 +174,15 @@ Other options can be specified either on the command-line (--option the control socket readable and writable by the default GID. (Default: 0) **HashedControlPassword** __hashed_password__:: - Don't allow any connections on the control port except when the other - process knows the password whose one-way hash is __hashed_password__. You + Allow connections on the control port if they present + the password whose one-way hash is __hashed_password__. You can compute the hash of a password by running "tor --hash-password __password__". You can provide several acceptable passwords by using more than one HashedControlPassword line. **CookieAuthentication** **0**|**1**:: - If this option is set to 1, don't allow any connections on the control port - except when the connecting process knows the contents of a file named + If this option is set to 1, allow connections on the control port + when the connecting process knows the contents of a file named "control_auth_cookie", which Tor will create in its data directory. This authentication method should only be used on systems with good filesystem security. (Default: 0)

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 02 Sep '11

02 Sep '11

commit fe0fa91164bf1f8f305fc048b472fb6445551533 Merge: f68cd4a e0dae64 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 2 07:23:37 2011 -0400 Merge branch 'maint-0.2.2' changes/bug3898a | 6 ++++++ doc/tor.1.txt | 17 +++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.2.2] Correct man page: multiple control auth styles can be set at once
by arma＠torproject.org 02 Sep '11

02 Sep '11

commit e0dae64449958f4c80e6da1ee6a336a60ffc21d5 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 2 07:01:55 2011 -0400 Correct man page: multiple control auth styles can be set at once --- changes/bug3898a | 6 ++++++ doc/tor.1.txt | 17 +++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/changes/bug3898a b/changes/bug3898a new file mode 100644 index 0000000..d40445e --- /dev/null +++ b/changes/bug3898a @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Correct the man page to explain that HashedControlPassword and + CookieAuthentication can both be set, in which case either method + is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, + when we decided to allow these config options to both be set. Issue + raised by bug 3898. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index bfc9766..823a6f5 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -148,10 +148,11 @@ Other options can be specified either on the command-line (--option **ControlPort** __PORT__|**auto**:: If set, Tor will accept connections on this port and allow those connections to control the Tor process using the Tor Control Protocol - (described in control-spec.txt). Note: unless you also specify one of - **HashedControlPassword** or **CookieAuthentication**, setting this - option will - cause Tor to allow any process on the local host to control it. This + (described in control-spec.txt). Note: unless you also specify one or + more of **HashedControlPassword** or **CookieAuthentication**, + setting this option will cause Tor to allow any process on the local + host to control it. (Setting both authentication methods means either + method is sufficient to authenticate to Tor.) This option is required for many Tor controllers; most use the value of 9051. Set it to "auto" to have Tor pick a port for you. (Default: 0). @@ -173,15 +174,15 @@ Other options can be specified either on the command-line (--option the control socket readable and writable by the default GID. (Default: 0) **HashedControlPassword** __hashed_password__:: - Don't allow any connections on the control port except when the other - process knows the password whose one-way hash is __hashed_password__. You + Allow connections on the control port if they present + the password whose one-way hash is __hashed_password__. You can compute the hash of a password by running "tor --hash-password __password__". You can provide several acceptable passwords by using more than one HashedControlPassword line. **CookieAuthentication** **0**|**1**:: - If this option is set to 1, don't allow any connections on the control port - except when the connecting process knows the contents of a file named + If this option is set to 1, allow connections on the control port + when the connecting process knows the contents of a file named "control_auth_cookie", which Tor will create in its data directory. This authentication method should only be used on systems with good filesystem security. (Default: 0)

1 0