- tor-commits - lists.torproject.org

[flashproxy/master] Use our own RTMFP server instead of Adobe's.
by dcf＠torproject.org 17 Jun '11

17 Jun '11

commit 750a8faf9db4e19c45fb2a9962789114279ea322 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 17 01:20:30 2011 -0700 Use our own RTMFP server instead of Adobe's. The free Cumulus server works as a replacement for the Adobe RTMFP rendezvous server at rtmfp://p2p.rtmfp.net. By running this on the facilitator we cut out Adobe and reduce the number of trusted parties by one. The facilitator gains some information it didn't have before: though RTMFP data goes directly between endpoints, the RTMFP server seems to get periodic heartbeat messages while the connection is ongoing. --- README | 6 +++--- swfcat.as | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index ccde8b9..a086aa6 100644 --- a/README +++ b/README @@ -17,7 +17,7 @@ There are five main parts. Our terminology for each part is in quotes. must also serve a Flash crossdomain policy. A proxy is capable of connecting to a client in two ways: Using a normal -TCP connection, or over Adobe RTMFP, which involves a third party but is +TCP connection; or over RTMFP, which requires Flash on the client but is capable of traversing NAT. == Demonstration page @@ -58,8 +58,8 @@ which facilitator to use, for example There are two ways in which the client can receive connections: over TCP or RTMFP. TCP doesn't send traffic to anyone other than the facilitator and the proxy, but it only works if you have a public IP address. RTMFP -coordinates connections using a server controlled by Adobe, but works -when the client is behind a NAT. +coordinates connections using another server (which may be the same as +the facilitator) and works when the client is behind a NAT. To connect with TCP, run ./connector.py -f <facilitator-ip> diff --git a/swfcat.as b/swfcat.as index 67d60a0..dda7a1a 100644 --- a/swfcat.as +++ b/swfcat.as @@ -21,7 +21,7 @@ package /* Adobe's Cirrus server for RTMFP connections. The Cirrus key is defined at compile time by reading from the CIRRUS_KEY environment var. */ - private const CIRRUS_URL:String = "rtmfp://p2p.rtmfp.net"; + private const CIRRUS_URL:String = "rtmfp://tor-facilitator.bamsoftware.com"; private const CIRRUS_KEY:String = RTMFP::CIRRUS_KEY; private const DEFAULT_FACILITATOR_ADDR:Object = {

1 0

[flashproxy/master] Rename CIRRUS_URL to RTMFP_URL.
by dcf＠torproject.org 17 Jun '11

17 Jun '11

commit d43f6e332c184b12d90afef9d737f696e1b26244 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 17 01:29:10 2011 -0700 Rename CIRRUS_URL to RTMFP_URL. --- swfcat.as | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/swfcat.as b/swfcat.as index 4d69449..38ed1ab 100644 --- a/swfcat.as +++ b/swfcat.as @@ -18,7 +18,7 @@ package public class swfcat extends Sprite { - private const CIRRUS_URL:String = "rtmfp://tor-facilitator.bamsoftware.com"; + private const RTMFP_URL:String = "rtmfp://tor-facilitator.bamsoftware.com"; private const DEFAULT_FACILITATOR_ADDR:Object = { host: "tor-facilitator.bamsoftware.com", @@ -197,7 +197,7 @@ package { var rs:RTMFPSocket; - rs = new RTMFPSocket(CIRRUS_URL); + rs = new RTMFPSocket(RTMFP_URL); rs.addEventListener(Event.COMPLETE, function (e:Event):void { puts("Got RTMFP id " + rs.id); register(rs); @@ -282,7 +282,7 @@ package } if (client_spec.match(/^[0-9A-Fa-f]{64}$/)) { - s_c = new RTMFPSocket(CIRRUS_URL); + s_c = new RTMFPSocket(RTMFP_URL); s_r = new Socket(); proxy_pair = new ProxyPair(this, s_c, function ():void { s_c.connect(client_spec);

1 0

[flashproxy/master] Remove CIRRUS_KEY.
by dcf＠torproject.org 17 Jun '11

17 Jun '11

commit a9bec460af27f75182b63770997df4f68ad84c57 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 17 01:25:55 2011 -0700 Remove CIRRUS_KEY. The Cumulus server doesn't need a development key. --- Makefile | 2 +- README | 4 ---- RTMFPSocket.as | 2 +- swfcat.as | 8 ++------ 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 6c11397..ed799c6 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ all: $(TARGETS) swfcat.swf: *.as badge.png %.swf: %.as - $(MXMLC) -output $@ -static-link-runtime-shared-libraries -define=RTMFP::CIRRUS_KEY,\"$(CIRRUS_KEY)\" $< + $(MXMLC) -output $@ -static-link-runtime-shared-libraries $< clean: rm -f $(TARGETS) diff --git a/README b/README index a086aa6..773d3cb 100644 --- a/README +++ b/README @@ -32,10 +32,6 @@ Download the (free software) Flex SDK. http://opensource.adobe.com/wiki/display/flexsdk/Flex+SDK Put its bin directory in your PATH. The important executable is mxmlc. -For RTMFP support, you need a Cirrus developer key from Adobe. Put it in -the environment variable CIRRUS_KEY so it can be found by Makefile. - $ export CIRRUS_KEY=XXXXXXXXXXXXXXXXXXXXXXXX-YYYYYYYYYYYY - To build, run $ make Copy the resulting swfcat.swf file to a web server. diff --git a/RTMFPSocket.as b/RTMFPSocket.as index e23c4fd..49c297b 100644 --- a/RTMFPSocket.as +++ b/RTMFPSocket.as @@ -50,7 +50,7 @@ package private var cirrus_url:String; private var cirrus_key:String; - public function RTMFPSocket(cirrus_url:String, cirrus_key:String) + public function RTMFPSocket(cirrus_url:String, cirrus_key:String = "") { connected = false; diff --git a/swfcat.as b/swfcat.as index dda7a1a..4d69449 100644 --- a/swfcat.as +++ b/swfcat.as @@ -18,11 +18,7 @@ package public class swfcat extends Sprite { - /* Adobe's Cirrus server for RTMFP connections. - The Cirrus key is defined at compile time by - reading from the CIRRUS_KEY environment var. */ private const CIRRUS_URL:String = "rtmfp://tor-facilitator.bamsoftware.com"; - private const CIRRUS_KEY:String = RTMFP::CIRRUS_KEY; private const DEFAULT_FACILITATOR_ADDR:Object = { host: "tor-facilitator.bamsoftware.com", @@ -201,7 +197,7 @@ package { var rs:RTMFPSocket; - rs = new RTMFPSocket(CIRRUS_URL, CIRRUS_KEY); + rs = new RTMFPSocket(CIRRUS_URL); rs.addEventListener(Event.COMPLETE, function (e:Event):void { puts("Got RTMFP id " + rs.id); register(rs); @@ -286,7 +282,7 @@ package } if (client_spec.match(/^[0-9A-Fa-f]{64}$/)) { - s_c = new RTMFPSocket(CIRRUS_URL, CIRRUS_KEY); + s_c = new RTMFPSocket(CIRRUS_URL); s_r = new Socket(); proxy_pair = new ProxyPair(this, s_c, function ():void { s_c.connect(client_spec);

1 0

[tor/maint-0.2.2] log when we finish ssl handshake and move to renegotiation
by arma＠torproject.org 17 Jun '11

17 Jun '11

commit 64bfbcb918a59edf8e7167954171f311d032fc4b Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jun 17 03:31:59 2011 -0400 log when we finish ssl handshake and move to renegotiation debug-level since it will be quite common. logged at both client and server side. this step should help us track what's going on with people filtering tor connections by our ssl habits. --- src/or/connection_or.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index ed174c9..c019f65 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -929,13 +929,16 @@ connection_tls_continue_handshake(or_connection_t *conn) if (! tor_tls_used_v1_handshake(conn->tls)) { if (!tor_tls_is_server(conn->tls)) { if (conn->_base.state == OR_CONN_STATE_TLS_HANDSHAKING) { - // log_notice(LD_OR,"Done. state was TLS_HANDSHAKING."); + log_debug(LD_OR, "Done with initial SSL handshake (client-side). " + "Requesting renegotiation."); conn->_base.state = OR_CONN_STATE_TLS_CLIENT_RENEGOTIATING; goto again; } // log_notice(LD_OR,"Done. state was %d.", conn->_base.state); } else { /* improved handshake, but not a client. */ + log_debug(LD_OR, "Done with initial SSL handshake (server-side). " + "Expecting renegotiation."); tor_tls_set_renegotiate_callback(conn->tls, connection_or_tls_renegotiated_cb, conn);

1 0

[arm/master] Dropping remaining addfstr usage
by atagar＠torproject.org 17 Jun '11

17 Jun '11

commit 6144d50da64fe94bf8ab30c30f5044453cefde01 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 16 10:11:50 2011 -0700 Dropping remaining addfstr usage Long ago, in the dawn of arm, I added a helper function "addfstr" that allowed for adding strings with formatting tags similar to html. All usage of it with arbitrary input was dropped due to the possability of tag injection screwing up the display, and this change drops its last remaining usage. This hurts the code's readability a bit and at I'd like to figure out a nicer, general purpose pattern for multi-format line rendering but tags aren't the solution. Back to the drawing board... This leaves the panel utility for now. --- src/cli/graphing/bandwidthStats.py | 8 +++- src/cli/headerPanel.py | 79 +++++++++++++++++++++++------------- 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index 4e033f6..b92a58c 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -4,6 +4,7 @@ stats if they're set. """ import time +import curses from cli.graphing import graphPanel from util import log, sysTools, torTools, uiTools @@ -254,7 +255,9 @@ class BandwidthStats(graphPanel.GraphStats): # failed to be queried status, hibernateColor = "unknown", "red" - panel.addfstr(labelingLine + 2, 0, "Accounting (<%s>%s</%s>)" % (hibernateColor, status, hibernateColor)) + panel.addstr(labelingLine + 2, 0, "Accounting (", curses.A_BOLD) + panel.addstr(labelingLine + 2, 12, status, curses.A_BOLD | uiTools.getColor(hibernateColor)) + panel.addstr(labelingLine + 2, 12 + len(status), ")", curses.A_BOLD) resetTime = self.accountingInfo["resetTime"] if not resetTime: resetTime = "unknown" @@ -268,7 +271,8 @@ class BandwidthStats(graphPanel.GraphStats): if used and total: panel.addstr(labelingLine + 3, 37, "%s / %s" % (used, total), uiTools.getColor(self.getColor(False))) else: - panel.addfstr(labelingLine + 2, 0, "Accounting: Connection Closed...") + panel.addstr(labelingLine + 2, 0, "Accounting:", curses.A_BOLD) + panel.addstr(labelingLine + 2, 12, "Connection Closed...") def getTitle(self, width): stats = list(self._titleStats) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 93930b1..d367b98 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -161,39 +161,44 @@ class HeaderPanel(panel.Panel, threading.Thread): if 7 + len(self.vals["tor/version"]) + len(self.vals["tor/versionStatus"]) <= contentSpace: versionColor = VERSION_STATUS_COLORS[self.vals["tor/versionStatus"]] if \ self.vals["tor/versionStatus"] in VERSION_STATUS_COLORS else "white" - versionStatusMsg = "<%s>%s</%s>" % (versionColor, self.vals["tor/versionStatus"], versionColor) - self.addfstr(0, 43, "Tor %s (%s)" % (self.vals["tor/version"], versionStatusMsg)) + labelPrefix = "Tor %s (" % self.vals["tor/version"] + self.addstr(0, 43, labelPrefix) + self.addstr(0, 43 + len(labelPrefix), self.vals["tor/versionStatus"], uiTools.getColor(versionColor)) + self.addstr(0, 43 + len(labelPrefix) + len(self.vals["tor/versionStatus"]), ")") elif 11 <= contentSpace: self.addstr(0, 43, uiTools.cropStr("Tor %s" % self.vals["tor/version"], contentSpace, 4)) # Line 2 / Line 2 Left (tor ip/port information) + x = 0 if self.vals["tor/orPort"]: myAddress = "Unknown" if self.vals["tor/orListenAddr"]: myAddress = self.vals["tor/orListenAddr"] elif self.vals["tor/address"]: myAddress = self.vals["tor/address"] # acting as a relay (we can assume certain parameters are set - entry = "" dirPortLabel = ", Dir Port: %s" % self.vals["tor/dirPort"] if self.vals["tor/dirPort"] != "0" else "" for label in (self.vals["tor/nickname"], " - " + myAddress, ":" + self.vals["tor/orPort"], dirPortLabel): - if len(entry) + len(label) <= leftWidth: entry += label + if x + len(label) <= leftWidth: + self.addstr(1, x, label) + x += len(label) else: break else: # non-relay (client only) # TODO: not sure what sort of stats to provide... - entry = "<red>Relaying Disabled</red>" + self.addstr(1, x, "Relaying Disabled", curses.A_BOLD | uiTools.getColor("red")) + x += 17 if self.vals["tor/isAuthPassword"]: authType = "password" elif self.vals["tor/isAuthCookie"]: authType = "cookie" else: authType = "open" - if len(entry) + 19 + len(self.vals["tor/controlPort"]) + len(authType) <= leftWidth: + if x + 19 + len(self.vals["tor/controlPort"]) + len(authType) <= leftWidth: authColor = "red" if authType == "open" else "green" - authLabel = "<%s>%s</%s>" % (authColor, authType, authColor) - self.addfstr(1, 0, "%s, Control Port (%s): %s" % (entry, authLabel, self.vals["tor/controlPort"])) - elif len(entry) + 16 + len(self.vals["tor/controlPort"]) <= leftWidth: - self.addstr(1, 0, "%s, Control Port: %s" % (entry, self.vals["tor/controlPort"])) - else: self.addstr(1, 0, entry) + self.addstr(1, x, ", Control Port (") + self.addstr(1, x + 16, authType, uiTools.getColor(authColor)) + self.addstr(1, x + 16 + len(authType), "): %s" % self.vals["tor/controlPort"]) + elif x + 16 + len(self.vals["tor/controlPort"]) <= leftWidth: + self.addstr(1, 0, ", Control Port: %s" % self.vals["tor/controlPort"]) # Line 3 / Line 1 Right (system usage info) y, x = (0, leftWidth) if isWide else (2, 0) @@ -250,20 +255,29 @@ class HeaderPanel(panel.Panel, threading.Thread): # Line 5 / Line 3 Left (flags) if self._isTorConnected: - flagLine = "flags: " - for flag in self.vals["tor/flags"]: - flagColor = FLAG_COLORS[flag] if flag in FLAG_COLORS.keys() else "white" - flagLine += "<%s>%s</%s>, " % (flagColor, flag, flagColor) + y, x = (2 if isWide else 4, 0) + self.addstr(y, x, "flags: ") + x += 7 - if len(self.vals["tor/flags"]) > 0: flagLine = flagLine[:-2] - else: flagLine += "<cyan>none</cyan>" - - self.addfstr(2 if isWide else 4, 0, flagLine) + if len(self.vals["tor/flags"]) > 0: + for i in range(len(self.vals["tor/flags"])): + flag = self.vals["tor/flags"][i] + flagColor = FLAG_COLORS[flag] if flag in FLAG_COLORS.keys() else "white" + + self.addstr(y, x, flag, curses.A_BOLD | uiTools.getColor(flagColor)) + x += len(flag) + + if i < len(self.vals["tor/flags"]) - 1: + self.addstr(y, x, ", ") + x += 2 + else: + self.addstr(y, x, "none", curses.A_BOLD | uiTools.getColor("cyan")) else: + y = 2 if isWide else 4 statusTime = torTools.getConn().getStatus()[1] statusTimeLabel = time.strftime("%H:%M %m/%d/%Y", time.localtime(statusTime)) - msg = "<red>Tor Disconnected</red> (%s) - press r to reconnect" % statusTimeLabel - self.addfstr(2 if isWide else 4, 0, msg) + self.addstr(y, 0, "Tor Disconnected", curses.A_BOLD | uiTools.getColor("red")) + self.addstr(y, 16, " (%s) - press r to reconnect" % statusTimeLabel) # Undisplayed / Line 3 Right (exit policy) if isWide: @@ -273,18 +287,27 @@ class HeaderPanel(panel.Panel, threading.Thread): if exitPolicy == "": exitPolicy = "<default>" elif not exitPolicy.endswith((" *:*", " *")): exitPolicy += ", <default>" + self.addstr(2, leftWidth, "exit policy: ") + x = leftWidth + 13 + # color codes accepts to be green, rejects to be red, and default marker to be cyan isSimple = len(exitPolicy) > rightWidth - 13 policies = exitPolicy.split(", ") for i in range(len(policies)): policy = policies[i].strip() - displayedPolicy = policy.replace("accept", "").replace("reject", "").strip() if isSimple else policy - if policy.startswith("accept"): policy = "<green>%s</green>" % displayedPolicy - elif policy.startswith("reject"): policy = "<red>%s</red>" % displayedPolicy - elif policy.startswith("<default>"): policy = "<cyan>%s</cyan>" % displayedPolicy - policies[i] = policy - - self.addfstr(2, leftWidth, "exit policy: %s" % ", ".join(policies)) + policyLabel = policy.replace("accept", "").replace("reject", "").strip() if isSimple else policy + + policyColor = "white" + if policy.startswith("accept"): policyColor = "green" + elif policy.startswith("reject"): policyColor = "red" + elif policy.startswith("<default>"): policyColor = "cyan" + + self.addstr(2, x, policyLabel, curses.A_BOLD | uiTools.getColor(policyColor)) + x += len(policyLabel) + + if i < len(policies) - 1: + self.addstr(2, x, ", ") + x += 2 else: # Client only # TODO: not sure what information to provide here...

1 0

[arm/master] Adding a "New Identity" option
by atagar＠torproject.org 17 Jun '11

17 Jun '11

commit 1a31910080c81f01bf07aeccbaed8ff3d861ec49 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 16 20:53:45 2011 -0700 Adding a "New Identity" option Providing an option for sending newnym signals to tor. This is both provided via a menu option and a 'n' hotkey. There's also an indicator in the header panel if we're both on a wide screen and running as a non-relay. This was requested on 'https://trac.torproject.org/projects/tor/ticket/3394'. --- src/cli/headerPanel.py | 30 ++++++++++++++++++++++++++---- src/cli/menu/actions.py | 3 +++ src/util/torTools.py | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 4 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index d367b98..b5b3826 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -113,10 +113,24 @@ class HeaderPanel(panel.Panel, threading.Thread): if self.vals["tor/orPort"]: return 4 if isWide else 6 else: return 3 if isWide else 4 + def sendNewnym(self): + """ + Requests a new identity and provides a visual queue. + """ + + torTools.getConn().sendNewnym() + + # If we're wide then the newnym label in this panel will give an + # indication that the signal was sent. Otherwise use a msg. + isWide = self.getParent().getmaxyx()[1] >= MIN_DUAL_COL_WIDTH + if not isWide: cli.popups.showMsg("Requesting a new identity", 1) + def handleKey(self, key): isKeystrokeConsumed = True - if key in (ord('r'), ord('R')) and not self._isTorConnected: + if key in (ord('n'), ord('N')) and torTools.getConn().isNewnymAvailable(): + self.sendNewnym() + elif key in (ord('r'), ord('R')) and not self._isTorConnected: try: ctlAddr, ctlPort = self._config["startup.interface.ipAddress"], self._config["startup.interface.port"] tmpConn, authType, authValue = TorCtl.TorCtl.connectionComp(ctlAddr, ctlPort) @@ -309,9 +323,17 @@ class HeaderPanel(panel.Panel, threading.Thread): self.addstr(2, x, ", ") x += 2 else: - # Client only - # TODO: not sure what information to provide here... - pass + # (Client only) Undisplayed / Line 2 Right (new identity option) + if isWide: + conn = torTools.getConn() + newnymWait = conn.getNewnymWait() + + msg = "press 'n' for a new identity" + if newnymWait > 0: + pluralLabel = "s" if newnymWait > 1 else "" + msg = "building circuits, available again in %i second%s" % (newnymWait, pluralLabel) + + self.addstr(1, leftWidth, msg) self.valsLock.release() diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index b8b59e1..c571bd8 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -42,14 +42,17 @@ def makeActionsMenu(): """ Submenu consisting of... Close Menu + New Identity Pause / Unpause Reset Tor Exit """ control = cli.controller.getController() + headerPanel = control.getPanel("header") actionsMenu = cli.menu.item.Submenu("Actions") actionsMenu.add(cli.menu.item.MenuItem("Close Menu", None)) + actionsMenu.add(cli.menu.item.MenuItem("New Identity", headerPanel.sendNewnym)) if control.isPaused(): label, arg = "Unpause", False else: label, arg = "Pause", True diff --git a/src/util/torTools.py b/src/util/torTools.py index d0d658a..17c54f0 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -6,6 +6,7 @@ accessing TorCtl and notifications of state changes to subscribers. import os import pwd import time +import math import socket import thread import threading @@ -411,6 +412,9 @@ class Controller(TorCtl.PostEventListener): self._status = State.INIT self._statusTime = time.time() + # time that we sent our last newnym signal + self._lastNewnym = 0 + # notifies listeners that a new controller is available if not NO_SPAWN: self._notificationQueue.put(State.INIT) @@ -714,6 +718,36 @@ class Controller(TorCtl.PostEventListener): if raisedExc: raise raisedExc + def sendNewnym(self): + """ + Sends a newnym request to Tor. These are rate limited so if it occures + more than once within a ten second window then the second is delayed. + """ + + self.connLock.acquire() + + if self.isAlive(): + self._lastNewnym = time.time() + self.conn.send_signal("NEWNYM") + + self.connLock.release() + + def isNewnymAvailable(self): + """ + True if Tor will immediately respect a newnym request, false otherwise. + """ + + return self.getNewnymWait() == 0 + + def getNewnymWait(self): + """ + Provides the number of seconds until a newnym signal would be respected. + """ + + # newnym signals can occure at the rate of one every ten seconds + # TODO: this can't take other controllers into account :( + return max(0, math.ceil(self._lastNewnym + 10 - time.time())) + def getCircuits(self, default = []): """ This provides a list with tuples of the form:

1 0

[pytorctl/master] Removing socket timeout for thread wakeup
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit 42b5f0e536089a0a509bac0403155466881b7c2f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 16 18:45:57 2011 -0700 Removing socket timeout for thread wakeup The shutdown added in this branch wakes the socket so there's no need for the loop we previously had. --- TorUtil.py | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/TorUtil.py b/TorUtil.py index 60d2b2f..82c2a12 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -188,10 +188,6 @@ def unescape_dots(s, translate_nl=1): # XXX: Exception handling class BufSock: def __init__(self, s): - # sets a timeout on our recv operations - s.settimeout(0.02) - self._isDone = False - self._s = s self._buf = [] @@ -204,10 +200,7 @@ class BufSock: return result while 1: - try: - s = self._s.recv(128) - except socket.timeout: - if not self._isDone: continue + s = self._s.recv(128) if not s: return None # XXX: This really does need an exception @@ -229,7 +222,6 @@ class BufSock: self._s.send(s) def close(self): - self._isDone = True self._s.shutdown(socket.SHUT_RDWR) self._s.close()

1 0

[pytorctl/master] Merge branch 'bug2812'
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit 8554340f34309af293ced771be9634887cef2568 Merge: 257fedb 42b5f0e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Jun 16 18:50:56 2011 -0700 Merge branch 'bug2812' TorUtil.py | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-)

1 0

[pytorctl/master] Removing indefinite blocking on socket recv
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit 4824d623487e0d305029ea46326eba94b4e4b738 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 12 20:40:49 2011 -0700 Removing indefinite blocking on socket recv When shutting down we can't join on _thread unless the socket receives data because we didn't have a timeout. This issues a 20 ms timeout on socket reads and cleans up _thread when we close. --- TorCtl.py | 5 +---- TorUtil.py | 11 ++++++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index 5403a95..b87f5f2 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -642,11 +642,8 @@ class Connection: self._queue.put("CLOSE") self._eventQueue.put((time.time(), "CLOSE")) self._closed = 1 - # XXX: For some reason, this does not cause the readline in - # self._read_reply() to return immediately. The _loop() thread - # thus tends to stick around until some event causes data to come - # back... self._s.close() + self._thread.join() self._eventThread.join() finally: self._sendLock.release() diff --git a/TorUtil.py b/TorUtil.py index 9e28779..c1bebf9 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -188,6 +188,10 @@ def unescape_dots(s, translate_nl=1): # XXX: Exception handling class BufSock: def __init__(self, s): + # sets a timeout on our recv operations + s.settimeout(0.02) + self._isDone = False + self._s = s self._buf = [] @@ -200,7 +204,11 @@ class BufSock: return result while 1: - s = self._s.recv(128) + try: + s = self._s.recv(128) + except socket.timeout: + if not self._isDone: continue + if not s: return None # XXX: This really does need an exception # raise ConnectionClosed() @@ -221,6 +229,7 @@ class BufSock: self._s.send(s) def close(self): + self._isDone = True self._s.close() # SocketServer.TCPServer is nuts..

1 0

[pytorctl/master] Shutting down sockets when closed
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit 477c1bcde44e92243bf061f565d9403fa8e31276 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 12 21:41:09 2011 -0700 Shutting down sockets when closed Each TorCtl instance spawned a socket that would continue to live for the life of the python process. For more information see ticket 2812. --- TorCtl.py | 4 ++++ TorUtil.py | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index b87f5f2..8fac3df 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -109,6 +109,7 @@ def connect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None): than prompting the user) """ + conn = None try: s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.connect((controlAddr, controlPort)) @@ -132,8 +133,11 @@ def connect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None): print "Connection refused. Is the ControlPort enabled?" else: print "Failed to establish socket: %s" % exc + if conn: conn.close() return None except Exception, exc: + if conn: conn.close() + if passphrase and str(exc) == "Unable to authenticate: password incorrect": # provide a warning that the provided password didn't work, then try # again prompting for the user to enter it diff --git a/TorUtil.py b/TorUtil.py index c1bebf9..60d2b2f 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -230,6 +230,7 @@ class BufSock: def close(self): self._isDone = True + self._s.shutdown(socket.SHUT_RDWR) self._s.close() # SocketServer.TCPServer is nuts..

1 0