- tor-commits - lists.torproject.org

[arm/master] Dropping usage of TorCtl.connect()
by atagar＠torproject.org 19 Jun '11

19 Jun '11

commit 8d6a1a6b0bd14b10b6bbe468e55c382e2a0bb6d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 19:31:02 2011 -0700 Dropping usage of TorCtl.connect() Using a custom implementation of the TorCtl.connect() function rather than adding hacks for added functionality. This version provides a different password prompt message (suggestion by weasel) and expansion of relative cookie paths. This is mostly being done since the previous hack would attempt relative cookies, fail, print a failure message, then the hack would correct for this. Having a custom connect() means we can correct the path on the first pass. --- src/starter.py | 76 ++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 47 insertions(+), 29 deletions(-) diff --git a/src/starter.py b/src/starter.py index e060274..d50c718 100644 --- a/src/starter.py +++ b/src/starter.py @@ -10,6 +10,7 @@ import os import sys import time import getopt +import getpass import locale import platform @@ -176,6 +177,49 @@ def _loadConfigurationDescriptions(pathPrefix): msg = DESC_INTERNAL_LOAD_FAILED_MSG % util.sysTools.getFileErrorMsg(exc) util.log.log(CONFIG["log.configDescriptions.internalLoadFailed"], msg) +def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, incorrectPasswordMsg=""): + """ + Custom handler for establishing a TorCtl connection. + """ + + conn = None + try: + conn, authType, authValue = TorCtl.TorCtl.preauth_connect(controlAddr, controlPort) + + if authType == TorCtl.TorCtl.AUTH_TYPE.PASSWORD: + # password authentication, promting for the password if it wasn't provided + if passphrase: authValue = passphrase + else: + try: authValue = getpass.getpass("Controller password: ") + except KeyboardInterrupt: return None + elif authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE 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: + # https://trac.torproject.org/projects/tor/ticket/1101 + # + # This is best effort. If we can't expand the path then it's still + # attempted since we might be running in tor's pwd. + + torPid = util.torTools.getPid(controlPort) + if torPid: + try: conn._cookiePath = util.sysTools.expandRelativePath(authValue, torPid) + except IOError: pass + + conn.authenticate(authValue) + return conn + 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 + print incorrectPasswordMsg + return _torCtlConnect(controlAddr, controlPort) + else: + print exc + return None + def _dumpConfig(): """ Dumps the current arm and tor configurations at the DEBUG runlevel. This @@ -341,36 +385,10 @@ if __name__ == '__main__': # sets up TorCtl connection, prompting for the passphrase if necessary and # sending problems to stdout if they arise - TorCtl.TorCtl.INCORRECT_PASSWORD_MSG = "Controller password found in '%s' was incorrect" % configPath authPassword = config.get("startup.controlPassword", CONFIG["startup.controlPassword"]) - conn = TorCtl.TorCtl.connect(controlAddr, controlPort, authPassword) - if conn == None: - # 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: - # https://trac.torproject.org/projects/tor/ticket/1101 - # - # Until this is fixed including a hack to expand the relative path in - # these cases, setting conn to the established connection if successful - # and leaving it undefined otherwise. Even if successful this prints the - # error message saying that the auth cookie couldn't be found - # (unfortunately this is unavoidable without either changing TorCtl or - # making this a much bigger hack). - - try: - tmpConn, authType, cookiePath = TorCtl.TorCtl.preauth_connect(controlAddr, controlPort) - - if authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE: - torPid = util.torTools.getPid(controlPort) - - if torPid and cookiePath[0] != "/": - # previous attempt to connect failed due to having a relative path - fix it - tmpConn._cookiePath = util.sysTools.expandRelativePath(cookiePath, torPid) - tmpConn.authenticate(cookiePath) - conn = tmpConn # success! - except: pass - - if conn == None: sys.exit(1) + incorrectPasswordMsg = "Password found in '%s' was incorrect" % configPath + conn = _torCtlConnect(controlAddr, controlPort, authPassword, incorrectPasswordMsg) + if conn == None: sys.exit(1) # removing references to the controller password so the memory can be freed # (unfortunately python does allow for direct access to the memory so this

1 0

r24824: {} svg versions of our logos. (projects/misc/phobos)
by Andrew Lewman 19 Jun '11

19 Jun '11

Author: phobos Date: 2011-06-19 02:28:58 +0000 (Sun, 19 Jun 2011) New Revision: 24824 Added: projects/misc/phobos/svg_logos.tar.gz Log: svg versions of our logos. Added: projects/misc/phobos/svg_logos.tar.gz =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/svg_logos.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

[arm/packaging] Updating autofetch torctl bundle
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit 967db1a753a248c0cba8bb9795648df55bfe9c34 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 15:52:00 2011 -0700 Updating autofetch torctl bundle Using the torctl commit... af306b53a668168ae92a6c919d4013b81d7e61ad --- deps/fetch.sh | 1 + deps/torctl.tar.gz | Bin 64261 -> 64726 bytes 2 files changed, 1 insertions(+), 0 deletions(-) diff --git a/deps/fetch.sh b/deps/fetch.sh index 73d5505..baaa61b 100755 --- a/deps/fetch.sh +++ b/deps/fetch.sh @@ -3,6 +3,7 @@ # and provided with the tarball to avoid complicating the install process. # # TorCtl (https://gitweb.torproject.org/pytorctl.git) +# 6/18/11 - 5460adb1394c368ba492cc33d6681618b3d3062b3f5f70b2a87520fc291701c3 # 6/10/11 - be583e53b2bccf09a7126c5271f9af5682447903b6ac92cf1cf78ca5b35273ed # # cagraph (https://code.google.com/p/cagraph/) diff --git a/deps/torctl.tar.gz b/deps/torctl.tar.gz index d45820b..e079c45 100644 Binary files a/deps/torctl.tar.gz and b/deps/torctl.tar.gz differ

1 0

[arm/master] Autofetching new torctl bundle
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit a72d0de4404d8d3db52f236c2abb0d2e02c9ee2f Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 15:58:57 2011 -0700 Autofetching new torctl bundle --- src/prereq.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/prereq.py b/src/prereq.py index ba1e988..eee9fdb 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -12,9 +12,9 @@ import tempfile # Library dependencies can be fetched on request. By default this is via # the following mirrors with their sha256 signatures checked. -TORCTL_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-6-10/torctl.tar.gz" -TORCTL_SIG = "be583e53b2bccf09a7126c5271f9af5682447903b6ac92cf1cf78ca5b35273ed" -CAGRAPH_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-6-10/cagraph.tar.gz" +TORCTL_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-06-16/torctl.tar.gz" +TORCTL_SIG = "5460adb1394c368ba492cc33d6681618b3d3062b3f5f70b2a87520fc291701c3" +CAGRAPH_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-06-10/cagraph.tar.gz" CAGRAPH_SIG = "1439acd40ce016f4329deb216d86f36a749e4b8bf73a313a757396af6f95310d" # optionally we can do an unverified fetch from the library's sources

1 0

[arm/master] fix: using renamed functions/args in torctl
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit 00ba915dc6f24476c19b4fb67d260a64063c19ff Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 16:01:30 2011 -0700 fix: using renamed functions/args in torctl The torctl patches had some functions and arguments renamed while being merged so using those. --- src/cli/headerPanel.py | 2 +- src/starter.py | 2 +- src/util/torTools.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 145e75b..7e0f639 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -133,7 +133,7 @@ class HeaderPanel(panel.Panel, threading.Thread): 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) + tmpConn, authType, authValue = TorCtl.TorCtl.preauth_connect(ctlAddr, ctlPort) if authType == TorCtl.TorCtl.AUTH_TYPE.PASSWORD: authValue = cli.popups.inputPrompt("Controller Password: ") diff --git a/src/starter.py b/src/starter.py index 94bb30b..e060274 100644 --- a/src/starter.py +++ b/src/starter.py @@ -358,7 +358,7 @@ if __name__ == '__main__': # making this a much bigger hack). try: - tmpConn, authType, cookiePath = TorCtl.TorCtl.connectionComp(controlAddr, controlPort) + tmpConn, authType, cookiePath = TorCtl.TorCtl.preauth_connect(controlAddr, controlPort) if authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE: torPid = util.torTools.getPid(controlPort) diff --git a/src/util/torTools.py b/src/util/torTools.py index 17c54f0..7ea140b 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1629,7 +1629,7 @@ class Controller(TorCtl.PostEventListener): if self.isAlive(): # fetch the current network status if not provided if not nsList: - try: nsList = self.conn.get_network_status(getIterator=True) + try: nsList = self.conn.get_network_status(get_iterator=True) except (socket.error, TorCtl.TorCtlClosed, TorCtl.ErrorReply): nsList = [] # construct mappings of ips to relay data

1 0

[arm/master] fix: miscropping strings breaking on first word
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit e6b64e48e67a5590a4069510f7f53bb28c11ed7d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 17 19:29:36 2011 -0700 fix: miscropping strings breaking on first word When cropping strings where we'd be splitting the first word only the last character would be dropped. For instance... >>> uiTools.cropStr("CookieAuthFileGroupReadable", 8) 'CookieAuthFileGroupReadabl...' rather than... >>> uiTools.cropStr("CookieAuthFileGroupReadable", 8) 'Cooki...' --- src/util/uiTools.py | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 5204960..1b32caa 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -242,13 +242,22 @@ def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, ge # checks if there isn't the minimum space needed to include anything lastWordbreak = msg.rfind(" ", 0, size + 1) - lastWordbreak = len(msg[:lastWordbreak].rstrip()) # drops extra ending whitespaces - if (minWordLen != None and size < minWordLen) or (minWordLen == None and lastWordbreak < 1): - if getRemainder: return ("", msg) - else: return "" - if minWordLen == None: minWordLen = sys.maxint - includeCrop = size - lastWordbreak - 1 >= minWordLen + if lastWordbreak == -1: + # we're splitting the first word + if minWordLen == None or size < minWordLen: + if getRemainder: return ("", msg) + else: return "" + + includeCrop = True + else: + lastWordbreak = len(msg[:lastWordbreak].rstrip()) # drops extra ending whitespaces + if (minWordLen != None and size < minWordLen) or (minWordLen == None and lastWordbreak < 1): + if getRemainder: return ("", msg) + else: return "" + + if minWordLen == None: minWordLen = sys.maxint + includeCrop = size - lastWordbreak - 1 >= minWordLen # if there's a max crop size then make sure we're cropping at least that many characters if includeCrop and minCrop:

1 0

[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