- tor-commits - lists.torproject.org

[arm/release] Dropping optional total prepopulation state file
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 4f3f7cfd957bc55f956e21e8af82888a24ec7ff4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 23 20:30:41 2011 -0700 Dropping optional total prepopulation state file The total value provided by the 'features.graph.bw.prepopulateTotal' config option was confusing, pointless, and conflicted with the new functionality we have to fetch the true totals from Tor. --- src/interface/graphing/bandwidthStats.py | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/interface/graphing/bandwidthStats.py b/src/interface/graphing/bandwidthStats.py index 3f34e3c..70a1e16 100644 --- a/src/interface/graphing/bandwidthStats.py +++ b/src/interface/graphing/bandwidthStats.py @@ -20,8 +20,7 @@ ACCOUNTING_ARGS = ("status", "resetTime", "read", "written", "readLimit", "writt PREPOPULATE_SUCCESS_MSG = "Read the last day of bandwidth history from the state file" PREPOPULATE_FAILURE_MSG = "Unable to prepopulate bandwidth information (%s)" -DEFAULT_CONFIG = {"features.graph.bw.prepopulateTotal": False, - "features.graph.bw.transferInBytes": False, +DEFAULT_CONFIG = {"features.graph.bw.transferInBytes": False, "features.graph.bw.accounting.show": True, "features.graph.bw.accounting.rate": 10, "features.graph.bw.accounting.isTimeLong": False, @@ -347,10 +346,6 @@ class BandwidthStats(graphPanel.GraphStats): def _getTotalLabel(self, isPrimary): total = self.primaryTotal if isPrimary else self.secondaryTotal - - if self._config["features.graph.bw.prepopulateTotal"]: - total += self.prepopulatePrimaryTotal if isPrimary else self.prepopulateSecondaryTotal - return "total: %s" % uiTools.getSizeLabel(total * 1024, 1) def _updateAccountingInfo(self):

1 0

[arm/release] Better commenting for new controller option usage
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 1ff5c3d8307a38485f850ba4936d4ab2e16bed7d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 19:18:50 2011 -0700 Better commenting for new controller option usage --- src/util/torTools.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 5e77f2e..b5913ed 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1626,6 +1626,12 @@ class Controller(TorCtl.PostEventListener): lookups if true """ + # Several controller options were added in ticket 2291... + # https://trac.torproject.org/projects/tor/ticket/2291 + # which is only available with newer tor versions (tested them against + # Tor v0.2.3.0-alpha-dev). When using these options we need to be + # especially careful to have good fallback logic. + currentVal = self._cachedParam.get(key) if currentVal != None: if currentVal == UNKNOWN: return default @@ -1697,8 +1703,7 @@ class Controller(TorCtl.PostEventListener): if not result: result = getPid(int(self.getOption("ControlPort", 9051)), self.getOption("PidFile")) elif key == "user": - # This was added in Tor 0.2.3.x-final so it's quite likely unavailable. - # Even if it is, it might fail and return an empty string. + # provides the empty string if the query fails queriedUser = self.getInfo("process/user") if queriedUser != None and queriedUser != "": @@ -1721,9 +1726,7 @@ class Controller(TorCtl.PostEventListener): psResults = sysTools.call("ps -o user %s" % myPid) if psResults and len(psResults) >= 2: result = psResults[1].strip() elif key == "fdLimit": - # This was added in Tor 0.2.3.x-final so it's quite likely unavailable. - # Even if it is, it might fail and return -1. - + # provides -1 if the query fails queriedLimit = self.getInfo("process/descriptor-limit") if queriedLimit != None and queriedLimit != "-1":

1 0

[arm/release] fix: Capitalizing unused cfg option log message
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 9ba121e859d8c551be08e340728004fa48ec1c4d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 19:05:40 2011 -0700 fix: Capitalizing unused cfg option log message --- src/interface/controller.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/interface/controller.py b/src/interface/controller.py index 558c107..b88152f 100644 --- a/src/interface/controller.py +++ b/src/interface/controller.py @@ -649,7 +649,7 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): # provides notice about any unused config keys for key in config.getUnusedKeys(): - log.log(CONFIG["log.configEntryUndefined"], "unused configuration entry: %s" % key) + log.log(CONFIG["log.configEntryUndefined"], "Unused configuration entry: %s" % key) lastPerformanceLog = 0 # ensures we don't do performance logging too frequently redrawStartTime = time.time()

1 0

[arm/release] Putting TorCtl install prompt in its own function
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 6534807224d5f88b0c5450e996e5fa1f8c470763 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 08:52:36 2011 -0700 Putting TorCtl install prompt in its own function --- src/prereq.py | 41 ++++++++++++++++++++++++++--------------- 1 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/prereq.py b/src/prereq.py index ee5c768..50aaa91 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -20,6 +20,30 @@ def isTorCtlAvailable(): except ImportError: return False +def promptTorCtlInstall(): + """ + Asks the user to install TorCtl. This returns True if it was installed and + False otherwise (if it was either declined or failed to be fetched. + """ + + userInput = raw_input("Arm requires TorCtl to run, but it's unavailable. Would you like to install it? (y/n): ") + + # if user says no then terminate + if not userInput.lower() in ("y", "yes"): return False + + # attempt to install TorCtl, printing the issue if unsuccessful + try: + installTorCtl() + + if not isTorCtlAvailable(): + raise IOError("Unable to install TorCtl, sorry") + + print "TorCtl successfully installed" + return True + except IOError, exc: + print exc + return False + def installTorCtl(): """ Checks out the current git head release for TorCtl and bundles it with arm. @@ -65,19 +89,6 @@ if __name__ == '__main__': sys.exit(1) if not isTorCtlAvailable(): - userInput = raw_input("Arm requires TorCtl to run, but it's unavailable. Would you like to install it? (y/n): ") - - # if user says no then terminate - if not userInput.lower() in ("y", "yes"): - sys.exit(1) - - # attempt to install TorCtl, printing the issue if unsuccessful - try: - installTorCtl() - - if not isTorCtlAvailable(): - raise IOError("Unable to install TorCtl, sorry") - except IOError, exc: - print exc - sys.exit(1) + isInstalled = promptTorCtlInstall() + if not isInstalled: sys.exit(1)

1 0

[arm/release] Dropping raw torctl access from the descriptor popup (simpler, takes advantage of caching, and allows for restarts)
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 900955fedaca8f87576e67c4c7af474f1ab5453a Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 12 16:15:00 2011 +0000 Dropping raw torctl access from the descriptor popup (simpler, takes advantage of caching, and allows for restarts) svn:r24594 --- src/interface/controller.py | 4 ++-- src/interface/descriptorPopup.py | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/interface/controller.py b/src/interface/controller.py index 5761861..167be0a 100644 --- a/src/interface/controller.py +++ b/src/interface/controller.py @@ -1462,7 +1462,7 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): if key in (curses.KEY_DOWN, curses.KEY_UP, curses.KEY_PPAGE, curses.KEY_NPAGE): panels["conn"].handleKey(key) elif key in (ord('d'), ord('D')): - descriptorPopup.showDescriptorPopup(panels["popup"], stdscr, conn, panels["conn"]) + descriptorPopup.showDescriptorPopup(panels["popup"], stdscr, panels["conn"]) panels["conn"].redraw(True) panels["conn"].showLabel = True @@ -1481,7 +1481,7 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panels["conn"].showLabel = False panels["conn"].redraw(True) - descriptorPopup.showDescriptorPopup(panels["popup"], stdscr, conn, panels["conn"]) + descriptorPopup.showDescriptorPopup(panels["popup"], stdscr, panels["conn"]) setPauseState(panels, isPaused, page) curses.halfdelay(REFRESH_RATE * 10) # reset normal pausing behavior diff --git a/src/interface/descriptorPopup.py b/src/interface/descriptorPopup.py index 1fabcf4..51ea2e3 100644 --- a/src/interface/descriptorPopup.py +++ b/src/interface/descriptorPopup.py @@ -9,7 +9,7 @@ from TorCtl import TorCtl import controller import connPanel -from util import panel, uiTools +from util import panel, torTools, uiTools # field keywords used to identify areas for coloring LINE_NUM_COLOR = "yellow" @@ -28,8 +28,7 @@ class PopupProperties: State attributes of popup window for consensus descriptions. """ - def __init__(self, conn): - self.conn = conn + def __init__(self): self.fingerprint = "" self.entryColor = "white" self.text = [] @@ -47,18 +46,19 @@ class PopupProperties: self.showLineNum = False self.text.append(UNRESOLVED_MSG) else: + conn = torTools.getConn() + try: self.showLineNum = True - nsCommand = "ns/id/%s" % fingerprint - self.text.append(nsCommand) - self.text = self.text + self.conn.get_info(nsCommand)[nsCommand].split("\n") + self.text.append("ns/id/%s" % fingerprint) + self.text += conn.getConsensusEntry(fingerprint).split("\n") except (socket.error, TorCtl.ErrorReply, TorCtl.TorCtlClosed): self.text = self.text + [ERROR_MSG, ""] try: descCommand = "desc/id/%s" % fingerprint - self.text.append(descCommand) - self.text = self.text + self.conn.get_info(descCommand)[descCommand].split("\n") + self.text.append("desc/id/%s" % fingerprint) + self.text += conn.getDescriptorEntry(fingerprint).split("\n") except (socket.error, TorCtl.ErrorReply, TorCtl.TorCtlClosed): self.text = self.text + [ERROR_MSG] @@ -68,7 +68,7 @@ class PopupProperties: elif key == curses.KEY_PPAGE: self.scroll = max(self.scroll - height, 0) elif key == curses.KEY_NPAGE: self.scroll = max(0, min(self.scroll + height, len(self.text) - height)) -def showDescriptorPopup(popup, stdscr, conn, connectionPanel): +def showDescriptorPopup(popup, stdscr, connectionPanel): """ Presents consensus descriptor in popup window with the following controls: Up, Down, Page Up, Page Down - scroll descriptor @@ -76,7 +76,7 @@ def showDescriptorPopup(popup, stdscr, conn, connectionPanel): Enter, Space, d, D - close popup """ - properties = PopupProperties(conn) + properties = PopupProperties() isVisible = True if not panel.CURSES_LOCK.acquire(False): return

1 0

[arm/release] Offering to install TorCtl if unavailable
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit d1d54c08e245083660394d0e11b41c593099fc2f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 20 19:38:17 2011 -0700 Offering to install TorCtl if unavailable --- src/prereq.py | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/src/prereq.py b/src/prereq.py index 90cb03a..ee5c768 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -2,7 +2,50 @@ Provides a warning and error code if python version isn't compatible. """ +import os import sys +import shutil +import tempfile + +TORCTL_REPO = "git://git.torproject.org/pytorctl.git" + +def isTorCtlAvailable(): + """ + True if TorCtl is already available on the platform, false otherwise. + """ + + try: + import TorCtl + return True + except ImportError: + return False + +def installTorCtl(): + """ + Checks out the current git head release for TorCtl and bundles it with arm. + This raises an IOError if unsuccessful. + """ + + if isTorCtlAvailable(): return + + # temporary destination for TorCtl's git clone, guarenteed to be unoccupied + # (to avoid conflicting with files that are already there) + tmpFilename = tempfile.mktemp("/torctl") + + # fetches TorCtl + exitStatus = os.system("git clone %s %s > /dev/null" % (TORCTL_REPO, tmpFilename)) + if exitStatus: raise IOError("Unable to get TorCtl from %s. Is git installed?" % TORCTL_REPO) + + # the destination for TorCtl will be our directory + ourDir = os.path.dirname(os.path.realpath(__file__)) + + # exports TorCtl to our location + exitStatus = os.system("(cd %s && git archive --format=tar --prefix=TorCtl/ master) | (cd %s && tar xf - 2> /dev/null)" % (tmpFilename, ourDir)) + if exitStatus: raise IOError("Unable to install TorCtl to %s" % ourDir) + + # Clean up the temporary contents. This isn't vital so quietly fails in case + # of errors. + shutil.rmtree(tmpFilename, ignore_errors=True) if __name__ == '__main__': majorVersion = sys.version_info[0] @@ -20,4 +63,21 @@ if __name__ == '__main__': except ImportError: print("arm requires curses - try installing the python-curses package\n") sys.exit(1) + + if not isTorCtlAvailable(): + userInput = raw_input("Arm requires TorCtl to run, but it's unavailable. Would you like to install it? (y/n): ") + + # if user says no then terminate + if not userInput.lower() in ("y", "yes"): + sys.exit(1) + + # attempt to install TorCtl, printing the issue if unsuccessful + try: + installTorCtl() + + if not isTorCtlAvailable(): + raise IOError("Unable to install TorCtl, sorry") + except IOError, exc: + print exc + sys.exit(1)

1 0

[arm/release] Fetching pid with 'GETINFO process/pid' if able
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit a1271d49f14f8d63e983043e677c92ba15fa9c9b Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 19:12:34 2011 -0700 Fetching pid with 'GETINFO process/pid' if able This is a new controller option added in ticket 2291 (https://trac.torproject.org/projects/tor/ticket/2291) This was tested against Tor v0.2.3.0-alpha-dev by making sure we're making the getinfo call, and not using pgrep to resolve the pid. --- src/util/torTools.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 3ef66f2..5e77f2e 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1692,7 +1692,10 @@ class Controller(TorCtl.PostEventListener): elif key == "parsedVersion": result = parseVersion(self.getInfo("version", "")) elif key == "pid": - result = getPid(int(self.getOption("ControlPort", 9051)), self.getOption("PidFile")) + result = self.getInfo("process/pid") + + if not result: + result = getPid(int(self.getOption("ControlPort", 9051)), self.getOption("PidFile")) elif key == "user": # This was added in Tor 0.2.3.x-final so it's quite likely unavailable. # Even if it is, it might fail and return an empty string.

1 0

[arm/release] Merge release commit '8b8568e'
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 8b4d9f13e50f6a420b1000c70de25bf244db393a Merge: 6534807 8b8568e Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 09:42:15 2011 -0700 Merge release commit '8b8568e' Conflicts: src/version.py setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[arm/release] Hack to allow the descriptor popup to function for the new connection panel. This will probably be dropped when raw control port access is introduced.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 97789357dea31bfee8843da1410b9820623fbdbc Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 12 16:40:25 2011 +0000 Hack to allow the descriptor popup to function for the new connection panel. This will probably be dropped when raw control port access is introduced. This was the last piece of important partiy between the panels so the old connection panel can now be dropped from the codebase. I'll first wait a little first to see if any other uses for it pop up. svn:r24596 --- src/interface/controller.py | 23 ++++++++++++++++++++--- src/interface/descriptorPopup.py | 20 ++++++++++++++------ 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/interface/controller.py b/src/interface/controller.py index 167be0a..8be65c7 100644 --- a/src/interface/controller.py +++ b/src/interface/controller.py @@ -1007,7 +1007,7 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): popup.addfstr(2, 41, "page down: scroll down a page") popup.addfstr(3, 2, "enter: edit configuration option") - #popup.addfstr(3, 41, "d: raw consensus descriptor") + popup.addfstr(3, 41, "d: raw consensus descriptor") listingType = panels["conn2"]._listingType.lower() popup.addfstr(4, 2, "l: listed identity (%s)" % listingType) @@ -1016,9 +1016,9 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): resolverUtil = connections.getResolver("tor").overwriteResolver if resolverUtil == None: resolverUtil = "auto" - popup.addfstr(3, 41, "u: resolving utility (%s)" % resolverUtil) + popup.addfstr(5, 2, "u: resolving utility (%s)" % resolverUtil) - pageOverrideKeys = (ord('l'), ord('s'), ord('u')) + pageOverrideKeys = (ord('d'), ord('l'), ord('s'), ord('u')) elif page == 3: popup.addfstr(1, 2, "up arrow: scroll up a line") popup.addfstr(1, 41, "down arrow: scroll down a line") @@ -1611,6 +1611,23 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): setPauseState(panels, isPaused, page) finally: panel.CURSES_LOCK.release() + elif page == 2 and key in (ord('d'), ord('D')): + # presents popup for raw consensus data + panel.CURSES_LOCK.acquire() + try: + setPauseState(panels, isPaused, page, True) + curses.cbreak() # wait indefinitely for key presses (no timeout) + panelTitle = panels["conn2"]._title + panels["conn2"]._title = "" + panels["conn2"].redraw(True) + + descriptorPopup.showDescriptorPopup(panels["popup"], stdscr, panels["conn2"], True) + + panels["conn2"]._title = panelTitle + setPauseState(panels, isPaused, page) + curses.halfdelay(REFRESH_RATE * 10) # reset normal pausing behavior + finally: + panel.CURSES_LOCK.release() elif page == 2 and (key == ord('l') or key == ord('L')): # provides a menu to pick the primary information we list connections by options = interface.connections.entries.ListingType.values() diff --git a/src/interface/descriptorPopup.py b/src/interface/descriptorPopup.py index 51ea2e3..7d51ee5 100644 --- a/src/interface/descriptorPopup.py +++ b/src/interface/descriptorPopup.py @@ -9,6 +9,7 @@ from TorCtl import TorCtl import controller import connPanel +import connections.connEntry from util import panel, torTools, uiTools # field keywords used to identify areas for coloring @@ -68,7 +69,7 @@ class PopupProperties: elif key == curses.KEY_PPAGE: self.scroll = max(self.scroll - height, 0) elif key == curses.KEY_NPAGE: self.scroll = max(0, min(self.scroll + height, len(self.text) - height)) -def showDescriptorPopup(popup, stdscr, connectionPanel): +def showDescriptorPopup(popup, stdscr, connectionPanel, isNewPanel=False): """ Presents consensus descriptor in popup window with the following controls: Up, Down, Page Up, Page Down - scroll descriptor @@ -82,11 +83,18 @@ def showDescriptorPopup(popup, stdscr, connectionPanel): if not panel.CURSES_LOCK.acquire(False): return try: while isVisible: - selection = connectionPanel.cursorSelection - if not selection or not connectionPanel.connections: break - fingerprint = connectionPanel.getFingerprint(selection[connPanel.CONN_F_IP], selection[connPanel.CONN_F_PORT]) - entryColor = connPanel.TYPE_COLORS[selection[connPanel.CONN_TYPE]] - properties.reset(fingerprint, entryColor) + if isNewPanel: + selection = connectionPanel._scroller.getCursorSelection(connectionPanel._entryLines) + if not selection: break + fingerprint = selection.foreign.getFingerprint() + entryColor = connections.connEntry.CATEGORY_COLOR[selection.getType()] + properties.reset(fingerprint, entryColor) + else: + selection = connectionPanel.cursorSelection + if not selection or not connectionPanel.connections: break + fingerprint = connectionPanel.getFingerprint(selection[connPanel.CONN_F_IP], selection[connPanel.CONN_F_PORT]) + entryColor = connPanel.TYPE_COLORS[selection[connPanel.CONN_TYPE]] + properties.reset(fingerprint, entryColor) # constrains popup size to match text width, height = 0, 0

1 0

[arm/release] Making git ignore TorCtl and python bytecode (pyc)
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit e8f3e8ce98faf315dfe2f40dac978c4066894211 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 20 19:30:08 2011 -0700 Making git ignore TorCtl and python bytecode (pyc) --- .gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9b955dd --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.pyc +src/TorCtl/ +

1 0