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

[arm/release] fix: cookie size check prevented multi-auth
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit c4e9bb71f2ce0676e2de7fb40184068bd4f5bc6a Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 7 08:42:10 2011 -0800 fix: cookie size check prevented multi-auth When an exception arose in checking the cookie's size we'd always propegate that to the caller. This was a problem with multi-auth because we'd still have an alternative method of authentication to attempt (via the password). --- src/starter.py | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/starter.py b/src/starter.py index 8deb500..3d74315 100644 --- a/src/starter.py +++ b/src/starter.py @@ -212,11 +212,19 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i if TorCtl.TorCtl.AUTH_TYPE.PASSWORD in authTypes: # password authentication, promting for the password if it wasn't provided - if passphrase: authValue = passphrase - else: - try: authValue = getpass.getpass("Controller password: ") + # + # TODO: When handling multi-auth we should try to authenticate via the + # cookie first, then fall back to prompting the user for their password. + # With the stack of fixes and hacks we have here jerry-rigging that in + # without trying cookie auth twice will be a pita so leaving this alone + # for now. Stem will handle most of this transparently, letting us handle + # this much more elegantly. + + if not passphrase: + try: passphrase = getpass.getpass("Controller password: ") except KeyboardInterrupt: return None - elif TorCtl.TorCtl.AUTH_TYPE.COOKIE in authTypes and authValue[0] != "/": + + if TorCtl.TorCtl.AUTH_TYPE.COOKIE in authTypes and authValue[0] != "/": # Connecting to the control port will probably fail if it's using cookie # authentication and the cookie path is relative (unfortunately this is # the case for TBB). This is discussed in: @@ -253,11 +261,20 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i # # https://trac.torproject.org/projects/tor/ticket/4305 - authCookieSize = os.path.getsize(conn._cookiePath) - if authCookieSize != 32: - raise IOError("authentication cookie '%s' is the wrong size (%i bytes instead of 32)" % (conn._cookiePath, authCookieSize)) + try: + authCookieSize = os.path.getsize(conn._cookiePath) + if authCookieSize != 32: + raise IOError("authentication cookie '%s' is the wrong size (%i bytes instead of 32)" % (conn._cookiePath, authCookieSize)) + except Exception, exc: + # if the above fails then either... + # - raise an exception if cookie auth is the only method we have to + # authenticate + # - suppress the exception and try the other connection methods if we + # have alternatives + if len(authTypes) == 1: raise exc + else: conn._authTypes.remove(TorCtl.TorCtl.AUTH_TYPE.COOKIE) - conn.authenticate(authValue) + conn.authenticate(passphrase) return conn except Exception, exc: if conn: conn.close()

1 0

[arm/release] fix: torrc validation case sensetive
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit e7e4bb5a9a39857436620f71edba9092ff963247 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 7 09:17:29 2011 -0800 fix: torrc validation case sensetive The torrc validation is case sensetive using tor's camelcase convention, but tor's torrc parsing is case insensetive. This caused confusing torrc warnings where, for instance, "Exitpolicy" would be reported as both being unused and also missing an "ExitPolicy" option. Reported in... https://trac.torproject.org/projects/tor/ticket/4601 This fix is functional but less than ideal since it makes the case insensetivity non-obvious (we're essentially converting the torrc arguments into the camelcase options we expect). I'll look into doing something nicer while refactoring for stem. Issue was caught on a Tor Cloud instance by kooly --- src/util/torConfig.py | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index e26f634..851ef77 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -531,6 +531,21 @@ def validate(contents = None): if len(lineComp) == 2: option, value = lineComp else: option, value = lineText, "" + # Tor is case insensetive when parsing its torrc. This poses a bit of an + # issue for us because we want all of our checks to be case insensetive + # too but also want messages to match the normal camel-case conventions. + # + # Using the customOptions to account for this. It contains the tor reported + # options (camel case) and is either a matching set or the following defaut + # value check will fail. Hence using that hash to correct the case. + # + # TODO: when refactoring for stem make this less confusing... + + for customOpt in customOptions: + if customOpt.lower() == option.lower(): + option = customOpt + break + # if an aliased option then use its real name if option in CONFIG["torrc.alias"]: option = CONFIG["torrc.alias"][option] @@ -787,7 +802,9 @@ class Torrc(): skipValidation = not CONFIG["features.torrc.validate"] skipValidation |= not torTools.getConn().isVersion("0.2.2.7-alpha") - if skipValidation: returnVal = {} + if skipValidation: + log.log(log.INFO, "Skipping torrc validation (requires tor 0.2.2.7-alpha)") + returnVal = {} else: if self.corrections == None: self.corrections = validate(self.contents)

1 0

[arm/release] fix: forgot multi-auth fix in release notes
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit e3259f65e06b518c83370b5c4f1b532e70db8766 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 7 09:34:34 2011 -0800 fix: forgot multi-auth fix in release notes Support for multiple authentication methods was really a patch for TorCtl, however it's collecting dust there (grrr) so this really became a forking in arm. Hence it should have been in my release notes. Oops. --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index fccf083..dd057b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ Besides the normal bug fixes and minor features, this release introduces the con * fix: appending path prefix to auth cookie path (caught by sid77) * fix: skipping log parsing if misformatted (caught by Sjon) * fix: incorrect armrc path in man page (caught by dererk) + * fix: trying all authentication methods rather than just the first (caught by arma, https://trac.torproject.org/projects/tor/ticket/3958) * fix: toning down the warning when all connection resolvers fail (suggested by Sebastian) * fix: quitting wizard when the user presses 'q' instead of just esc (suggested by monochromec, https://trac.torproject.org/projects/tor/ticket/3995) * fix: quitting could cause unclean curses shutdown

1 0

[arm/release] fix: disabling localization for system commands
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit 31800f4018275d83c2f7db8f725b1fca1ee97360 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 18 14:35:49 2011 -0800 fix: disabling localization for system commands Setting LANG to C to disable localization for subcommands like netstat. This is important since we use words in it (like ESTABLISHED) to filter the results. Caught by Stephan Seitz. --- src/starter.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/starter.py b/src/starter.py index 3d74315..40c23f7 100644 --- a/src/starter.py +++ b/src/starter.py @@ -103,6 +103,11 @@ PRIVATE_TORRC_ENTRIES = ["HashedControlPassword", "Bridge", "HiddenServiceDir"] TOR_ROOT_NOTICE = "Tor is currently running with root permissions. This is not a good idea and shouldn't be necessary. See the 'User UID' option from Tor's man page for an easy method of reducing its permissions after startup." ARM_ROOT_NOTICE = "Arm is currently running with root permissions. This is not a good idea, and will still work perfectly well if it's run with the same user as Tor (ie, starting with \"sudo -u %s arm\")." +# Makes subcommands provide us with English results (this is important so we +# can properly parse it). + +os.putenv("LANG", "C") + def allowConnectionTypes(): """ This provides a tuple with booleans indicating if we should or shouldn't

1 0

[arm/release] fix: buggy path handling when saving snapshots
by atagar＠torproject.org 29 Apr '12

29 Apr '12

commit c40d50313588cc472b426f9b6d4450dbe9d49084 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 7 09:56:23 2011 -0800 fix: buggy path handling when saving snapshots The log snapshot method both didn't expect relative paths and threw unexpected exceptions (OSError rather than IOError) when the mkdir call for our parent directory failed. Caught by Jeff Bonner in... http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646080 --- src/cli/logPanel.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index f39617d..179db9f 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -911,9 +911,15 @@ class LogPanel(panel.Panel, threading.Thread): path - path where to save the log snapshot """ + path = os.path.abspath(path) + # make dir if the path doesn't already exist baseDir = os.path.dirname(path) - if not os.path.exists(baseDir): os.makedirs(baseDir) + + try: + if not os.path.exists(baseDir): os.makedirs(baseDir) + except OSError, exc: + raise IOError("unable to make directory '%s'" % baseDir) snapshotFile = open(path, "w") self.valsLock.acquire()

1 0

r25630: {website} bump version of 64-bit osx tbb (website/trunk/include)
by Erinn Clark 29 Apr '12

29 Apr '12

Author: erinn Date: 2012-04-29 00:16:38 +0000 (Sun, 29 Apr 2012) New Revision: 25630 Modified: website/trunk/include/versions.wmi Log: bump version of 64-bit osx tbb Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-04-28 13:38:52 UTC (rev 25629) +++ website/trunk/include/versions.wmi 2012-04-29 00:16:38 UTC (rev 25630) @@ -49,7 +49,7 @@ <define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.3.12-alpha-2</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-9</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-9</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-9.1</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>12.0</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag>

1 0

[torbrowser/maint-2.2] update osx changelog for 2.2.35-9.1 and add missing changelog entry about 10.5 compatibility to 2.2.35-9
by erinn＠torproject.org 28 Apr '12

28 Apr '12

commit a353d7df08ab399ed10821e5d5ef4e86afd30e55 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 28 18:18:21 2012 -0300 update osx changelog for 2.2.35-9.1 and add missing changelog entry about 10.5 compatibility to 2.2.35-9 --- changelog.osx-2.2 | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 667e890..428307a 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-9.1); suite=osx + + * Fix paths in Vidalia so TorBrowser will launch on the 64-bit version + + -- Erinn Clark <erinn(a)torproject.org> Sat Apr 28 18:14:27 BRT 2012 + Tor Browser Bundle (2.2.35-9); suite=osx * Update Firefox to 12.0 @@ -14,6 +20,7 @@ Tor Browser Bundle (2.2.35-9); suite=osx - Add Steven Michaud's OS X crash fix patch. It doesn't fix #5021 but will hopefully help us debug further. See also: https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35 + * Make the 32-bit Tor Browser Bundle compatible with OS X 10.5 -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:23 BRT 2012

1 0

[torbrowser/maint-2.3] Make sure vidalia gets re-extracted when a patch changed
by erinn＠torproject.org 28 Apr '12

28 Apr '12

commit c909d6c1a5e37885dce44f76fa11c5144974a149 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Apr 28 22:56:30 2012 +0200 Make sure vidalia gets re-extracted when a patch changed This caused an issue with a TBB release, when an older Vidalia was accidentally included. --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index aeebee7..f783ee0 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -184,7 +184,7 @@ $(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) ../src/current-patches/openssl/* cp patch-any-src.sh $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./patch-any-src.sh -$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) | $(BUILD_DIR) +$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) ../src/current-patches/vidalia/*patch | $(BUILD_DIR) rm -rf $(VIDALIA_DIR) cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) -C $(BUILD_DIR)/ ifeq (MacOS,$(PLATFORM))

1 0

[torbrowser/maint-2.3] bump osx tbb to 9.1 for x86_64
by erinn＠torproject.org 28 Apr '12

28 Apr '12

commit 81c57ca46abea01e8209fd51f67c0c1090795293 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 28 18:13:54 2012 -0300 bump osx tbb to 9.1 for x86_64 --- build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index bbefe9a..9faadad 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -14,8 +14,8 @@ ## Architecture -ARCH_TYPE=i386 -BUILD_NUM=9 +ARCH_TYPE=x86_64 +BUILD_NUM=9.1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options

1 0

[torbrowser/master] Make sure vidalia gets re-extracted when a patch changed
by erinn＠torproject.org 28 Apr '12

28 Apr '12

commit c909d6c1a5e37885dce44f76fa11c5144974a149 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Apr 28 22:56:30 2012 +0200 Make sure vidalia gets re-extracted when a patch changed This caused an issue with a TBB release, when an older Vidalia was accidentally included. --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index aeebee7..f783ee0 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -184,7 +184,7 @@ $(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) ../src/current-patches/openssl/* cp patch-any-src.sh $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./patch-any-src.sh -$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) | $(BUILD_DIR) +$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) ../src/current-patches/vidalia/*patch | $(BUILD_DIR) rm -rf $(VIDALIA_DIR) cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) -C $(BUILD_DIR)/ ifeq (MacOS,$(PLATFORM))

1 0