December 2011 - tor-commits - lists.torproject.org

[tor/master] Remove 4312 from the changelog.
by nickm＠torproject.org 08 Dec '11

08 Dec '11

commit 00fae9a500475d7ebf1dd0f56c7fc78e2567c818 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 21:10:32 2011 -0500 Remove 4312 from the changelog. --- ChangeLog | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a7d50a..ba0ae18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.3.9-alpha - 2011-1?-?? +Changes in version 0.2.3.9-alpha - 2011-12-?? o Major features: - When using OpenSSL 1.0.0 or later, use OpenSSL's counter mode implementation. It makes AES_CTR about 7% faster than our old one @@ -9,15 +9,8 @@ Changes in version 0.2.3.9-alpha - 2011-1?-?? censorship by allowing bridges to use protocol obfuscation plugins. It implements the 'managed proxy' part of proposal 180. Implements ticket 3472. - - Block excess renegotiations even if they are RFC5746 compliant. - This security fix mitigates potential SSL Denial of Service attacks - that use SSL renegotiation as a way of forcing the server to perform - unneeded computationally expensive SSL handshakes. Implements - ticket 4312. o Major bugfixes: - - Teach Tor how to notice excess renegotiation attempts before it - receives the first data SSL record. Fixes part of ticket 4312. - Only use the EVP interface when AES acceleration is enabled, to avoid a 5-7% performance regression. Resolves issue 4525; bugfix on 0.2.3.8-alpha.

1 0

[tor/master] clarify a debug line
by arma＠torproject.org 07 Dec '11

07 Dec '11

commit 299034edf5e05c81d535fc7d0b2120b6a2810477 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Dec 7 18:12:11 2011 -0500 clarify a debug line --- src/or/circuitbuild.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 7934a2e..a9e5d22 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2524,7 +2524,8 @@ onionskin_answer(or_circuit_t *circ, uint8_t cell_type, const char *payload, append_cell_to_circuit_queue(TO_CIRCUIT(circ), circ->p_conn, &cell, CELL_DIRECTION_IN, 0); - log_debug(LD_CIRC,"Finished sending 'created' cell."); + log_debug(LD_CIRC,"Finished sending '%s' cell.", + circ->is_first_hop ? "created_fast" : "created"); if (!is_local_addr(&circ->p_conn->_base.addr) && !connection_or_nonopen_was_started_here(circ->p_conn)) {

1 0

[torbutton/master] Bug 4517: Disable external drag and drop.
by mikeperry＠torproject.org 07 Dec '11

07 Dec '11

commit adc40a1d2c0d8be8b4e082fecc22722372b7a0cb Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Dec 6 14:29:49 2011 -0800 Bug 4517: Disable external drag and drop. We basically remove all the url-containing drag and drop mime-types from the drag action. This seems to still allow you to drag stuff within TBB (because it uses its own internal secret types), but prevents dragging to outside apps. --- src/chrome.manifest | 1 + src/components/external-app-blocker.js | 103 +++++++++++++++++++++++++++++++- src/install.rdf | 2 +- 3 files changed, 102 insertions(+), 4 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index cda8bb9..2172815 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -132,6 +132,7 @@ component {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} components/external-app-blocker contract @mozilla.org/mime;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} contract @mozilla.org/uriloader/external-protocol-service;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} contract @mozilla.org/uriloader/external-helper-app-service;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} +contract @mozilla.org/widget/dragservice;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} component {aef08952-b003-4697-b935-a392367e214f} components/tbSessionStore.js contract @torproject.org/torbutton-ss-blocker;1 {aef08952-b003-4697-b935-a392367e214f} diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index a83f50c..7b68a21 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -11,16 +11,21 @@ const kMODULE_CONTRACTID_APP = "@mozilla.org/uriloader/external-helper-app-servi const kMODULE_CONTRACTID_PROTO = "@mozilla.org/uriloader/external-protocol-service;1"; const kMODULE_CONTRACTID_MIME = "@mozilla.org/mime;1"; +const kMODULE_CONTRACTID_DRAG = "@mozilla.org/widget/dragservice;1"; + + const kMODULE_CID = Components.ID("3da0269f-fc29-4e9e-a678-c3b1cafcf13f"); /* Mozilla defined interfaces for FF3.0 */ const kREAL_EXTERNAL_CID = "{A7F800E0-4306-11d4-98D0-001083010E9B}"; - const kExternalInterfaces = ["nsIObserver", "nsIMIMEService", "nsIExternalHelperAppService", "nsISupportsWeakReference", // XXX: Uh-oh... "nsIExternalProtocolService", "nsPIExternalAppLauncher"]; + +const kREAL_DRAG_CID = "{8b5314bb-db01-11d2-96ce-0060b0fb9956}"; +const kDragInterfaces = ["nsIDragService"]; const Cr = Components.results; const Cc = Components.classes; @@ -38,6 +43,7 @@ function ExternalWrapper() { this.logger.log(3, "Component Load 0: New ExternalWrapper."); this._real_external = Components.classesByID[kREAL_EXTERNAL_CID]; + this._real_drag = Components.classesByID[kREAL_DRAG_CID]; this._interfaces = kExternalInterfaces; this._prefs = Components.classes["@mozilla.org/preferences-service;1"] @@ -52,6 +58,15 @@ function ExternalWrapper() { }; this.copyMethods(this._external()); + + this._drag = function() { + var drag = this._real_drag.getService(); + for (var i = 0; i < kDragInterfaces.length; i++) { + drag.QueryInterface(Components.interfaces[kDragInterfaces]); + } + return drag; + }; + this.copyMethods(this._drag()); } ExternalWrapper.prototype = @@ -62,8 +77,13 @@ ExternalWrapper.prototype = return this; } - var external = this._external().QueryInterface(iid); - this.copyMethods(external); + try { + var external = this._external().QueryInterface(iid); + this.copyMethods(external); + } catch(e) { + var drag = this._drag().QueryInterface(iid); + this.copyMethods(drag); + } return this; }, @@ -83,6 +103,10 @@ ExternalWrapper.prototype = interfaceList.push(Components.interfaces[this._interfaces[i]]); } + for (var i = 0; i < kDragInterfaces.length; i++) { + interfaceList.push(Components.interfaces[kDragInterfaces[i]]); + } + count.value = interfaceList.length; return interfaceList; }, @@ -199,6 +223,71 @@ ExternalWrapper.prototype = return this._external().doContent(aMimeContentType, aRequest, aWindowContext, aForceSave); }, + // from nsIDragService + invokeDragSessionWithImage: function(aDOMNode, aTransferableArray, aRegion, aActionType, aImage, aImageX, aImageY, aDragEvent, aDataTransfer) { + aActionType = 0; + + for(var i = 0; i < aTransferableArray.Count(); i++) { + this.logger.log(3, "Inspecting drag+drop transfer: "+i); + var tr = aTransferableArray.GetElementAt(i); + tr.QueryInterface(Ci.nsITransferable); + + var flavors = tr.flavorsTransferableCanExport() + .QueryInterface(Ci.nsISupportsArray); + + for (var f=0; f < flavors.Count(); f++) { + var flavor =flavors.GetElementAt(f); + flavor.QueryInterface(Ci.nsISupportsCString); + + this.logger.log(3, "Got drag+drop flavor: "+flavor); + if (flavor == "text/x-moz-url" || + flavor == "text/x-moz-url-data" || + flavor == "text/uri-list" || + flavor == "application/x-moz-file-promise-url") { + this.logger.log(3, "Removing "+flavor); + try { tr.removeDataFlavor(flavor); } catch(e) {} + continue; + } + + /* + var data = {}, len = {}; + try { + tr.getTransferData(flavor, data, len); + this.logger.log(3, "Got data: "+data.value.QueryInterface(Ci.nsISupportsString).data); + } catch(e) { + } + */ + } + } + + return this._drag().invokeDragSessionWithImage(aDOMNode, aTransferableArray, aRegion, aActionType, aImage, aImageX, aImageY, aDragEvent, aDataTransfer); + }, + /* + fireDragEventAtSource: function( aMsg ) { + this.logger.log(4, "FIRE AT THE SOURCE!!!"); + return this._drag().fireDragEventAtSource(aMsg); + }, + + invokeDragSession: function(aDOMNode, aTransferables, aRegion, aActionType ) { + this.logger.log(4, "InvokeDragSession!"); + return this._drag().invokeDragSession(aDOMNode, aTransferables, aRegion, aActionType ); + }, + invokeDragSessionWithSelection: function(aSelection, aTransferableArray, aActionType, aDragEvent, aDataTransfer) { + this.logger.log(4, "InvokeDragSessionWithSelection!!"); + return this._drag().invokeDragSessionWithSelection(aSelection, aTransferableArray, aActionType, aDragEvent, aDataTransfer); + }, + + endDragSession: function(aDoneDrag) { + this.logger.log(4, "EndDrag"); + return this._drag().endDragSession(aDoneDrag); + }, + + startDragSesssion: function() { + this.logger.log(4, "StartDrag"); + return this._drag().startDragSession(); + } + */ + }; var ExternalWrapperSingleton = null; @@ -250,6 +339,14 @@ function (compMgr, fileSpec, location, type) { fileSpec, location, type); + + compMgr.registerFactoryLocation(kMODULE_CID, + kMODULE_NAME, + kMODULE_CONTRACTID_DRAG, + fileSpec, + location, + type); + }; ExternalWrapperModule.getClassObject = function (compMgr, cid, iid) diff --git a/src/install.rdf b/src/install.rdf index 3a95f96..34e433c 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.4.1</em:version> + <em:version>1.4.5pre</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

[torbutton/master] Remove some commented logging statements.
by mikeperry＠torproject.org 07 Dec '11

07 Dec '11

commit 6d929eaab9347152e440908441ed06628de13f85 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Dec 7 14:31:04 2011 -0800 Remove some commented logging statements. Want to keep them in the git history, though. --- src/components/external-app-blocker.js | 35 -------------------------------- 1 files changed, 0 insertions(+), 35 deletions(-) diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index 7b68a21..ff81cad 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -246,47 +246,12 @@ ExternalWrapper.prototype = flavor == "application/x-moz-file-promise-url") { this.logger.log(3, "Removing "+flavor); try { tr.removeDataFlavor(flavor); } catch(e) {} - continue; } - - /* - var data = {}, len = {}; - try { - tr.getTransferData(flavor, data, len); - this.logger.log(3, "Got data: "+data.value.QueryInterface(Ci.nsISupportsString).data); - } catch(e) { - } - */ } } return this._drag().invokeDragSessionWithImage(aDOMNode, aTransferableArray, aRegion, aActionType, aImage, aImageX, aImageY, aDragEvent, aDataTransfer); }, - /* - fireDragEventAtSource: function( aMsg ) { - this.logger.log(4, "FIRE AT THE SOURCE!!!"); - return this._drag().fireDragEventAtSource(aMsg); - }, - - invokeDragSession: function(aDOMNode, aTransferables, aRegion, aActionType ) { - this.logger.log(4, "InvokeDragSession!"); - return this._drag().invokeDragSession(aDOMNode, aTransferables, aRegion, aActionType ); - }, - invokeDragSessionWithSelection: function(aSelection, aTransferableArray, aActionType, aDragEvent, aDataTransfer) { - this.logger.log(4, "InvokeDragSessionWithSelection!!"); - return this._drag().invokeDragSessionWithSelection(aSelection, aTransferableArray, aActionType, aDragEvent, aDataTransfer); - }, - - endDragSession: function(aDoneDrag) { - this.logger.log(4, "EndDrag"); - return this._drag().endDragSession(aDoneDrag); - }, - - startDragSesssion: function() { - this.logger.log(4, "StartDrag"); - return this._drag().startDragSession(); - } - */ };

1 0

[arm/master] fix: buggy path handling when saving snapshots
by atagar＠torproject.org 07 Dec '11

07 Dec '11

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

[arm/master] fix: forgot multi-auth fix in release notes
by atagar＠torproject.org 07 Dec '11

07 Dec '11

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/master] fix: cookie size check prevented multi-auth
by atagar＠torproject.org 07 Dec '11

07 Dec '11

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/master] fix: torrc validation case sensetive
by atagar＠torproject.org 07 Dec '11

07 Dec '11

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/master] Ignoring default deb Log config option
by atagar＠torproject.org 07 Dec '11

07 Dec '11

commit 13b9ffe93748f4af0cd886ba330a256e07de2b2f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 7 07:36:19 2011 -0800 Ignoring default deb Log config option Tor debs have their default logging configuration changed via a patch, as per... https://trac.torproject.org/projects/tor/ticket/4602 Dropping this option when querying for the custom options the user has set to avoid giving a torrc validation error. This introduces a minor bug because if the user has this exact entry with a non-deb install, or the normal default log entry with a deb install, then arm will report that the entry matches the default. However, that would be a rare situation and this whole thing is a workaround for a tor bug so I'm fine with leaving it alone for now. Fixing that would need some method for checking if the instance we're connecting to was deb installed or not (I'm not sure how we'd do that). Issue was caught on a Tor Cloud image by koolfy --- src/util/torConfig.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 477ad9e..e26f634 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -395,10 +395,17 @@ def getCustomOptions(includeValue = False): # from Tor's defaults with the exception of its Log and Nickname entries # which, even if undefined, returns "Log notice stdout" as per: # https://trac.torproject.org/projects/tor/ticket/2362 + # + # If this is from the deb then it will be "Log notice file /var/log/tor/log" + # due to special patching applied to it, as per: + # https://trac.torproject.org/projects/tor/ticket/4602 try: configLines.remove("Log notice stdout") except ValueError: pass + try: configLines.remove("Log notice file /var/log/tor/log") + except ValueError: pass + try: configLines.remove("Nickname %s" % socket.gethostname()) except ValueError: pass

1 0

[tor/master] Add changes file for feature2553
by arma＠torproject.org 07 Dec '11

07 Dec '11

commit b5a21d79d81efeee69e71df23ee4f4983571bcea Author: Robert Ransom <rransom(a)ceres.local> Date: Wed Dec 7 04:44:13 2011 -0800 Add changes file for feature2553 --- changes/feature2553 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/feature2553 b/changes/feature2553 new file mode 100644 index 0000000..6722fc9 --- /dev/null +++ b/changes/feature2553 @@ -0,0 +1,9 @@ + o Major features: + - Add a 'tor2web mode' for clients which want to connect to hidden + services non-anonymously (and possibly more quickly). As a + safety measure to try to keep users from turning this on without + knowing what they are doing, tor2web mode must be explicitly + enabled at compile time, and a copy of Tor compiled to run in + tor2web mode cannot be used as a normal Tor client. Implements + feature 2553. +

1 0