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

[arm/release] Configuration for the Reduced Exit Policy
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit d378c535e5b5d24424a872f9cfdb94e6e56b10a1 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 28 21:06:05 2011 -0700 Configuration for the Reduced Exit Policy Adding config attributes for exit policy selection in the setup wizard. The default policy is copied from: https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy --- src/settings.cfg | 143 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 132 insertions(+), 11 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 435a4d2..c945a34 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -521,7 +521,7 @@ port.label.69 TFTP port.label.70 Gopher port.label.79 Finger port.label.80 HTTP -port.label.81 Torpark +port.label.81 HTTP Alternate port.label.82 Torpark port.label.83 MIT ML port.label.88 Kerberos @@ -589,7 +589,7 @@ port.label.427 SLP port.label.443 HTTPS port.label.444 SNPP port.label.445 SMB -port.label.464 Kerberos +port.label.464 Kerberos (kpasswd) port.label.465 SMTP port.label.475 tcpnethaspsrv port.label.497 Retrospect @@ -612,8 +612,8 @@ port.label.532 netnews port.label.533 netwall port.label.540 UUCP port.label.542 commerce -port.label.543 klogin -port.label.544 klogin +port.label.543 Kerberos (klogin) +port.label.544 Kerberos (kshell) port.label.545 OSISoft PI port.label.546 DHCPv6 port.label.547 DHCPv6 @@ -659,7 +659,7 @@ port.label.706 SILC port.label.711 MPLS port.label.712 TBRPF port.label.720 SMQP -port.label.749 Kerberos +port.label.749 Kerberos (admin) port.label.750 rfile port.label.751 pump port.label.752 qrh @@ -675,17 +675,16 @@ port.label.860 iSCSI port.label.873 rsync port.label.888 CDDB port.label.901 SWAT -port.label.902 VMware -port.label.903 VMware -port.label.904 VMware +port.label.902-904 VMware port.label.911 NCA port.label.953 DNS RNDC -port.label.981 SofaWare +port.label.981 SofaWare Firewall port.label.989 FTPS port.label.990 FTPS port.label.991 NAS port.label.992 Telnet port.label.993 IMAPS +port.label.994 IRC port.label.995 POP3S port.label.999 ScimoreDB port.label.1001 JtoMB @@ -704,24 +703,38 @@ port.label.1270 SCOM port.label.1293 IPSec port.label.1433 MSSQL port.label.1434 MSSQL +port.label.1500 NetGuard port.label.1503 MSN port.label.1512 WINS port.label.1521 Oracle port.label.1526 Oracle +port.label.1533 Sametime port.label.1666 Perforce +port.label.1677 GroupWise +port.label.1723 PPTP port.label.1725 Steam port.label.1863 MSNP port.label.2049 NFS +port.label.2082 Infowave +port.label.2083 radsec port.label.2086 GNUnet +port.label.2087 ELI +port.label.2095 NBX SER +port.label.2096 NBX DIR +port.label.2102-2104 Zephyr port.label.2401 CVS port.label.2525 SMTP port.label.2710 BitTorrent port.label.3074 XBox LIVE port.label.3101 BlackBerry +port.label.3128 SQUID port.label.3306 MySQL +port.label.3389 WBT port.label.3690 SVN port.label.3723 Battle.net port.label.3724 WoW +port.label.4321 RWHOIS +port.label.4643 Virtuozzo port.label.4662 eMule port.label.5003 FileMaker port.label.5050 Yahoo IM @@ -730,6 +743,7 @@ port.label.5061 SIP port.label.5190 AIM/ICQ port.label.5222 Jabber port.label.5223 Jabber +port.label.5228 Android Market port.label.5269 Jabber port.label.5298 Jabber port.label.5432 PostgreSQL @@ -745,15 +759,122 @@ port.label.6660-6669 IRC port.label.6679 IRC port.label.6697 IRC port.label.6881-6999 BitTorrent -port.label.8008 HTTP +port.label.8000 iRDMI +port.label.8008 HTTP Alternate port.label.8010 XMPP -port.label.8080 Tomcat +port.label.8074 Gadu-Gadu +port.label.8080 HTTP Proxy +port.label.8087 SPP +port.label.8088 Radan HTTP port.label.8118 Privoxy port.label.8123 Polipo +port.label.8443 PCsync HTTPS +port.label.8888 NewsEDGE port.label.9030 Tor port.label.9050 Tor port.label.9051 Tor +port.label.9418 Git +port.label.9999 distinct +port.label.10000 Webmin +port.label.19294 Google Voice +port.label.19638 Ensim port.label.23399 Skype port.label.30301 BitTorrent port.label.33434 traceroute +# Exit policy categories and attributes used by the relay setup wizard. The +# full policy is the Reduced Exit Policy, revision 9 (edited 6/28/11): +# https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy?version… + +port.exit.misc 20-23 # FTP, SSH, Telnet +port.exit.misc 43 # WHOIS +port.exit.all 53 # DNS +port.exit.misc 79 # Finger +port.exit.web 80 # HTTP +port.exit.web 81 # HTTP alternate? +port.exit.misc 88 # Kerberos +port.exit.mail 110 # POP3 +port.exit.mail 143 # IMAP +port.exit.im 194 # IRC +port.exit.mail 220 # IMAP3 +port.exit.web 443 # HTTPS +port.exit.misc 464 # Kerberos +port.exit.im 531 # AIM/IRC +port.exit.misc 543-544 # Kerberos +port.exit.misc 563 # NNTPS +port.exit.im 706 # SILC +port.exit.misc 749 # Kerberos +port.exit.misc 873 # rsync +port.exit.misc 902-904 # VMware +port.exit.misc 981 # SofaWare Firewall Administration +port.exit.misc 989-990 # FTPS +port.exit.misc 991 # NAS +port.exit.misc 992 # Telnet +port.exit.misc 993 # IMAPS +port.exit.im 994 # IRC over SSL +port.exit.misc 995 # POP3S +port.exit.misc 1194 # OpenVPN +port.exit.misc 1220 # QuickTime +port.exit.misc 1293 # PKT-KRB-IPSec +port.exit.misc 1500 # NetGuard GuardianPro Firewall Administration / VLSI License Manager +port.exit.im 1533 # Sametime +port.exit.im 1677 # GroupWise +port.exit.misc 1723 # Microsoft Point-to-Point Tunneling Protocol +port.exit.misc 1863 # MSNP +port.exit.misc 2082 # Infowave Mobility Server +port.exit.misc 2083 # Secure Radius Service +port.exit.misc 2086 # GNUnet +port.exit.misc 2087 # Event Logging Integration +port.exit.misc 2095-2096 # NBX SER / DIR +port.exit.im 2102-2104 # Zephyr +port.exit.web 3128 # Squid Proxy +port.exit.misc 3389 # Windows Based Terminal +port.exit.misc 3690 # SVN +port.exit.misc 4321 # RWHOIS +port.exit.misc 4643 # Virtuozzo Power Panel +port.exit.im 5050 # Yahoo IM +port.exit.im 5190 # AIM/ICQ +port.exit.im 5222 # Jabber +port.exit.im 5223 # Jabber over SSL +port.exit.misc 5228 # Android Market +port.exit.misc 5900 # VNC +port.exit.im 6660-6669 # IRC +port.exit.im 6679 # IRC over SSL +port.exit.im 6697 # IRC over SSL +port.exit.misc 8000 # Intel Remote Desktop Management Interface +port.exit.web 8008 # HTTP alternate +port.exit.im 8074 # Gadu-Gadu +port.exit.web 8080 # HTTP Proxies +port.exit.misc 8087 # Simplify Media SPP Protocol +port.exit.misc 8088 # Radan HTTP +port.exit.misc 8443 # PCsync HTTPS +port.exit.misc 8888 # NewsEDGE +port.exit.misc 9418 # Git +port.exit.misc 9999 # distinct +port.exit.misc 10000 # Web-based Linux admin tool +port.exit.misc 19294 # Google Voice +port.exit.misc 19638 # Ensim Control Panel + +# Commonly encrypted ports (used to allow for policies that only include +# encrypted traffic) + +port.encrypted 22 +port.encrypted 88 +port.encrypted 443 +port.encrypted 464 +port.encrypted 543 +port.encrypted 544 +port.encrypted 563 +port.encrypted 749 +port.encrypted 981 +port.encrypted 989 +port.encrypted 990 +port.encrypted 1194 +port.encrypted 1293 +port.encrypted 1723 +port.encrypted 2083 +port.encrypted 5223 +port.encrypted 6679 +port.encrypted 6697 +port.encrypted 8443 +

1 0

[arm/release] Adding wizard option for port forwarding
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit b8101c830699b2c931c30e8a0fdaa10ca8e34d3d Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 28 08:52:35 2011 -0700 Adding wizard option for port forwarding Wizard option for the PortForwarding config option. This will need to be omitted if... - "tor-fw-helper" doesn't exist in the user's PATH - tor doesn't have the PortForwarding option (introduced in 0.2.3.1-alpha) --- src/cli/wizard.py | 4 +++- src/settings.cfg | 4 ++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index d2fb067..7a9eaa0 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -15,13 +15,14 @@ from util import enum, uiTools RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") # all options that can be configured -Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT") +Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT") RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.CONTACT, Options.NOTIFY, Options.BANDWIDTH, Options.LIMIT, Options.CLIENT, + Options.PORTFORWARD, Options.STARTUP), RelayType.EXIT: (Options.NICKNAME, Options.CONTACT, @@ -29,6 +30,7 @@ RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.BANDWIDTH, Options.LIMIT, Options.CLIENT, + Options.PORTFORWARD, Options.STARTUP, Options.DIVIDER, Options.NOTICE, diff --git a/src/settings.cfg b/src/settings.cfg index 0ab57a2..435a4d2 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -347,6 +347,7 @@ wizard.message.exit Exits connect between the Tor network and the outside Intern wizard.toggle Notify => Yes, No wizard.toggle Client => Enabled, Disabled +wizard.toggle Portforward => Enabled, Disabled wizard.toggle Startup => Yes, No wizard.toggle Notice => Yes, No wizard.toggle Policy => Default, Custom @@ -367,6 +368,7 @@ wizard.default Notify => true wizard.default Bandwidth => 5 MB/s wizard.default Startup => true wizard.default Client => false +wizard.default Portforward => true wizard.default Notice => true wizard.default Policy => true wizard.default Websites => true @@ -388,6 +390,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 Portforward => Port Forwarding wizard.label.opt Startup => Run At Startup wizard.label.opt Notice => Disclaimer Notice wizard.label.opt Policy => Exit Policy @@ -408,6 +411,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 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 Notice => Provides a disclaimer that this is an exit on port 80 (http://www.atagar.com/exitNotice) wizard.description.opt Policy => Ports allowed to exit from your relay. The default policy allows for common services while limiting the chance of getting a DMCA takedown for torrent traffic (http://www.atagar.com/exitPolicy)

1 0

[arm/release] fix: cagraph was being imported when running cli
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 69ffa459a30c0a5b3fb69150b3f593645abb1be8 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 28 10:20:50 2011 -0700 fix: cagraph was being imported when running cli The cagraph dependency should only be needed if we're running the gui. However, an import for it accidently slipped in, causing import errors for arm's cli users. --- src/starter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index 104e0e2..005b43f 100644 --- a/src/starter.py +++ b/src/starter.py @@ -17,7 +17,6 @@ import platform import version import cli.controller import cli.logPanel -import gui.controller import util.conf import util.connections import util.hostnames @@ -436,6 +435,7 @@ if __name__ == '__main__': locale.setlocale(locale.LC_ALL, "") if launchGui == True: + import gui.controller gui.controller.startGui() else: cli.controller.startTorMonitor(time.time() - initTime)

1 0

[arm/release] Moved cagraph packing from controller to graphing.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit afeb960aa3d3e7f2d80e648fd837c53298ce55ae Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jun 19 12:44:37 2011 +0500 Moved cagraph packing from controller to graphing. --- src/gui/controller.py | 49 ++-------------------------------- src/gui/graphing/bandwidthStats.py | 4 +- src/gui/graphing/graphStats.py | 51 +++++++++++++++++++++++++++++++++-- 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py index 7f85b9a..4da82c9 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -2,13 +2,7 @@ import gobject import gtk from util import torTools -from gui.graphing import graphStats, bandwidthStats - -from cagraph.ca_graph import CaGraph -from cagraph.axis.xaxis import CaGraphXAxis -from cagraph.axis.yaxis import CaGraphYAxis -from cagraph.ca_graph_grid import CaGraphGrid -from cagraph.series.area import CaGraphSeriesArea +from gui.graphing import bandwidthStats gobject.threads_init() @@ -20,18 +14,8 @@ class GuiController: self.builder.add_from_file(filename) self.builder.connect_signals(self) - # for custom widgets not present in builder xml - self.widgets = {} - - self._pack_graph_widget('primary') - self._pack_graph_widget('secondary') - - self.bwStats = bandwidthStats.BandwidthStats(self.builder, self.widgets) - - gobject.timeout_add(1000, self.bwStats.draw_graph, 'primary') - gobject.timeout_add(1000, self.bwStats.draw_graph, 'secondary') - gobject.timeout_add(1000, self.bwStats.update_labels, 'primary') - gobject.timeout_add(1000, self.bwStats.update_labels, 'secondary') + self.bwStats = bandwidthStats.BandwidthStats(self.builder) + self.bwStats.pack_widgets() def run(self): window = self.builder.get_object('window_main') @@ -47,33 +31,6 @@ class GuiController: def on_window_main_delete_event(self, widget, data=None): gtk.main_quit() - def _pack_graph_widget(self, name): - graph = CaGraph() - placeholder = self.builder.get_object('placeholder_graph_%s' % name) - placeholder.pack_start(graph) - - xaxis = CaGraphXAxis(graph) - yaxis = CaGraphYAxis(graph) - - xaxis.min = 0 - xaxis.max = graphStats.GRAPH_INTERVAL - 1 - xaxis.axis_style.draw_labels = False - - graph.axiss.append(xaxis) - graph.axiss.append(yaxis) - - series = CaGraphSeriesArea(graph, 0, 1) - - line_colors = {'primary' : (1.0, 0.0, 1.0, 1.0), 'secondary' : (0.0, 1.0, 0.0, 1.0)} - fill_colors = {'primary' : (1.0, 0.0, 1.0, 0.3), 'secondary' : (0.0, 1.0, 0.0, 0.3)} - series.style.line_color = line_colors[name] - series.style.fill_color = fill_colors[name] - - graph.seriess.append(series) - graph.grid = CaGraphGrid(graph, 0, 1) - - self.widgets['graph_%s' % name] = graph - def startGui(): controller = GuiController() controller.run() diff --git a/src/gui/graphing/bandwidthStats.py b/src/gui/graphing/bandwidthStats.py index a8278d8..401302c 100644 --- a/src/gui/graphing/bandwidthStats.py +++ b/src/gui/graphing/bandwidthStats.py @@ -12,8 +12,8 @@ from gui.graphing import graphStats from util import uiTools, torTools class BandwidthStats(graphStats.GraphStats): - def __init__(self, builder, widgets): - graphStats.GraphStats.__init__(self, builder, widgets) + def __init__(self, builder): + graphStats.GraphStats.__init__(self, builder) conn = torTools.getConn() if not conn.isAlive(): diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index c000ff4..fcd326f 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -13,15 +13,21 @@ import gtk from TorCtl import TorCtl from util import uiTools, torTools +from cagraph.ca_graph import CaGraph +from cagraph.axis.xaxis import CaGraphXAxis +from cagraph.axis.yaxis import CaGraphYAxis +from cagraph.ca_graph_grid import CaGraphGrid +from cagraph.series.area import CaGraphSeriesArea + GRAPH_INTERVAL = 30 class GraphStats(TorCtl.PostEventListener): - def __init__(self, builder, widgets): + def __init__(self, builder): TorCtl.PostEventListener.__init__(self) self.builder = builder - self.widgets = widgets + self.graphs = { 'primary' : None, 'secondary' : None } self.data = { 'primary' : deque([0.0] * GRAPH_INTERVAL), 'secondary' : deque([0.0] * GRAPH_INTERVAL)} @@ -29,6 +35,45 @@ class GraphStats(TorCtl.PostEventListener): self.total = {'primary': 0.0, 'secondary' : 0.0} self.ticks = {'primary': 0, 'secondary' : 0} + def pack_widgets(self): + self._pack_graph_widget('primary') + self._pack_graph_widget('secondary') + + gobject.timeout_add(1000, self.draw_graph, 'primary') + gobject.timeout_add(1000, self.draw_graph, 'secondary') + gobject.timeout_add(1000, self.update_labels, 'primary') + gobject.timeout_add(1000, self.update_labels, 'secondary') + + def _pack_graph_widget(self, name): + graph = CaGraph() + placeholder = self.builder.get_object('placeholder_graph_%s' % name) + placeholder.pack_start(graph) + + xaxis = CaGraphXAxis(graph) + yaxis = CaGraphYAxis(graph) + + xaxis.min = 0 + xaxis.max = GRAPH_INTERVAL - 1 + xaxis.axis_style.draw_labels = False + yaxis.axis_style.label_color = (0, 0, 0) + + graph.axiss.append(xaxis) + graph.axiss.append(yaxis) + + series = CaGraphSeriesArea(graph, 0, 1) + + line_colors = {'primary' : (1.0, 0.0, 1.0, 1.0), 'secondary' : (0.0, 1.0, 0.0, 1.0)} + fill_colors = {'primary' : (1.0, 0.0, 1.0, 0.3), 'secondary' : (0.0, 1.0, 0.0, 0.3)} + series.style.line_color = line_colors[name] + series.style.fill_color = fill_colors[name] + + graph.seriess.append(series) + graph.grid = CaGraphGrid(graph, 0, 1) + + self.graphs[name] = graph + + return graph + def get_graph_data(self, name): packed_data = [] @@ -42,7 +87,7 @@ class GraphStats(TorCtl.PostEventListener): return len(data) == map(int, data).count(0) def draw_graph(self, name): - graph = self.widgets['graph_%s' % name] + graph = self.graphs[name] data = self.get_graph_data(name) if self.is_graph_data_zero(name):

1 0

[arm/release] fix: config panel handling for reattachment
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 487c6effbecc0e6415aa865547acce58f13e9c56 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 19 14:14:55 2011 -0700 fix: config panel handling for reattachment When arm's connected to a new tor instance the current config options are replaced with those of the new instance. This addresses a couple issues we previously had... 1. if arm was initially detached then when connected to an instance the config panel would still be blank 2. if tor was shut down and we were then reattached to a different version (with different config options) we'd still display the old set --- src/cli/configPanel.py | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index 913bc39..33cec34 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -190,6 +190,7 @@ class ConfigPanel(panel.Panel): self.configType = configType self.confContents = [] + self.confImportantContents = [] self.scroller = uiTools.Scroller(True) self.valsLock = threading.RLock() @@ -197,6 +198,28 @@ class ConfigPanel(panel.Panel): # the 'important' flag are shown self.showAll = False + # initializes config contents if we're connected + conn = torTools.getConn() + conn.addStatusListener(self.resetListener) + + if conn.isAlive(): + self.resetListener(conn, torTools.State.INIT) + + def resetListener(self, conn, eventType): + # fetches configuration options if a new instance, otherewise keeps our + # current contents + + if eventType == torTools.State.INIT: + self._loadConfigOptions() + + def _loadConfigOptions(self): + """ + Fetches the configuration options available from tor or arm. + """ + + self.confContents = [] + self.confImportantContents = [] + if self.configType == State.TOR: conn, configOptionLines = torTools.getConn(), [] customOptions = torConfig.getCustomOptions()

1 0

[arm/release] Optional detached startup
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 64c9fae2b7f4dfa70db19e7ed1d7e187cd9ff09c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 19 13:10:30 2011 -0700 Optional detached startup This is adding a config option that allows us to run arm when there's no Tor instance to connect to. This is a prerequisite for both a relay setup wizard and arbitrary reattachability. Arm was written with the expectation that there was a controller instance while starting up. This commit fixes most of the obvious crashing issues, but this is still gonna take some work to address instability for detached startups. --- armrc.sample | 4 ++++ src/cli/configPanel.py | 10 +++++++--- src/cli/connections/connPanel.py | 2 +- src/cli/controller.py | 2 +- src/cli/graphing/bandwidthStats.py | 2 +- src/cli/graphing/connStats.py | 2 +- src/cli/headerPanel.py | 4 ++-- src/cli/torrcPanel.py | 2 +- src/starter.py | 7 ++++--- src/util/torConfig.py | 22 +++++++++++++--------- src/util/torTools.py | 13 +++++++------ 11 files changed, 42 insertions(+), 28 deletions(-) diff --git a/armrc.sample b/armrc.sample index 54e3f7b..bfe8976 100644 --- a/armrc.sample +++ b/armrc.sample @@ -56,6 +56,10 @@ features.redrawRate 5 # Confirms promt to confirm when quiting if true features.confirmQuit true +# Allows arm to start when there's no running tor instance if true, otherwise +# we terminate right away. +features.allowDetachedStartup false + # Paremters for the log panel # --------------------------- # showDateDividers diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index fedf1f7..913bc39 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -198,9 +198,12 @@ class ConfigPanel(panel.Panel): self.showAll = False if self.configType == State.TOR: - conn = torTools.getConn() + conn, configOptionLines = torTools.getConn(), [] customOptions = torConfig.getCustomOptions() - configOptionLines = conn.getInfo("config/names", "").strip().split("\n") + configOptionQuery = conn.getInfo("config/names") + + if configOptionQuery: + configOptionLines = configOptionQuery.strip().split("\n") for line in configOptionLines: # lines are of the form "<option> <type>[ <documentation>]", like: @@ -484,7 +487,8 @@ class ConfigPanel(panel.Panel): cursorSelection = self.getSelection() isScrollbarVisible = len(self._getConfigOptions()) > height - detailPanelHeight - 1 - self._drawSelectionPanel(cursorSelection, width, detailPanelHeight, isScrollbarVisible) + if cursorSelection != None: + self._drawSelectionPanel(cursorSelection, width, detailPanelHeight, isScrollbarVisible) # draws the top label if self.isTitleVisible(): diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index edf5a14..161d6f6 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -90,7 +90,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): eventType - type of event detected """ - self._isTorRunning = eventType == torTools.State.INIT + self._isTorRunning = eventType in (torTools.State.INIT, torTools.State.RESET) if self._isTorRunning: self._haltTime = None else: self._haltTime = time.time() diff --git a/src/cli/controller.py b/src/cli/controller.py index feb7cf0..1fb52c9 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -435,7 +435,7 @@ def connResetListener(conn, eventType): resolver = connections.getResolver("tor") resolver.setPaused(eventType == torTools.State.CLOSED) - if eventType == torTools.State.INIT: + if eventType in (torTools.State.INIT, torTools.State.RESET): torPid = conn.getMyPid() if torPid and torPid != resolver.getPid(): diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index b92a58c..642790d 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -86,7 +86,7 @@ class BandwidthStats(graphPanel.GraphStats): self._titleStats = [] # force reset of title self.new_desc_event(None) # updates title params - if eventType == torTools.State.INIT and self._config["features.graph.bw.accounting.show"]: + if eventType in (torTools.State.INIT, torTools.State.RESET) and self._config["features.graph.bw.accounting.show"]: self.isAccounting = conn.getInfo('accounting/enabled') == '1' # redraws to reflect changes (this especially noticeable when we have diff --git a/src/cli/graphing/connStats.py b/src/cli/graphing/connStats.py index 7f0dc18..0df5db3 100644 --- a/src/cli/graphing/connStats.py +++ b/src/cli/graphing/connStats.py @@ -25,7 +25,7 @@ class ConnStats(graphPanel.GraphStats): return graphPanel.GraphStats.clone(self, newCopy) def resetListener(self, conn, eventType): - if eventType == torTools.State.INIT: + if eventType in (torTools.State.INIT, torTools.State.RESET): self.orPort = conn.getOption("ORPort", "0") self.dirPort = conn.getOption("DirPort", "0") self.controlPort = conn.getOption("ControlPort", "0") diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 7e0f639..733abad 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -65,7 +65,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self._config = dict(DEFAULT_CONFIG) if config: config.update(self._config) - self._isTorConnected = True + self._isTorConnected = torTools.getConn().isAlive() self._lastUpdate = -1 # time the content was last revised self._halt = False # terminates thread if true self._cond = threading.Condition() # used for pausing the thread @@ -405,7 +405,7 @@ class HeaderPanel(panel.Panel, threading.Thread): eventType - type of event detected """ - if eventType == torTools.State.INIT: + if eventType in (torTools.State.INIT, torTools.State.RESET): self._isTorConnected = True self._haltTime = None self._update(True) diff --git a/src/cli/torrcPanel.py b/src/cli/torrcPanel.py index f651785..2dc244f 100644 --- a/src/cli/torrcPanel.py +++ b/src/cli/torrcPanel.py @@ -53,7 +53,7 @@ class TorrcPanel(panel.Panel): eventType - type of event detected """ - if eventType == torTools.State.INIT: + if eventType in (torTools.State.INIT, torTools.State.RESET): try: torConfig.getTorrc().load(True) self.redraw(True) diff --git a/src/starter.py b/src/starter.py index d50c718..104e0e2 100644 --- a/src/starter.py +++ b/src/starter.py @@ -40,6 +40,7 @@ CONFIG = {"startup.controlPassword": None, "startup.blindModeEnabled": False, "startup.events": "N3", "startup.dataDirectory": "~/.arm", + "features.allowDetachedStartup": False, "features.config.descriptions.enabled": True, "features.config.descriptions.persist": True, "log.configDescriptions.readManPageSuccess": util.log.INFO, @@ -216,7 +217,7 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i # again prompting for the user to enter it print incorrectPasswordMsg return _torCtlConnect(controlAddr, controlPort) - else: + elif not CONFIG["features.allowDetachedStartup"]: print exc return None @@ -388,7 +389,7 @@ if __name__ == '__main__': authPassword = config.get("startup.controlPassword", CONFIG["startup.controlPassword"]) incorrectPasswordMsg = "Password found in '%s' was incorrect" % configPath conn = _torCtlConnect(controlAddr, controlPort, authPassword, incorrectPasswordMsg) - if conn == None: sys.exit(1) + if conn == None and not CONFIG["features.allowDetachedStartup"]: 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 @@ -410,7 +411,7 @@ if __name__ == '__main__': # skewing the startup time results so this isn't counted initTime = time.time() - startTime controller = util.torTools.getConn() - controller.init(conn) + if conn: controller.init(conn) # fetches descriptions for tor's configuration options _loadConfigurationDescriptions(pathPrefix) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 14ef4ce..a63eddb 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -178,9 +178,10 @@ def loadOptionDescriptions(loadPath = None, checkVersion = True): # Fetches all options available with this tor instance. This isn't # vital, and the validOptions are left empty if the call fails. conn, validOptions = torTools.getConn(), [] - configOptionQuery = conn.getInfo("config/names").strip().split("\n") + configOptionQuery = conn.getInfo("config/names") if configOptionQuery: - validOptions = [line[:line.find(" ")].lower() for line in configOptionQuery] + for line in configOptionQuery.strip().split("\n"): + validOptions.append(line[:line.find(" ")].lower()) optionCount, lastOption, lastArg = 0, None, None lastCategory, lastDescription = Category.GENERAL, "" @@ -343,14 +344,17 @@ def getMultilineParameters(): # 'Dependent'), and LINELIST_V (aka 'Virtual') types global MULTILINE_PARAM if MULTILINE_PARAM == None: - conn = torTools.getConn() - configOptionQuery = conn.getInfo("config/names", "").strip().split("\n") - - multilineEntries = [] - for line in configOptionQuery: - confOption, confType = line.strip().split(" ", 1) - if confType in ("LineList", "Dependant", "Virtual"): - multilineEntries.append(confOption) + conn, multilineEntries = torTools.getConn(), [] + + configOptionQuery = conn.getInfo("config/names") + if configOptionQuery: + for line in configOptionQuery.strip().split("\n"): + confOption, confType = line.strip().split(" ", 1) + if confType in ("LineList", "Dependant", "Virtual"): + multilineEntries.append(confOption) + else: + # unable to query tor connection, so not caching results + return () MULTILINE_PARAM = multilineEntries diff --git a/src/util/torTools.py b/src/util/torTools.py index 7ea140b..d1e5e9d 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -17,9 +17,10 @@ from TorCtl import TorCtl, TorUtil from util import enum, log, procTools, sysTools, uiTools # enums for tor's controller state: -# INIT - attached to a new controller or restart/sighup signal received +# INIT - attached to a new controller +# RESET - received a reset/sighup signal # CLOSED - control port closed -State = enum.Enum("INIT", "CLOSED") +State = enum.Enum("INIT", "RESET", "CLOSED") # Addresses of the default directory authorities for tor version 0.2.3.0-alpha # (this comes from the dirservers array in src/or/config.c). @@ -1068,7 +1069,7 @@ class Controller(TorCtl.PostEventListener): if myAddress: result = ExitPolicy("reject %s" % myAddress, result) else: # no ORPort is set so all relaying is disabled - result = ExitPolicy("reject *:*") + result = ExitPolicy("reject *:*", None) self.connLock.release() @@ -1469,11 +1470,11 @@ class Controller(TorCtl.PostEventListener): if self.isAlive(): self._isReset = True - self._status = State.INIT + self._status = State.RESET self._statusTime = time.time() if not NO_SPAWN: - self._notificationQueue.put(State.INIT) + self._notificationQueue.put(State.RESET) thread.start_new_thread(self._notifyStatusListeners, ()) self.connLock.release() @@ -2038,7 +2039,7 @@ class Controller(TorCtl.PostEventListener): eventType = self._notificationQueue.get(timeout=0) # checks that the notice is accurate for our current state - if self.isAlive() != (eventType == State.INIT): + if self.isAlive() != (eventType in (State.INIT, State.RESET)): eventType = None except Queue.Empty: eventType = None

1 0

[arm/release] fix: no initial connection resolution if detached
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 2df6e67526d94a05f4b1d43d172461d37770de73 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 19 14:24:44 2011 -0700 fix: no initial connection resolution if detached If arm starts up detached then pauses connection resolution until we have a tor instance to get connection results for. Otherwise we fail attempts, hit fallback logic, and quite possibly disable all connection resolution when we do really have an instance. --- src/cli/controller.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 1fb52c9..51fbe2b 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -482,7 +482,10 @@ def startTorMonitor(startTime): # use the tor pid to help narrow connection results torCmdName = sysTools.getProcessName(torPid, "tor") connections.getResolver(torCmdName, torPid, "tor") - else: connections.getResolver("tor") + else: + # constructs singleton resolver and, if tor isn't connected, initizes + # it to be paused + connections.getResolver("tor").setPaused(not conn.isAlive()) # hack to display a better (arm specific) notice if all resolvers fail connections.RESOLVER_FINAL_FAILURE_MSG += " (connection related portions of the monitor won't function)"

1 0

[arm/release] fix: skipping init actions that will fail
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 388abe5d8b31b9c735569dbe0728b54e6111ee30 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 19 15:11:54 2011 -0700 fix: skipping init actions that will fail When we start and are detached from tor many actions (bandwidth prepopulation and loading the torrc, for instance) will always fail. Skipping these actions if there's no tor instance to avoid pointless work and log messages. --- src/cli/configPanel.py | 4 +--- src/cli/controller.py | 11 ++--------- src/cli/torrcPanel.py | 14 ++++++++++++-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index 33cec34..d76a528 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -201,9 +201,7 @@ class ConfigPanel(panel.Panel): # initializes config contents if we're connected conn = torTools.getConn() conn.addStatusListener(self.resetListener) - - if conn.isAlive(): - self.resetListener(conn, torTools.State.INIT) + if conn.isAlive(): self.resetListener(conn, torTools.State.INIT) def resetListener(self, conn, eventType): # fetches configuration options if a new instance, otherewise keeps our diff --git a/src/cli/controller.py b/src/cli/controller.py index 51fbe2b..e20e023 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -110,7 +110,7 @@ def initController(stdscr, startTime): except ValueError: pass # invalid stats, maybe connections when in blind mode # prepopulates bandwidth values from state file - if CONFIG["features.graph.bw.prepopulate"]: + if CONFIG["features.graph.bw.prepopulate"] and torTools.getConn().isAlive(): isSuccessful = bwStats.prepopulateFromState() if isSuccessful: graphPanel.updateInterval = 4 @@ -461,7 +461,7 @@ def startTorMonitor(startTime): conn = torTools.getConn() torPid = conn.getMyPid() - if not torPid: + if not torPid and conn.isAlive(): msg = "Unable to determine Tor's pid. Some information, like its resource usage will be unavailable." log.log(CONFIG["log.unknownTorPid"], msg) @@ -490,13 +490,6 @@ def startTorMonitor(startTime): # hack to display a better (arm specific) notice if all resolvers fail connections.RESOLVER_FINAL_FAILURE_MSG += " (connection related portions of the monitor won't function)" - # loads the torrc and provides warnings in case of validation errors - try: - loadedTorrc = torConfig.getTorrc() - loadedTorrc.load(True) - loadedTorrc.logValidationIssues() - except IOError: pass - # provides a notice about any event types tor supports but arm doesn't missingEventTypes = cli.logPanel.getMissingEventTypes() diff --git a/src/cli/torrcPanel.py b/src/cli/torrcPanel.py index 2dc244f..c1bb3f9 100644 --- a/src/cli/torrcPanel.py +++ b/src/cli/torrcPanel.py @@ -42,7 +42,9 @@ class TorrcPanel(panel.Panel): self._lastContentHeightArgs = None # listens for tor reload (sighup) events - torTools.getConn().addStatusListener(self.resetListener) + conn = torTools.getConn() + conn.addStatusListener(self.resetListener) + if conn.isAlive(): self.resetListener(conn, torTools.State.INIT) def resetListener(self, conn, eventType): """ @@ -53,7 +55,15 @@ class TorrcPanel(panel.Panel): eventType - type of event detected """ - if eventType in (torTools.State.INIT, torTools.State.RESET): + if eventType == torTools.State.INIT: + # loads the torrc and provides warnings in case of validation errors + try: + loadedTorrc = torConfig.getTorrc() + loadedTorrc.load(True) + loadedTorrc.logValidationIssues() + self.redraw(True) + except: pass + elif eventType == torTools.State.RESET: try: torConfig.getTorrc().load(True) self.redraw(True)

1 0

[arm/release] fix: race condition between events and listeners
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit c73862469e55d361b1771e25efadaeacb9dc84aa Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 19 14:52:23 2011 -0700 fix: race condition between events and listeners Status events have a small pause to colless events, but this caused a race when starting arm with the addition of status listeners. Dropping the sleep when handling our first signal. --- src/util/torTools.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index d1e5e9d..c44160e 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -105,6 +105,10 @@ PRIVATE_IP_RANGES = ("0.0.0.0/8", "169.254.0.0/16", "127.0.0.0/8", "192.168.0.0/ NO_SPAWN = False +# Flag to indicate if we're handling our first init signal. This is for +# startup performance so we don't introduce a sleep while initializing. +IS_STARTUP_SIGNAL = True + def loadConfig(config): config.update(CONFIG) @@ -2027,11 +2031,15 @@ class Controller(TorCtl.PostEventListener): eventType - enum representing tor's new status """ + global IS_STARTUP_SIGNAL + # If there's a quick race state (for instance a sighup causing both an init # and close event) then give them a moment to enqueue. This way we can # coles the events and discard the inaccurate one. - time.sleep(0.2) + if not IS_STARTUP_SIGNAL: + time.sleep(0.2) + else: IS_STARTUP_SIGNAL = False self.connLock.acquire()

1 0

[arm/release] fix: dropping tor version if started disconnected
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 9757d781c0c2dfb6498e24626451385f5ecd7039 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 19 15:19:53 2011 -0700 fix: dropping tor version if started disconnected When we start without a tor instance it looks a little weird to display "Tor Unknown (Unknown)" in the header panel. Opting to leave this blank instead. --- src/cli/headerPanel.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 733abad..846c1db 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -173,12 +173,13 @@ class HeaderPanel(panel.Panel, threading.Thread): contentSpace = leftWidth - 43 if 7 + len(self.vals["tor/version"]) + len(self.vals["tor/versionStatus"]) <= contentSpace: - versionColor = VERSION_STATUS_COLORS[self.vals["tor/versionStatus"]] if \ - self.vals["tor/versionStatus"] in VERSION_STATUS_COLORS else "white" - labelPrefix = "Tor %s (" % self.vals["tor/version"] - self.addstr(0, 43, labelPrefix) - self.addstr(0, 43 + len(labelPrefix), self.vals["tor/versionStatus"], uiTools.getColor(versionColor)) - self.addstr(0, 43 + len(labelPrefix) + len(self.vals["tor/versionStatus"]), ")") + if self.vals["tor/version"] != "Unknown": + versionColor = VERSION_STATUS_COLORS[self.vals["tor/versionStatus"]] if \ + self.vals["tor/versionStatus"] in VERSION_STATUS_COLORS else "white" + labelPrefix = "Tor %s (" % self.vals["tor/version"] + self.addstr(0, 43, labelPrefix) + self.addstr(0, 43 + len(labelPrefix), self.vals["tor/versionStatus"], uiTools.getColor(versionColor)) + self.addstr(0, 43 + len(labelPrefix) + len(self.vals["tor/versionStatus"]), ")") elif 11 <= contentSpace: self.addstr(0, 43, uiTools.cropStr("Tor %s" % self.vals["tor/version"], contentSpace, 4))

1 0