- tor-commits - lists.torproject.org

[arm/master] Filling blank space in circ entries with nickname
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit 5e1109836be738ce17adf596d5942f8dab98c020 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 17 20:17:56 2011 -0700 Filling blank space in circ entries with nickname The circuit entries on the connection panel had empty space besides the ip address field. Using this for the nickname. --- src/cli/connections/circEntry.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/cli/connections/circEntry.py b/src/cli/connections/circEntry.py index 82ef0ff..f94f53a 100644 --- a/src/cli/connections/circEntry.py +++ b/src/cli/connections/circEntry.py @@ -192,6 +192,10 @@ class CircLine(connEntry.ConnectionLine): # dst width is derived as: # src (21) + dst (26) + divider (7) + right gap (2) - bracket (3) = 53 char dst = "%-53s" % self.getDestinationLabel(53, includeLocale = True) + + # fills the nickname into the empty space here + dst = "%s%-25s " % (dst[:25], uiTools.cropStr(self.foreign.getNickname(), 25, 0)) + etc = self.getEtcContent(width - baselineSpace - len(dst), listingType) elif listingType == entries.ListingType.HOSTNAME: # min space for the hostname is 40 characters

1 0

[arm/master] fix: cropping whitespace-only strings could crash
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit 4aa35c2f4ad2445a948a05f46b07a7636ff2aac3 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 17 20:06:55 2011 -0700 fix: cropping whitespace-only strings could crash When cropping strings that started with whitespace and we didn't have enough room for any of the words we would crash (index error due to referencing the -1 index of an empty string). --- src/util/uiTools.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/uiTools.py b/src/util/uiTools.py index ce467c3..40a3087 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -273,7 +273,8 @@ def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, ge else: returnMsg, remainder = msg[:lastWordbreak], msg[lastWordbreak:] # if this is ending with a comma or period then strip it off - if not getRemainder and returnMsg[-1] in (",", "."): returnMsg = returnMsg[:-1] + if not getRemainder and returnMsg and returnMsg[-1] in (",", "."): + returnMsg = returnMsg[:-1] if endType == Ending.ELLIPSE: returnMsg = returnMsg.rstrip() + "..."

1 0

[arm/master] fix: cropping displayed by an extra cell
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit 7dc62fb0aee20285c0651c97ea42d37b82e255a2 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 17 20:04:55 2011 -0700 fix: cropping displayed by an extra cell The width panels were using was off by one (probably due to being overly conservative about curses crashes long, long ago). --- src/util/panel.py | 2 +- src/util/uiTools.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index 70f72a3..3bdcd6f 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -403,7 +403,7 @@ class Panel(): try: if forceRedraw: self.win.erase() # clears any old contents - self.draw(self.maxX - 1, self.maxY) + self.draw(self.maxX, self.maxY) self.win.refresh() finally: CURSES_LOCK.release() diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 1b32caa..ce467c3 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -315,18 +315,18 @@ def drawBox(panel, top, left, width, height, attr=curses.A_NORMAL): """ # draws the top and bottom - panel.hline(top, left + 1, width - 1, attr) - panel.hline(top + height - 1, left + 1, width - 1, attr) + panel.hline(top, left + 1, width - 2, attr) + panel.hline(top + height - 1, left + 1, width - 2, attr) # draws the left and right sides panel.vline(top + 1, left, height - 2, attr) - panel.vline(top + 1, left + width, height - 2, attr) + panel.vline(top + 1, left + width - 1, height - 2, attr) # draws the corners panel.addch(top, left, curses.ACS_ULCORNER, attr) - panel.addch(top, left + width, curses.ACS_URCORNER, attr) + panel.addch(top, left + width - 1, curses.ACS_URCORNER, attr) panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) - panel.addch(top + height - 1, left + width, curses.ACS_LRCORNER, attr) + panel.addch(top + height - 1, left + width - 1, curses.ACS_LRCORNER, attr) def isSelectionKey(key): """

1 0

r24823: {website} add the latest CNN:Tech story. (website/trunk/press/en)
by Andrew Lewman 18 Jun '11

18 Jun '11

Author: phobos Date: 2011-06-18 11:48:05 +0000 (Sat, 18 Jun 2011) New Revision: 24823 Modified: website/trunk/press/en/inthemedia.wml Log: add the latest CNN:Tech story. Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2011-06-14 21:04:07 UTC (rev 24822) +++ website/trunk/press/en/inthemedia.wml 2011-06-18 11:48:05 UTC (rev 24823) @@ -32,6 +32,13 @@ <th>Topic</th> </tr> </thead> +<tr style="background-color: #e5e5e5;"> +<td>2011 June 18</td> +<td>CNN: Tech</td> +<td><a +href="http://www.cnn.com/2011/TECH/innovation/06/17/mesh.technology.revolution/in…">Starting +a revolution with technology</td> +</tr> <tr> <td>2011 June 12</td> <td>CNN: Tech</td>

1 0

[torflow/master] Update submodule..
by mikeperry＠torproject.org 18 Jun '11

18 Jun '11

commit 6d02ebea92e586ec55225aa260abbfef32bf3acb Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 17 17:30:25 2011 -0700 Update submodule.. --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index 0ec171e..af306b5 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit 0ec171e6e0286b84802d09d399f7ff620dc37803 +Subproject commit af306b53a668168ae92a6c919d4013b81d7e61ad

1 0

[pytorctl/master] Rename make_connection to preauth_connect and export it.
by mikeperry＠torproject.org 18 Jun '11

18 Jun '11

commit af306b53a668168ae92a6c919d4013b81d7e61ad Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 17 17:29:43 2011 -0700 Rename make_connection to preauth_connect and export it. --- TorCtl.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index 250dab1..c515c97 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -35,7 +35,8 @@ __all__ = ["EVENT_TYPE", "connect", "TorCtlError", "TorCtlClosed", "NewDescEvent", "CircuitEvent", "StreamEvent", "ORConnEvent", "StreamBwEvent", "LogEvent", "AddrMapEvent", "BWEvent", "BuildTimeoutSetEvent", "UnknownEvent", "ConsensusTracker", - "EventListener", "EVENT_STATE", "ns_body_iter" ] + "EventListener", "EVENT_STATE", "ns_body_iter", + "preauth_connect" ] import os import re @@ -111,7 +112,7 @@ def connect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None): conn = None try: - conn, authType, authValue = _make_connection(controlAddr, controlPort) + conn, authType, authValue = preauth_connect(controlAddr, controlPort) if authType == AUTH_TYPE.PASSWORD: # password authentication, promting for the password if it wasn't provided @@ -134,7 +135,7 @@ def connect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None): print exc return None -def _make_connection(controlAddr="127.0.0.1", controlPort=9051): +def preauth_connect(controlAddr="127.0.0.1", controlPort=9051): """ Provides an uninitiated torctl connection components for the control port, returning a tuple of the form...

1 0

[torflow/master] Update submodule.
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit 8db5826def8209a518c8e473fd4cb6d30e55b47f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 17 16:32:58 2011 -0700 Update submodule. --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index b99ecc1..0ec171e 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit b99ecc1de55cdefbcd803e267d2635534ff9e511 +Subproject commit 0ec171e6e0286b84802d09d399f7ff620dc37803

1 0

[pytorctl/master] Rename connectionComp and export ns_body_iter.
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit 0ec171e6e0286b84802d09d399f7ff620dc37803 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 17 16:29:36 2011 -0700 Rename connectionComp and export ns_body_iter. --- TorCtl.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index b1387a0..250dab1 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -35,7 +35,7 @@ __all__ = ["EVENT_TYPE", "connect", "TorCtlError", "TorCtlClosed", "NewDescEvent", "CircuitEvent", "StreamEvent", "ORConnEvent", "StreamBwEvent", "LogEvent", "AddrMapEvent", "BWEvent", "BuildTimeoutSetEvent", "UnknownEvent", "ConsensusTracker", - "EventListener", "EVENT_STATE" ] + "EventListener", "EVENT_STATE", "ns_body_iter" ] import os import re @@ -111,7 +111,7 @@ def connect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None): conn = None try: - conn, authType, authValue = connectionComp(controlAddr, controlPort) + conn, authType, authValue = _make_connection(controlAddr, controlPort) if authType == AUTH_TYPE.PASSWORD: # password authentication, promting for the password if it wasn't provided @@ -134,7 +134,7 @@ def connect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None): print exc return None -def connectionComp(controlAddr="127.0.0.1", controlPort=9051): +def _make_connection(controlAddr="127.0.0.1", controlPort=9051): """ Provides an uninitiated torctl connection components for the control port, returning a tuple of the form...

1 0

[pytorctl/master] Unblocking waits for a response when we error
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit 9de33409bb240d8fe50e135dfb895536dc6a45bd Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 13 09:30:42 2011 -0700 Unblocking waits for a response when we error When the signal sent by _sendImpl causes the control connection to close we block indefinitely waiting for a response. For more information see bug 1329. --- TorCtl.py | 12 +++++++++++- TorUtil.py | 1 + 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index 2758033..056a65c 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -681,8 +681,18 @@ class Connection: while 1: try: isEvent, reply = self._read_reply() - except TorCtlClosed: + except TorCtlClosed, exc: plog("NOTICE", "Tor closed control connection. Exiting event thread.") + + # notify anything blocking on a response of the error, for details see: + # https://trac.torproject.org/projects/tor/ticket/1329 + try: + self._closedEx = exc + cb = self._queue.get(timeout=0) + if cb != "CLOSE": + cb("EXCEPTION") + except Queue.Empty: pass + return except Exception,e: if not self._closed: diff --git a/TorUtil.py b/TorUtil.py index 60d2b2f..29c44bf 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -208,6 +208,7 @@ class BufSock: s = self._s.recv(128) except socket.timeout: if not self._isDone: continue + except: s = None if not s: return None # XXX: This really does need an exception

1 0

[pytorctl/master] Handling for connections to non-control sockets
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit e76418e507319887626b9d3921bdc0ac44b28e76 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 13 09:50:13 2011 -0700 Handling for connections to non-control sockets When we attempt to initiate a control connection to a non-control port (for instance tor's socks port instead)... - the socket shutdown issues an error since it's not connected yet - checking the authentication type fails with a TorCtlClosed rather than error reply For more information see bug 2580. --- TorCtl.py | 5 +++-- TorUtil.py | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index 056a65c..44a612b 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -590,8 +590,9 @@ class Connection: # check PROTOCOLINFO for authentication type try: authInfo = self.sendAndRecv("PROTOCOLINFO\r\n")[1][1] - except ErrorReply, exc: - raise IOError("Unable to query PROTOCOLINFO for the authentication type: %s" % exc) + except Exception, exc: + excMsg = ": %s" % exc if exc.message else "" + raise IOError("Unable to query PROTOCOLINFO for the authentication type%s" % excMsg) authType, cookiePath = None, None if authInfo.startswith("AUTH METHODS=NULL"): diff --git a/TorUtil.py b/TorUtil.py index 29c44bf..fcbef70 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -231,7 +231,12 @@ class BufSock: def close(self): self._isDone = True - self._s.shutdown(socket.SHUT_RDWR) + + # if we haven't yet established a connection then this raises an error + # socket.error: [Errno 107] Transport endpoint is not connected + try: self._s.shutdown(socket.SHUT_RDWR) + except socket.error: pass + self._s.close() # SocketServer.TCPServer is nuts..

1 0