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

[arm/release] Display placementLabel instead of timestamp for circuit lines.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 473a6b53d584108492b3a21cc0036117cc02b9b4 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jul 13 14:44:13 2011 +0500 Display placementLabel instead of timestamp for circuit lines. --- src/gui/connections/circEntry.py | 3 +-- src/gui/connections/connPanel.py | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index 11876f8..deb720a 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -35,8 +35,7 @@ class CircLine(circEntry.CircLine, connEntry.ConnectionLine): dst = self.getDestinationLabel(100, includeLocale=True) etc = self.foreign.getNickname() - timeLabel = uiTools.getTimeLabel(time.time() - self.startTime) theme = gtkTools.Theme() - return (dst, etc, timeLabel, self.getType(), theme.colors['insensitive']) + return (dst, etc, self.placementLabel, self.getType(), theme.colors['insensitive']) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 3b980e1..e6a7c5b 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -69,8 +69,9 @@ class ConnectionPanel(CliConnectionPanel): cacheKey = calculateCacheKey(line) if self.cache.has_key(cacheKey): - timeLabel = "%d s" % (time.time() - line.startTime) - treestore.set_value(self.cache[cacheKey], 2, timeLabel) + if not isinstance(line, circEntry.CircLine): + timeLabel = "%d s" % (time.time() - line.startTime) + treestore.set_value(self.cache[cacheKey], 2, timeLabel) else: break

1 0

[arm/release] Merging krkhan's master branch
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 4f3c6b69ced8b25a522f740f522a2a3aac855b5b Merge: 02be67a aef4158 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 14 17:42:25 2011 -0700 Merging krkhan's master branch src/gui/arm.xml | 79 ++---------------------- src/gui/connections/__init__.py | 6 ++ src/gui/connections/circEntry.py | 41 +++++++++++++ src/gui/connections/connEntry.py | 61 +++++++++++++++++++ src/gui/connections/connPanel.py | 114 +++++++++++++++++++++++++++++++++++ src/gui/controller.py | 10 +++- src/gui/graphing/graphStats.py | 15 +++-- src/gui/logPanel.py | 21 ++++-- src/gui/stickyPanel.py | 123 ++++++++++++++++++++++++++++++++++++++ src/starter.py | 2 +- src/util/gtkTools.py | 21 +++++++ 11 files changed, 406 insertions(+), 87 deletions(-)

1 0

[arm/release] fix: typo in relay description
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit b962667988a3db663f0a4f159fb7b146395e8d26 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 13 20:23:51 2011 -0700 fix: typo in relay description caught by karsten --- src/settings.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 7e13d19..110a45c 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -437,7 +437,7 @@ wizard.label.opt Reuse => Circuit Duration wizard.description.general Cancel => Close without starting Tor. wizard.description.role Resume => Start Tor with the last configuration you made. -wizard.description.role Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. +wizard.description.role Relay => Provides interconnections with other Tor relays. This is a safe and easy way of making the network better. wizard.description.role Exit => Connects between Tor network and the outside Internet. This is a vital role, but can lead to abuse complaints. wizard.description.role Bridge => Non-public relay specifically for helping censored users. wizard.description.role Client => Use the network without contributing to it.

1 0

[arm/release] Derive sticky panel values from CLI HeaderPanel.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 1bd068fab1fae856d7ca64114fcae03c769b9246 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 14 14:08:38 2011 +0500 Derive sticky panel values from CLI HeaderPanel. --- src/gui/arm.xml | 47 ------------------- src/gui/controller.py | 5 ++- src/gui/stickyPanel.py | 118 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 48 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 67409ae..f71d0b7 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -11,53 +11,6 @@  <column type="gchararray"/> </columns> - <data> - <row> - <col id="0" translatable="yes">arm</col> - <col id="1" translatable="yes">orthanc (Linux 2.6.35.11-83.fc14)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Tor</col> - <col id="1" translatable="yes">0.2.1.28 (obsolete)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Relaying</col> - <col id="1" translatable="yes">Disabled</col> - <col id="2" translatable="yes">red</col> - </row> - <row> - <col id="0" translatable="yes">Control Port</col> - <col id="1" translatable="yes">9051 (open)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">CPU Tor</col> - <col id="1" translatable="yes">0.0%</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">CPU arm</col> - <col id="1" translatable="yes">0.0%</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Memory</col> - <col id="1" translatable="yes">20 MB (1.0%)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">PID</col> - <col id="1" translatable="yes">3980</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Uptime</col> - <col id="1" translatable="yes">01:01:34</col> - <col id="2" translatable="yes">black</col> - </row> - </data> </object> <object class="GtkTreeStore" id="treestore_conn"> <columns> diff --git a/src/gui/controller.py b/src/gui/controller.py index a69fdef..854e388 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -6,7 +6,7 @@ import time from util import log, torTools from connections import connPanel -from gui import logPanel +from gui import logPanel, stickyPanel from gui.graphing import bandwidthStats gobject.threads_init() @@ -29,6 +29,9 @@ class GuiController: self.connPanel.pack_widgets() self.connPanel.start() + self.stickyPanel = stickyPanel.StickyPanel(self.builder) + self.stickyPanel.pack_widgets() + def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/stickyPanel.py b/src/gui/stickyPanel.py new file mode 100644 index 0000000..89b5485 --- /dev/null +++ b/src/gui/stickyPanel.py @@ -0,0 +1,118 @@ +""" +Sticky panel. +""" + +import random +import sys +import time + +from collections import deque + +import gobject +import gtk + +from cli.headerPanel import (HeaderPanel as CliHeaderPanel, VERSION_STATUS_COLORS) +from TorCtl import TorCtl +from util import connections, sysTools, gtkTools, uiTools, torTools + +class StickyPanel(CliHeaderPanel): + def __init__(self, builder): + CliHeaderPanel.__init__(self, None, time.time()) + + self.builder = builder + + gobject.timeout_add(3000, self._fill_entries) + + def pack_widgets(self): + pass + + def _fill_entries(self): + self.valsLock.acquire() + + liststore = self.builder.get_object('liststore_sticky') + theme = gtkTools.Theme() + + liststore.clear() + + key = "arm" + value = "%s (%s %s)" % (self.vals['sys/hostname'], self.vals['sys/os'], self.vals['sys/version']) + row = (key, value, theme.colors['active']) + liststore.append(row) + + versionColor = VERSION_STATUS_COLORS[self.vals["tor/versionStatus"]] if \ + self.vals["tor/versionStatus"] in VERSION_STATUS_COLORS else "black" + key = "Tor" + value = "%s (<span foreground=\"%s\">%s</span>)" % (self.vals['tor/version'], versionColor, self.vals['tor/versionStatus']) + row = (key, value, theme.colors['active']) + liststore.append(row) + + includeControlPort = True + key = "Relaying" + 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"] + + dirPortLabel = ", Dir Port: %s" % self.vals["tor/dirPort"] if self.vals["tor/dirPort"] != "0" else "" + + value = "%s%s%s" % (self.vals["tor/nickname"], " - " + myAddress, ":" + self.vals["tor/orPort"], dirPortLabel) + else: + if self._isTorConnected: + value = "Disabled" + else: + statusTime = torTools.getConn().getStatus()[1] + + if statusTime: + statusTimeLabel = time.strftime("%H:%M %m/%d/%Y, ", time.localtime(statusTime)) + else: statusTimeLabel = "" + + value = "%s%s" % ("Tor Disconnected", statusTimeLabel) + includeControlPort = False + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Control Port" + if includeControlPort: + if self.vals["tor/isAuthPassword"]: authType = "password" + elif self.vals["tor/isAuthCookie"]: authType = "cookie" + else: authType = "open" + + authColor = "red" if authType == "open" else "green" + value = "%s (<span foreground=\"%s\">%s</span>)" % (self.vals['tor/controlPort'], authColor, authType) + row = (key, value, theme.colors['active']) + liststore.append(row) + + + if self.vals["stat/rss"] != "0": memoryLabel = uiTools.getSizeLabel(int(self.vals["stat/rss"])) + else: memoryLabel = "0" + + if self.vals["tor/startTime"]: + if self.isPaused() or not self._isTorConnected: + uptimeLabel = uiTools.getShortTimeLabel(self.getPauseTime() - self.vals["tor/startTime"]) + else: + uptimeLabel = uiTools.getShortTimeLabel(time.time() - self.vals["tor/startTime"]) + + key = "CPU" + value = "%s%% Tor, %s%% arm" % (self.vals["stat/%torCpu"], self.vals["stat/%armCpu"]) + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Memory" + value = "%s (%s%%)" % (memoryLabel, self.vals["stat/%mem"]) + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "PID" + value = "%s" % (self.vals["tor/pid"] if self._isTorConnected else "") + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Uptime" + value = uptimeLabel + row = (key, value, theme.colors['active']) + liststore.append(row) + + self.valsLock.release() + + return True +

1 0

[arm/release] fix: minor clarification that any option will work
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 02be67ad6ae1e12d52b48829fd57a6154a1728e6 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 13 21:36:16 2011 -0700 fix: minor clarification that any option will work suggestion by armadev --- src/resources/torrcTemplate.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/resources/torrcTemplate.txt b/src/resources/torrcTemplate.txt index 20b2efa..744a481 100644 --- a/src/resources/torrcTemplate.txt +++ b/src/resources/torrcTemplate.txt @@ -2,7 +2,7 @@ # edit this file then either... # - tell arm to reset tor by pressing 'x' # - run 'pkill -sighup tor' -# - restart tor +# - or restart tor # # Descriptions of all of these configuration attributes (and many more) are # available in the tor man page.

1 0

[arm/release] Fill panels immediately at launch instead of waiting for first timeout.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit aef4158d0436449d696ad26d83b2dfd5c23505c1 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 14 14:15:55 2011 +0500 Fill panels immediately at launch instead of waiting for first timeout. --- src/gui/connections/connPanel.py | 10 +++++++--- src/gui/stickyPanel.py | 11 ++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index e6a7c5b..af9bf06 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -49,11 +49,17 @@ class ConnectionPanel(CliConnectionPanel): torCmdName = sysTools.getProcessName(torPid, "tor") connections.getResolver(torCmdName, torPid, "tor") - gobject.timeout_add(3000, self._fill_entries) + gobject.idle_add(self._fill_entries) + gobject.timeout_add(3000, self._timeout_fill_entries) def pack_widgets(self): pass + def _timeout_fill_entries(self): + self._fill_entries() + + return True + def _fill_entries(self): self.valsLock.acquire() @@ -106,5 +112,3 @@ class ConnectionPanel(CliConnectionPanel): self.valsLock.release() - return True - diff --git a/src/gui/stickyPanel.py b/src/gui/stickyPanel.py index 89b5485..145c452 100644 --- a/src/gui/stickyPanel.py +++ b/src/gui/stickyPanel.py @@ -20,12 +20,19 @@ class StickyPanel(CliHeaderPanel): CliHeaderPanel.__init__(self, None, time.time()) self.builder = builder + self.filled = False - gobject.timeout_add(3000, self._fill_entries) + gobject.idle_add(self._fill_entries) + gobject.timeout_add(3000, self._timeout_fill_entries) def pack_widgets(self): pass + def _timeout_fill_entries(self): + self._fill_entries() + + return True + def _fill_entries(self): self.valsLock.acquire() @@ -114,5 +121,3 @@ class StickyPanel(CliHeaderPanel): self.valsLock.release() - return True -

1 0

[arm/release] Changing "Use Low Ports" to "Use Popular Ports"
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 812590fe98d6f4d959d0729864adb5542719d4e3 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 13 21:13:13 2011 -0700 Changing "Use Low Ports" to "Use Popular Ports" idea by armadev --- src/settings.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 110a45c..750ae9e 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -416,7 +416,7 @@ wizard.label.opt Notify => Issue Notification wizard.label.opt Bandwidth => Relay Speed wizard.label.opt Limit => Monthly Limit wizard.label.opt Client => Client Usage -wizard.label.opt Lowports => Low Relaying Ports +wizard.label.opt Lowports => Use Popular Ports wizard.label.opt Portforward => Port Forwarding wizard.label.opt Startup => Run At Startup wizard.label.opt Rshutdown => Shutdown With Arm

1 0

[arm/release] Removing the INCLUDE_GUI source flag
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 52852efe54e134a7fb471e5d8c89d4ee90f3ec75 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 14 17:49:19 2011 -0700 Removing the INCLUDE_GUI source flag It's still pretty rough but ready for some initial input. The header (renamed (as sticky), log, bandwidth graphs, and connection panels have all been implemented by Kamran. --- src/starter.py | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/starter.py b/src/starter.py index 0564661..01acf24 100644 --- a/src/starter.py +++ b/src/starter.py @@ -30,7 +30,6 @@ import util.uiTools import TorCtl.TorCtl import TorCtl.TorUtil -INCLUDE_GUI = True LOG_DUMP_PATH = os.path.expanduser("~/.arm/log") DEFAULT_CONFIG = os.path.expanduser("~/.arm/armrc") CONFIG = {"startup.controlPassword": None, @@ -53,12 +52,8 @@ CONFIG = {"startup.controlPassword": None, "log.configDescriptions.persistance.saveFailed": util.log.NOTICE, "log.savingDebugLog": util.log.NOTICE} -if INCLUDE_GUI: - OPT = "gi:c:dbe:vh" - OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"] -else: - OPT = "i:c:dbe:vh" - OPT_EXPANDED = ["interface=", "config=", "debug", "blind", "event=", "version", "help"] +OPT = "gi:c:dbe:vh" +OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"] HELP_MSG = """Usage arm [OPTION] Terminal status monitor for Tor relays. @@ -79,11 +74,6 @@ arm -b -i 1643 hide connection data, attaching to control port 1643 arm -e we -c /tmp/cfg use this configuration file with 'WARN'/'ERR' events """ % (CONFIG["startup.interface.ipAddress"], CONFIG["startup.interface.port"], DEFAULT_CONFIG, LOG_DUMP_PATH, CONFIG["startup.events"], cli.logPanel.EVENT_LISTING) -# icky and temporary hack to remove the gui help option if it's unavailbe -if not INCLUDE_GUI: - helpComp = HELP_MSG.split("\n") - HELP_MSG = "\n".join(helpComp[:3] + helpComp[4:]) - # filename used for cached tor config descriptions CONFIG_DESC_FILENAME = "torConfigDesc.txt" @@ -310,7 +300,7 @@ if __name__ == '__main__': param["startup.interface.ipAddress"] = controlAddr param["startup.interface.port"] = controlPort - elif opt in ("-g", "--gui") and INCLUDE_GUI: launchGui = True + elif opt in ("-g", "--gui"): launchGui = True elif opt in ("-c", "--config"): configPath = arg # sets path of user's config elif opt in ("-d", "--debug"): isDebugMode = True # dumps all logs elif opt in ("-b", "--blind"):

1 0

[arm/release] Dropping "/s" when making torrc for rates
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit ec0cdb0f1499910fc85337ac20c2ab6352578cb6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:25:12 2011 -0700 Dropping "/s" when making torrc for rates The wizard shows bandwidth rates (for instance "5 MB/s") but the torrc just wants the volume part. Dropping the "/s" for RelayBandwidthRate and RelayBandwidthBurst. --- src/cli/wizard.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index cf544a5..8aa1a23 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -493,14 +493,21 @@ def getTorrc(relayType, config): if isinstance(value, ConfigOption): value = value.getValue() + # truncates "/s" from the rate for RelayBandwidthRate entry + if key == Options.BANDWIDTH and value.endswith("/s"): + value = value[:-2] + templateOptions[key.upper()] = value templateOptions[relayType.upper()] = True templateOptions["LOW_PORTS"] = config[Options.LOWPORTS] # uses double the relay rate for bursts - relayRateComp = config[Options.BANDWIDTH].getValue().split(" ") - templateOptions["BURST"] = "%i %s" % (int(relayRateComp[0]) * 2, " ".join(relayRateComp[1:])) + bwOpt = Options.BANDWIDTH.upper() + + if templateOptions[bwOpt] != TOR_DEFAULTS[Options.BANDWIDTH]: + relayRateComp = templateOptions[bwOpt].split(" ") + templateOptions["BURST"] = "%i %s" % (int(relayRateComp[0]) * 2, " ".join(relayRateComp[1:])) # exit notice will be in our data directory dataDir = cli.controller.getController().getDataDirectory()

1 0

[arm/release] Giving better error output when tor startup fails
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 000d5d9efda100758b2e8f703a13ebd76bcb457a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:43:57 2011 -0700 Giving better error output when tor startup fails The error out was pointless (any startup failure reported as being unable to connect to the control port) so giving the user the command to manually start tor. I should try to capture the logged err msg but this is gonna be a little tricky... --- src/cli/controller.py | 12 ++++++------ src/cli/wizard.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index d4ee3e3..a04bf99 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -462,20 +462,20 @@ class TorManager: Starts a managed instance of tor, raising an IOError if unsuccessful. """ - os.system("tor --quiet -f %s&" % self.getTorrcPath()) + torrcLoc = self.getTorrcPath() + os.system("tor --quiet -f %s&" % torrcLoc) startTime = time.time() # attempts to connect for five seconds (tor might or might not be # immediately available) - torctlConn, authType, authValue, raisedExc = None, None, None, None + torctlConn, authType, authValue = None, None, None while not torctlConn and time.time() - startTime < 5: try: torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = int(CONFIG["wizard.default"]["Control"])) - except IOError, exc: - raisedExc = exc - time.sleep(0.5) + except IOError, exc: time.sleep(0.5) - if not torctlConn: raise raisedExc + if not torctlConn: + raise IOError("try running \"tor -f %s\" for error output" % torrcLoc) if authType == TorCtl.AUTH_TYPE.COOKIE: torctlConn.authenticate(authValue) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 8aa1a23..6d2e623 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -304,7 +304,7 @@ def showWizard(): if manager.isManaged(conn): conn.reset() else: manager.startManagedInstance() except IOError, exc: - log.log(log.WARN, "Unable to start tor: %s" % exc) + log.log(log.WARN, "Unable to start tor, %s" % exc) break elif confirmationSelection == CANCEL: break @@ -512,7 +512,7 @@ def getTorrc(relayType, config): # exit notice will be in our data directory dataDir = cli.controller.getController().getDataDirectory() templateOptions["NOTICE_PATH"] = dataDir + "exit-notice.html" - templateOptions["LOG_ENTRY"] = "notice file %stor-log" % dataDir + templateOptions["LOG_ENTRY"] = "notice file %stor_log" % dataDir policyCategories = [] if not config[Options.POLICY].getValue():

1 0