- tor-commits - lists.torproject.org

[arm/release] Adding option to drop connection ip addresses
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit c7a2ed2bcbf34c967832fd9c4b9b9eafcb3d675c Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 12 09:58:38 2011 -0700 Adding option to drop connection ip addresses Providing an option to scrub the ip addresses of tor relays from the connection panel, requested by ioerror. --- armrc.sample | 4 ++++ src/cli/connections/connEntry.py | 3 +++ src/cli/connections/connPanel.py | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/armrc.sample b/armrc.sample index c893bf9..23092d7 100644 --- a/armrc.sample +++ b/armrc.sample @@ -211,6 +211,9 @@ features.graph.bw.accounting.isTimeLong false # if true, the uptime of the initial connections when we start are marked # with a '+' (these uptimes are estimates since arm can only track a # connection's duration while it runs) +# showIps +# shows ip addresses for other tor relays, dropping this information if +# false # showExitPort # shows port related information of exit connections we relay if true # showColumn.* @@ -221,6 +224,7 @@ features.connection.order 0, 2, 1 features.connection.refreshRate 5 features.connection.resolveApps true features.connection.markInitialConnections true +features.connection.showIps true features.connection.showExitPort true features.connection.showColumn.fingerprint true features.connection.showColumn.nickname true diff --git a/src/cli/connections/connEntry.py b/src/cli/connections/connEntry.py index 05e2a45..5feafdb 100644 --- a/src/cli/connections/connEntry.py +++ b/src/cli/connections/connEntry.py @@ -34,6 +34,7 @@ LABEL_MIN_PADDING = 2 # min space between listing label and following data SCRUBBED_IP_VAL = 255 ** 4 CONFIG = {"features.connection.markInitialConnections": True, + "features.connection.showIps": True, "features.connection.showExitPort": True, "features.connection.showColumn.fingerprint": True, "features.connection.showColumn.nickname": True, @@ -344,6 +345,8 @@ class ConnectionLine(entries.ConnectionPanelLine): connection or exit traffic. """ + if not CONFIG["features.connection.showIps"]: return True + # This is used to scrub private information from the interface. Relaying # etiquette (and wiretapping laws) say these are bad things to look at so # DON'T CHANGE THIS UNLESS YOU HAVE A DAMN GOOD REASON! diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 161d6f6..ae50674 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -14,7 +14,8 @@ from util import connections, enum, panel, torTools, uiTools DEFAULT_CONFIG = {"features.connection.resolveApps": True, "features.connection.listingType": 0, - "features.connection.refreshRate": 5} + "features.connection.refreshRate": 5, + "features.connection.showIps": True} # height of the detail panel content, not counting top and bottom border DETAILS_HEIGHT = 7 @@ -43,6 +44,11 @@ class ConnectionPanel(panel.Panel, threading.Thread): "features.connection.listingType": (0, len(Listing.values()) - 1), "features.connection.refreshRate": 1}) + # defaults our listing selection to fingerprints if ip address + # displaying is disabled + if not self._config["features.connection.showIps"] and self._config["features.connection.listingType"] == 0: + self._config["features.connection.listingType"] = 2 + sortFields = entries.SortAttr.values() customOrdering = config.getIntCSV("features.connection.order", None, 3, 0, len(sortFields))

1 0

[arm/release] Logging that exit notice has US sepecific sections
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 88cb9113f8853f83289f487f2fcbedee4e008777 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 12 10:09:29 2011 -0700 Logging that exit notice has US sepecific sections The exit notice has US specific sections with a "FIXME" tag to informing wizard users so they can fix this. --- src/cli/wizard.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 6caf490..8f3d0d1 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -354,6 +354,10 @@ def showWizard(): if not os.path.exists(dst): shutil.copytree(src, dst) + + # providing a notice that it has sections specific to us operators + msg = "Exit notice placed at '%s/index.html'. Some of the sections are specific to US relay operators so please change the \"FIXME\" sections if this is inappropriate." % dst + log.log(log.NOTICE, msg) if manager.isTorrcAvailable(): # If we're connected to a managed instance then just need to

1 0

[arm/release] Logging where we place the generated torrc
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 49ff021c97b9a4400730f3ee769beec74add50fa Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 12 10:21:45 2011 -0700 Logging where we place the generated torrc --- src/cli/wizard.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 8f3d0d1..032cb92 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -333,14 +333,23 @@ def showWizard(): log.log(log.INFO, "Writing torrc to '%s':\n%s" % (torrcLocation, generatedTorrc)) # if the torrc already exists then save it to a _bak file + isBackedUp = False if os.path.exists(torrcLocation): shutil.copy(torrcLocation, torrcLocation + "_bak") + isBackedUp = True # writes the torrc contents torrcFile = open(torrcLocation, "w") torrcFile.write(generatedTorrc) torrcFile.close() + # logs where we placed the torrc + msg = "Tor configuration placed at '%s'" % torrcLocation + if isBackedUp: + msg += " (the previous torrc was moved to 'torrc_bak')" + + log.log(log.NOTICE, msg) + dataDir = cli.controller.getController().getDataDirectory() pathPrefix = os.path.dirname(sys.argv[0])

1 0

[arm/release] Toggling config flad to allow detached startups
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit e19872a84c02e3d755cccf0668b0ccc3396bba8e Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 12 10:26:52 2011 -0700 Toggling config flad to allow detached startups Toggling default for the 'features.allowDetachedStartup' flag so users, by default, will see the relay setup wizard if there's no control connection. It's complete minus the root startup script... --- armrc.sample | 2 +- src/starter.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/armrc.sample b/armrc.sample index 23092d7..0a7b0e1 100644 --- a/armrc.sample +++ b/armrc.sample @@ -62,7 +62,7 @@ features.confirmQuit true # Allows arm to start when there's no running tor instance if true, otherwise # we terminate right away. -features.allowDetachedStartup false +features.allowDetachedStartup true # Paremters for the log panel # --------------------------- diff --git a/src/starter.py b/src/starter.py index 58bc6b1..d2d0f2a 100644 --- a/src/starter.py +++ b/src/starter.py @@ -40,7 +40,7 @@ CONFIG = {"startup.controlPassword": None, "startup.events": "N3", "startup.dataDirectory": "~/.arm", "wizard.default": {}, - "features.allowDetachedStartup": False, + "features.allowDetachedStartup": True, "features.config.descriptions.enabled": True, "features.config.descriptions.persist": True, "log.configDescriptions.readManPageSuccess": util.log.INFO,

1 0

[arm/release] Remaining work for using tor with privileged ports
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 21131c72f8b1e3e8605f5153dab1c779ef8f24f2 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 13 00:35:07 2011 -0700 Remaining work for using tor with privileged ports Filling in the starter shell script and a variety of other fixes to make tor instances needing root startup permissions work nicely. --- src/cli/controller.py | 2 +- src/cli/wizard.py | 14 ++++++++------ src/resources/startTor | 38 ++++++++++++++++++++++++++------------ src/resources/torrcTemplate.txt | 7 ++++--- src/settings.cfg | 2 +- 5 files changed, 40 insertions(+), 23 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index d4fcf2f..e8b28cc 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -523,7 +523,7 @@ class TorManager: torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = int(CONFIG["wizard.default"]["Control"])) if not torctlConn: - msg = "Unable to start tor, try running \"tor -f %s\" to see the error output" % torrcLoc + msg = "Unable to start tor, try running \"tor -f %s\" to see the error output" % self.getTorrcPath() raise IOError(msg) if authType == TorCtl.AUTH_TYPE.COOKIE: diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 032cb92..08e9d0b 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -8,14 +8,13 @@ import os import sys import random import shutil +import getpass import functools import curses import cli.popups import cli.controller -from TorCtl import TorCtl - from util import connections, enum, log, sysTools, torConfig, torTools, uiTools # template used to generate the torrc @@ -384,7 +383,7 @@ def showWizard(): dst = "%sstartTor" % dataDir if not os.path.exists(dst): shutil.copy(src, dst) - msg = "Tor needs root permissions to start with this configuration (it will drop itself to a 'tor-arm' user afterward). To continue...\n- open another terminal\n- run \"sudo %s\"\n- press 'r' here to tell arm to reconnect" % dst + msg = "Tor needs root permissions to start with this configuration (it will drop itself to the current user afterward). To continue...\n- open another terminal\n- run \"sudo %s\"\n- press 'r' here to tell arm to reconnect" % dst log.log(log.NOTICE, msg) break @@ -590,7 +589,7 @@ def getTorrc(relayType, config, disabledOpt): templateOptions[key.upper()] = value templateOptions[relayType.upper()] = True - templateOptions["LOW_PORTS"] = config[Options.LOWPORTS] + templateOptions["LOW_PORTS"] = config[Options.LOWPORTS].getValue() # uses double the relay rate for bursts bwOpt = Options.BANDWIDTH.upper() @@ -599,10 +598,13 @@ def getTorrc(relayType, config, disabledOpt): relayRateComp = templateOptions[bwOpt].split(" ") templateOptions["BURST"] = "%i %s" % (int(relayRateComp[0]) * 2, " ".join(relayRateComp[1:])) - # exit notice will be in our data directory + # paths for our tor related resources + dataDir = cli.controller.getController().getDataDirectory() - templateOptions["NOTICE_PATH"] = dataDir + "exitNotice/index.html" + templateOptions["NOTICE_PATH"] = "%sexitNotice/index.html" % dataDir templateOptions["LOG_ENTRY"] = "notice file %stor_log" % dataDir + templateOptions["DATA_DIR"] = "%stor_data" % dataDir + templateOptions["USERNAME"] = getpass.getuser() policyCategories = [] if not config[Options.POLICY].getValue(): diff --git a/src/resources/startTor b/src/resources/startTor index c575c23..812a75a 100755 --- a/src/resources/startTor +++ b/src/resources/startTor @@ -1,14 +1,28 @@ #!/bin/sh -# -# When binding to privilaged ports the tor process needs to start with root -# permissions, then lower the user it's running as afterward. This script -# simply makes a "tor-arm" user if it doesn't already exist then starts the -# tor process. - -# TODO: check if the user's running as root -# TODO: check if the tor-arm user exists and if not, make it -# TODO: run arm -# TODO: bonus points: double check that the torrc in this directory has a -# "User tor-arm" entry - this would be a problem if they run the wizard -# without low ports, then use this script + +# When binding to privileged ports the tor process needs to start with root +# permissions, then lower the user it's running as afterward. + +# checks that we're running as root + +if [ "$(id -u)" != "0" ]; then + printf "This script needs root permissions to run. Try again with \"sudo ${0}\".\n\n" + exit 1 +fi + +# Checks that the torrc in this directory has a "User <username>" entry. If +# they ran the wizard multiple times then we might currently have a torrc +# without it, causing this to run tor as root (... not what we wanted). + +torrcLoc=$( dirname "$0" )/torrc +if ! `grep -q "^User " ${torrcLoc}`; then + printf "The tor configuration file (${torrcLoc}) doesn't lower its\n" + printf "permissions. You should only be using this script to run tor instances that\n" + printf "need root permissions to start.\n\n" + exit 1 +fi + +# starts the tor process + +tor --quiet -f $torrcLoc& diff --git a/src/resources/torrcTemplate.txt b/src/resources/torrcTemplate.txt index d23ed0b..20b2efa 100644 --- a/src/resources/torrcTemplate.txt +++ b/src/resources/torrcTemplate.txt @@ -4,7 +4,7 @@ # - run 'pkill -sighup tor' # - restart tor # -# Descriptions of all of these configuraiton attibutes (and many more) are +# Descriptions of all of these configuration attributes (and many more) are # available in the tor man page. [IF SHUTDOWN] @@ -14,15 +14,16 @@ [END IF] [NEWLINE] +DataDirectory [DATA_DIR] # location to store runtime data +Log [LOG_ENTRY] # location to log notices, warnings, and errors ControlPort 9052 # port controllers can connect to CookieAuthentication 1 # method for controller authentication -Log [LOG_ENTRY] # location to log notices, warnings, and errors [IF RELAY | EXIT | BRIDGE] RunAsDaemon 1 # runs as a background process [IF LOWPORTS] - User tor-arm # lowers our permissions to this user + User [USERNAME] # lowers our permissions to this user [END IF] [END IF] [NEWLINE] diff --git a/src/settings.cfg b/src/settings.cfg index c6d483d..7e13d19 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -447,7 +447,7 @@ wizard.description.opt Notify => Sends automated email notifications to the abov wizard.description.opt Bandwidth => Limit for the average rate at which you relay traffic. wizard.description.opt Limit => Maximum amount of traffic to relay each month. Some ISPs, like Comcast, cap their customer's Internet usage so this is an easy way of staying below that limit. wizard.description.opt Client => Enable this if you would like to use Tor yourself. This opens or closes the SOCKS port used by applications for connecting to Tor. -wizard.description.opt Lowports => Relays using port 443 rather than 9001. This helps some users that would otherwise be blocked, but requires that tor is started with root permissions (after that it lowers itself to those of a 'tor-arm' user). +wizard.description.opt Lowports => Relays using port 443 rather than 9001. This helps some users that would otherwise be blocked, but requires that tor is started with root permissions (after that it lowers itself to those of the current user). wizard.description.opt Portforward => If needed, attempts NAT traversal using UPnP and NAT-PMP. This allows for automatic port forwarding on most home routers. wizard.description.opt Startup => Runs Tor in the background when the system starts. wizard.description.opt Rshutdown => When you quit arm the Tor process is stopped thirty seconds later. This delay is so people using you can gracefully switch their circuits.

1 0

[arm/release] fix: instructions for root tor setup truncated
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit cc4b1a801a8e5434e429c8f49781917891bf9510 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 13 00:47:09 2011 -0700 fix: instructions for root tor setup truncated The default configuration had a limit that cropped part of the root tor setup instructions. --- armrc.sample | 2 +- src/cli/logPanel.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/armrc.sample b/armrc.sample index 0a7b0e1..1edd024 100644 --- a/armrc.sample +++ b/armrc.sample @@ -90,7 +90,7 @@ features.allowDetachedStartup true features.log.showDateDividers true features.log.showDuplicateEntries false features.log.entryDuration 7 -features.log.maxLinesPerEntry 4 +features.log.maxLinesPerEntry 6 features.log.prepopulate true features.log.prepopulateReadLimit 5000 features.log.maxRefreshRate 300 diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 6da0901..2e0d038 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -44,7 +44,7 @@ DEFAULT_CONFIG = {"features.logFile": "", "features.log.showDateDividers": True, "features.log.showDuplicateEntries": False, "features.log.entryDuration": 7, - "features.log.maxLinesPerEntry": 4, + "features.log.maxLinesPerEntry": 6, "features.log.prepopulate": True, "features.log.prepopulateReadLimit": 5000, "features.log.maxRefreshRate": 300,

1 0

[arm/release] The mass gtk cleanup.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit d79a8eb1aeb1d08ed0f23b2df0ad6f89b8997634 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 14 15:12:30 2011 +0500 The mass gtk cleanup. Add toolbar, move "sticky" panel to the notebook (the application looks much more consistent this way), add about dialog and fix various width/height issues. --- src/gui/arm.xml | 327 ++++++++++++++------------------------- src/gui/controller.py | 17 ++- src/gui/generalPanel.py | 123 +++++++++++++++ src/gui/graphing/graphStats.py | 2 + src/gui/stickyPanel.py | 123 --------------- 5 files changed, 257 insertions(+), 335 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index f71d0b7..edcc42a 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -2,7 +2,7 @@ <interface> <requires lib="gtk+" version="2.16"/>  - <object class="GtkListStore" id="liststore_sticky"> + <object class="GtkListStore" id="liststore_general"> <columns>  <column type="gchararray"/> @@ -100,46 +100,10 @@ <object class="GtkMenu" id="menu_file"> <property name="visible">True</property> <child> - <object class="GtkImageMenuItem" id="imagemenuitem_new"> - <property name="label">gtk-new</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_open"> - <property name="label">gtk-open</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_save"> - <property name="label">gtk-save</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_saveas"> - <property name="label">gtk-save-as</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separatormenuitem_file"> - <property name="visible">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_exit"> + <object class="GtkImageMenuItem" id="imagemenuitem_quit"> <property name="label">gtk-quit</property> <property name="visible">True</property> + <property name="related_action">action_quit</property> <property name="use_underline">True</property> <property name="use_stock">True</property> </object> @@ -149,57 +113,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="menuitem_edit"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Edit</property> - <property name="use_underline">True</property> - <child type="submenu"> - <object class="GtkMenu" id="menu_edit"> - <property name="visible">True</property> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_cut"> - <property name="label">gtk-cut</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_copy"> - <property name="label">gtk-copy</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_paste"> - <property name="label">gtk-paste</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_delete"> - <property name="label">gtk-delete</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkMenuItem" id="menuitem_view"> - <property name="visible">True</property> - <property name="label" translatable="yes">_View</property> - <property name="use_underline">True</property> - </object> - </child> - <child> <object class="GtkMenuItem" id="menuitem_help"> <property name="visible">True</property> <property name="label" translatable="yes">_Help</property> @@ -211,6 +124,7 @@ <object class="GtkImageMenuItem" id="imagemenuitem_about"> <property name="label">gtk-about</property> <property name="visible">True</property> + <property name="related_action">action_about</property> <property name="use_underline">True</property> <property name="use_stock">True</property> </object> @@ -231,13 +145,48 @@ <property name="can_focus">True</property> <property name="orientation">vertical</property> <child> - <object class="GtkHPaned" id="hpaned_main"> - <property name="height_request">300</property> + <object class="GtkVBox" id="vbox_notebook"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkToolbar" id="toolbar_main"> + <property name="visible">True</property> + <child> + <object class="GtkToolButton" id="toolbutton_about"> + <property name="visible">True</property> + <property name="related_action">action_about</property> + <property name="use_action_appearance">True</property> + <property name="label" translatable="yes">About</property> + <property name="use_underline">True</property> + <property name="stock_id">gtk-about</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="toolbutton_quit"> + <property name="visible">True</property> + <property name="related_action">action_quit</property> + <property name="use_action_appearance">True</property> + <property name="label" translatable="yes">Quit</property> + <property name="use_underline">True</property> + <property name="stock_id">gtk-quit</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkNotebook" id="notebook_main"> - <property name="width_request">300</property> <property name="visible">True</property> <property name="can_focus">True</property> <child> @@ -461,81 +410,44 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox_config"> + <object class="GtkScrolledWindow" id="scrolledwindow_general"> <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="label_config_top"> - <property name="visible">True</property> - <property name="label" translatable="yes">RelayBandwidthBurst (General Option) -Value: 0 B (default, DataSize, usage: N bytes|KB|MB|GB|TB) -Description: Limit the maximum token bucket size (also known as -the burst) for relayed traffic to the given number of bytes in -each direction. (Default: 0) </property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow_config"> + <object class="GtkTreeView" id="treeview_general"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> + <property name="model">liststore_general</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <property name="rules_hint">True</property> + <property name="search_column">0</property> <child> - <object class="GtkTreeView" id="treeview_config"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">liststore_config</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> - <property name="search_column">0</property> + <object class="GtkTreeViewColumn" id="treeviewcolumn_general_key"> + <property name="title">column</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_key"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_config_key"/> - <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext_general_key"/> + <attributes> + <attribute name="markup">0</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_general_value"> + <property name="title">column</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_value"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_config_value"/> - <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">1</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_desc"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_config_desc"/> - <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">2</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext_general_value"/> + <attributes> + <attribute name="foreground">2</attribute> + <attribute name="markup">1</attribute> + </attributes> </child> </object> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -543,9 +455,9 @@ each direction. (Default: 0) </property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="label_notebook_config"> + <object class="GtkLabel" id="label_general"> <property name="visible">True</property> - <property name="label" translatable="yes">Configuration</property> + <property name="label" translatable="yes">General</property> </object> <packing> <property name="position">2</property> @@ -554,54 +466,7 @@ each direction. (Default: 0) </property> </child> </object> <packing> - <property name="resize">True</property> - <property name="shrink">False</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow_sticky"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTreeView" id="treeview_sticky"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">liststore_sticky</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> - <property name="rules_hint">True</property> - <property name="search_column">0</property> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_key"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_sticky_key"/> - <attributes> - <attribute name="markup">0</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_value"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_sticky_value"/> - <attributes> - <attribute name="foreground">2</attribute> - <attribute name="markup">1</attribute> - </attributes> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="resize">True</property> - <property name="shrink">False</property> + <property name="position">1</property> </packing> </child> </object> @@ -612,7 +477,6 @@ each direction. (Default: 0) </property> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow_log"> - <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> @@ -622,10 +486,13 @@ each direction. (Default: 0) </property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="model">liststore_log</property> + <property name="headers_clickable">False</property> <property name="rules_hint">True</property> + <property name="search_column">0</property> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_log_timestamp"> <property name="title">Time</property> + <property name="clickable">True</property> <property name="sort_indicator">True</property> <property name="sort_order">descending</property> <property name="sort_column_id">1</property> @@ -666,7 +533,7 @@ each direction. (Default: 0) </property> </child> </object> <packing> - <property name="resize">True</property> + <property name="resize">False</property> <property name="shrink">False</property> </packing> </child> @@ -678,4 +545,46 @@ each direction. (Default: 0) </property> </object> </child> </object> + <object class="GtkAboutDialog" id="aboutdialog"> + <property name="border_width">5</property> + <property name="type_hint">normal</property> + <property name="program_name">garm</property> + <property name="version">0.1</property> + <property name="copyright" translatable="yes">Copyright (C) 2011 Kamran Riaz Khan</property> + <property name="website">http://inspirated.com/</property> + <property name="website_label" translatable="yes">Blog</property> + <signal name="response" handler="on_aboutdialog_response"/> + <child internal-child="vbox"> + <object class="GtkVBox" id="aboutdialog_vbox"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="aboutdialog_action_area"> + <property name="visible">True</property> + <property name="layout_style">end</property> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkAction" id="action_quit"> + <property name="label">Quit</property> + <property name="short_label">Quit</property> + <property name="tooltip">Quit</property> + <property name="stock_id">gtk-quit</property> + <signal name="activate" handler="on_action_quit_activate"/> + </object> + <object class="GtkAction" id="action_about"> + <property name="label">About</property> + <property name="short_label">About</property> + <property name="tooltip">About</property> + <property name="stock_id">gtk-about</property> + <signal name="activate" handler="on_action_about_activate"/> + </object> </interface> diff --git a/src/gui/controller.py b/src/gui/controller.py index 854e388..5736def 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, stickyPanel +from gui import logPanel, generalPanel from gui.graphing import bandwidthStats gobject.threads_init() @@ -29,8 +29,8 @@ class GuiController: self.connPanel.pack_widgets() self.connPanel.start() - self.stickyPanel = stickyPanel.StickyPanel(self.builder) - self.stickyPanel.pack_widgets() + self.generalPanel = generalPanel.GeneralPanel(self.builder) + self.generalPanel.pack_widgets() def run(self): window = self.builder.get_object('window_main') @@ -38,6 +38,17 @@ class GuiController: window.show_all() gtk.main() + def on_action_about_activate(self, widget, data=None): + dialog = self.builder.get_object('aboutdialog') + dialog.run() + + def on_aboutdialog_response(self, widget, responseid, data=None): + dialog = self.builder.get_object('aboutdialog') + dialog.hide() + + def on_action_quit_activate(self, widget, data=None): + gtk.main_quit() + def on_window_main_delete_event(self, widget, data=None): gtk.main_quit() diff --git a/src/gui/generalPanel.py b/src/gui/generalPanel.py new file mode 100644 index 0000000..b16cac5 --- /dev/null +++ b/src/gui/generalPanel.py @@ -0,0 +1,123 @@ +""" +General 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 GeneralPanel(CliHeaderPanel): + def __init__(self, builder): + CliHeaderPanel.__init__(self, None, time.time()) + + self.builder = builder + self.filled = False + + 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() + + liststore = self.builder.get_object('liststore_general') + 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 (%s)" % (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 (%s)" % (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() + diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index 250503d..c7d24bb 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -46,6 +46,8 @@ class GraphStats(TorCtl.PostEventListener): def _pack_graph_widget(self, name): graph = CaGraph() + graph.set_size_request(200, 200) + placeholder = self.builder.get_object('placeholder_graph_%s' % name) placeholder.pack_start(graph) diff --git a/src/gui/stickyPanel.py b/src/gui/stickyPanel.py deleted file mode 100644 index 145c452..0000000 --- a/src/gui/stickyPanel.py +++ /dev/null @@ -1,123 +0,0 @@ -""" -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 - self.filled = False - - 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() - - 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 (%s)" % (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 (%s)" % (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() -

1 0

[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