- tor-commits - lists.torproject.org

[arm/master] Wizard option for relaying over low ports
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit ca124f16b2eee34624f61a54a763562019fc8aa8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 20:06:26 2011 -0700 Wizard option for relaying over low ports Option to use port 443 for relaying and 80 for directory mirroring rather than the more conventional 9001/9030. This will make a 'tor-arm' user if it doesn't already exist and use that for the torrc User entry. --- src/cli/wizard.py | 15 +++++++++++---- src/settings.cfg | 4 ++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 80d2fd1..8239487 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -9,19 +9,20 @@ import curses import cli.popups import cli.controller -from util import enum, connections, uiTools +from util import connections, enum, uiTools # basic configuration types we can run as RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") # all options that can be configured -Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT", "DISTRIBUTE", "BRIDGED", "BRIDGE1", "BRIDGE2", "BRIDGE3", "REUSE") +Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "LOWPORTS", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT", "DISTRIBUTE", "BRIDGED", "BRIDGE1", "BRIDGE2", "BRIDGE3", "REUSE") RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.CONTACT, Options.NOTIFY, Options.BANDWIDTH, Options.LIMIT, Options.CLIENT, + Options.LOWPORTS, Options.PORTFORWARD, Options.STARTUP), RelayType.EXIT: (Options.NICKNAME, @@ -30,6 +31,7 @@ RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.BANDWIDTH, Options.LIMIT, Options.CLIENT, + Options.LOWPORTS, Options.PORTFORWARD, Options.STARTUP, Options.DIVIDER, @@ -44,9 +46,9 @@ RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.BANDWIDTH, Options.LIMIT, Options.CLIENT, + Options.LOWPORTS, Options.PORTFORWARD, - Options.STARTUP - ), + Options.STARTUP), RelayType.CLIENT: (Options.BRIDGED, Options.BRIDGE1, Options.BRIDGE2, @@ -218,6 +220,11 @@ def showWizard(): config[Options.REUSE].setValidator(_circDurationValidator) # enables custom policies when 'custom' is selected and disables otherwise + lowPortsOpt = config[Options.LOWPORTS] + disclaimerNotice = [config[Options.NOTICE]] + lowPortsOpt.setValidator(functools.partial(_toggleEnabledAction, disclaimerNotice)) + _toggleEnabledAction(disclaimerNotice, lowPortsOpt, lowPortsOpt.getValue()) + policyOpt = config[Options.POLICY] customPolicies = [config[opt] for opt in CUSTOM_POLICIES] policyOpt.setValidator(functools.partial(_toggleEnabledAction, customPolicies)) diff --git a/src/settings.cfg b/src/settings.cfg index 7f2953f..53da315 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -349,6 +349,7 @@ wizard.message.client This will make use of the Tor network without contributing wizard.toggle Notify => Yes, No wizard.toggle Client => Enabled, Disabled +wizard.toggle Lowports => Yes, No wizard.toggle Portforward => Enabled, Disabled wizard.toggle Startup => Yes, No wizard.toggle Notice => Yes, No @@ -374,6 +375,7 @@ wizard.default Notify => true wizard.default Bandwidth => 5 MB/s wizard.default Startup => true wizard.default Client => false +wizard.default Lowports => true wizard.default Portforward => true wizard.default Notice => true wizard.default Policy => false @@ -404,6 +406,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 Portforward => Port Forwarding wizard.label.opt Startup => Run At Startup wizard.label.opt Notice => Disclaimer Notice @@ -431,6 +434,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 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)

1 0

[arm/master] Remove gobject timeout.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit ae45817503f817f7d97d41358315b516fc4222b8 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jun 25 15:08:54 2011 +0500 Remove gobject timeout. Gobject timeout works well for graphs but creates issues for selecting log rows. Instead, call fill_log() in constructor of panel and then subsequently on addition of each entry. --- src/gui/logPanel.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 0a00137..6ac6418 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -62,7 +62,7 @@ class LogPanel: conn.addEventListener(TorEventObserver(self.register_event)) conn.addTorCtlListener(self._register_torctl_event) - gobject.timeout_add(1000, self.fill_log) + self.fill_log() def pack_widgets(self): liststore = self.builder.get_object('liststore_log') @@ -79,10 +79,9 @@ class LogPanel: row = (long(entry.timestamp), timeLabel, entry.type, entry.msg, entry.color) liststore.append(row) - return True - def register_event(self, event): self.msgLog.appendleft(event) + self.fill_log() def _register_arm_event(self, level, msg, eventTime): eventColor = RUNLEVEL_EVENT_COLOR[level]

1 0

[arm/master] Fix CPU-hogging by limiting liststore update rate.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 872040aa5f084c54417375ac5016158c260a9b86 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jun 26 06:03:40 2011 +0500 Fix CPU-hogging by limiting liststore update rate. --- src/gui/logPanel.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index fc8e6b8..4e95db4 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -22,12 +22,15 @@ from cli.logPanel import (expandEvents, setEventListening, getLogFileEntries, RUNLEVEL_EVENT_COLOR = {log.DEBUG: "#C73043", log.INFO: "#762A2A", log.NOTICE: "#222222", log.WARN: "#AB7814", log.ERR: "#EC131F"} STARTUP_EVENTS = 'A' +REFRESH_RATE = 3 class LogPanel: def __init__(self, builder): self.builder = builder self._config = dict(DEFAULT_CONFIG) + self._lastUpdate = 0 + self.lock = RLock() self.msgLog = deque() self.loggedEvents = setEventListening(expandEvents(STARTUP_EVENTS)) @@ -75,6 +78,9 @@ class LogPanel: liststore.set_sort_column_id(1, gtk.SORT_DESCENDING) def fill_log(self): + if time.time() - self._lastUpdate < REFRESH_RATE: + return + liststore = self.builder.get_object('liststore_log') liststore.clear() @@ -87,7 +93,7 @@ class LogPanel: finally: self.lock.release() - return True + self._lastUpdate = time.time() def register_event(self, event): self.lock.acquire()

1 0

[arm/master] Use locking for fixing segfaults, different colors from cli.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 6c3a0d15a346e3b4cdcc0c21fcf9d20883d03061 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jun 26 02:24:19 2011 +0500 Use locking for fixing segfaults, different colors from cli. msgLog deque was being updated by events while being pushed into liststore which produced inconsistency and generated segfault. Using different colors from cli in order to be readable. Moved logPanel creation before bandwidthStats in order to let controller events reach bandwidthStats. --- src/gui/controller.py | 6 +++--- src/gui/logPanel.py | 29 +++++++++++++++++++++-------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py index 1c173af..5f1712c 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -18,12 +18,12 @@ class GuiController: self.builder.add_from_file(filename) self.builder.connect_signals(self) - self.bwStats = bandwidthStats.BandwidthStats(self.builder) - self.bwStats.pack_widgets() - self.logPanel = logPanel.LogPanel(self.builder) self.logPanel.pack_widgets() + self.bwStats = bandwidthStats.BandwidthStats(self.builder) + self.bwStats.pack_widgets() + def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 6ac6418..97a01cc 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -7,6 +7,7 @@ import sys import time from collections import deque +from threading import RLock import gobject import gtk @@ -16,8 +17,10 @@ from util import log, uiTools, torTools from cli.logPanel import (expandEvents, setEventListening, getLogFileEntries, LogEntry, TorEventObserver, - DEFAULT_CONFIG, RUNLEVEL_EVENT_COLOR) + DEFAULT_CONFIG) +RUNLEVEL_EVENT_COLOR = {log.DEBUG: "#C73043", log.INFO: "#762A2A", log.NOTICE: "#222222", + log.WARN: "#AB7814", log.ERR: "#EC131F"} STARTUP_EVENTS = 'N3' class LogPanel: @@ -25,6 +28,7 @@ class LogPanel: self.builder = builder self._config = dict(DEFAULT_CONFIG) + self.lock = RLock() self.msgLog = deque() self.loggedEvents = setEventListening(expandEvents(STARTUP_EVENTS)) @@ -62,7 +66,7 @@ class LogPanel: conn.addEventListener(TorEventObserver(self.register_event)) conn.addTorCtlListener(self._register_torctl_event) - self.fill_log() + gobject.timeout_add(1000, self.fill_log) def pack_widgets(self): liststore = self.builder.get_object('liststore_log') @@ -74,14 +78,23 @@ class LogPanel: liststore = self.builder.get_object('liststore_log') liststore.clear() - for entry in self.msgLog: - timeLabel = time.strftime('%H:%M:%S', time.localtime(entry.timestamp)) - row = (long(entry.timestamp), timeLabel, entry.type, entry.msg, entry.color) - liststore.append(row) + self.lock.acquire() + try: + for entry in self.msgLog: + timeLabel = time.strftime('%H:%M:%S', time.localtime(entry.timestamp)) + row = (long(entry.timestamp), timeLabel, entry.type, entry.msg, entry.color) + liststore.append(row) + finally: + self.lock.release() + + return True def register_event(self, event): - self.msgLog.appendleft(event) - self.fill_log() + self.lock.acquire() + try: + self.msgLog.appendleft(event) + finally: + self.lock.release() def _register_arm_event(self, level, msg, eventTime): eventColor = RUNLEVEL_EVENT_COLOR[level]

1 0

[arm/master] For consistency, plot bw graph even if all values are zeros.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit a110aeb39e0ec129b24ab138b08742490e55212e Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jun 26 06:10:42 2011 +0500 For consistency, plot bw graph even if all values are zeros. --- src/gui/graphing/graphStats.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index fcd326f..0d9ac5f 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -90,10 +90,8 @@ class GraphStats(TorCtl.PostEventListener): graph = self.graphs[name] data = self.get_graph_data(name) - if self.is_graph_data_zero(name): - graph.seriess[0].data = [] - else: - graph.seriess[0].data = data + graph.seriess[0].data = data + if not self.is_graph_data_zero(name): for (index, axis) in enumerate(graph.axiss): if axis.type != 'xaxis':

1 0

[arm/master] Use idle_add instead of timeout_add for work in gtk main loop.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 224a7d6ac7156815b625b82d7b48daa67173a049 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jun 26 04:02:49 2011 +0500 Use idle_add instead of timeout_add for work in gtk main loop. --- src/gui/logPanel.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 97a01cc..fc8e6b8 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -21,7 +21,7 @@ from cli.logPanel import (expandEvents, setEventListening, getLogFileEntries, RUNLEVEL_EVENT_COLOR = {log.DEBUG: "#C73043", log.INFO: "#762A2A", log.NOTICE: "#222222", log.WARN: "#AB7814", log.ERR: "#EC131F"} -STARTUP_EVENTS = 'N3' +STARTUP_EVENTS = 'A' class LogPanel: def __init__(self, builder): @@ -66,7 +66,7 @@ class LogPanel: conn.addEventListener(TorEventObserver(self.register_event)) conn.addTorCtlListener(self._register_torctl_event) - gobject.timeout_add(1000, self.fill_log) + gobject.idle_add(self.fill_log) def pack_widgets(self): liststore = self.builder.get_object('liststore_log') @@ -95,6 +95,7 @@ class LogPanel: self.msgLog.appendleft(event) finally: self.lock.release() + gobject.idle_add(self.fill_log) def _register_arm_event(self, level, msg, eventTime): eventColor = RUNLEVEL_EVENT_COLOR[level]

1 0

[arm/master] Filling blank wizard values when helpful
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 36f78676801ee57a4d875bc6114f365e1b324ad2 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 1 15:46:27 2011 -0700 Filling blank wizard values when helpful Some of the configuration values, like the nickname and bridge entries, can use their desplayed value when blank to indicate what should go there. --- src/cli/wizard.py | 5 ++++- src/settings.cfg | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 79f548e..7c36598 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -73,6 +73,7 @@ CONFIG = {"wizard.message.role": "", "wizard.toggle": {}, "wizard.suboptions": [], "wizard.default": {}, + "wizard.blankValue": {}, "wizard.label.general": {}, "wizard.label.role": {}, "wizard.label.opt": {}, @@ -113,7 +114,9 @@ class ConfigOption: return self.value def getDisplayValue(self): - return self.value + if not self.value and self.key in CONFIG["wizard.blankValue"]: + return CONFIG["wizard.blankValue"][self.key] + else: return self.value def getDisplayAttr(self): myColor = OPTION_COLOR if self.isEnabled() else DISABLED_COLOR diff --git a/src/settings.cfg b/src/settings.cfg index aacec0a..076299d 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -370,7 +370,6 @@ wizard.suboptions Bridge1 wizard.suboptions Bridge2 wizard.suboptions Bridge3 -wizard.default Nickname => Unnamed wizard.default Notify => true wizard.default Bandwidth => 5 MB/s wizard.default Startup => true @@ -387,6 +386,11 @@ wizard.default Distribute => true wizard.default Bridged => false wizard.default Reuse => 10 minutes +wizard.blankValue Nickname => Unnamed +wizard.blankValue Bridge1 => <ip address>:<port> +wizard.blankValue Bridge2 => <ip address>:<port> +wizard.blankValue Bridge3 => <ip address>:<port> + wizard.label.general Cancel => Cancel wizard.label.general Back => Previous wizard.label.general Next => Next

1 0

[arm/master] Input field validation for bridge destinations
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit f3d73e6a80d4798963745c8ebb500eca29bd0c3e Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 1 16:25:23 2011 -0700 Input field validation for bridge destinations --- src/cli/wizard.py | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 7c36598..219c6b6 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -9,7 +9,7 @@ import curses import cli.popups import cli.controller -from util import enum, uiTools +from util import enum, connections, uiTools # basic configuration types we can run as RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") @@ -210,6 +210,9 @@ def showWizard(): else: config[option] = ConfigOption(option, "opt", default) # sets input validators + config[Options.BRIDGE1].setValidator(_bridgeDestinationValidator) + config[Options.BRIDGE2].setValidator(_bridgeDestinationValidator) + config[Options.BRIDGE3].setValidator(_bridgeDestinationValidator) # enables custom policies when 'custom' is selected and disables otherwise policyOpt = config[Options.POLICY] @@ -387,7 +390,9 @@ def promptConfigOptions(relayType, config): newValue = popup.getstr(y + selection + 1, 33, options[selection].getValue(), curses.A_STANDOUT | uiTools.getColor(OPTION_COLOR), 23) if newValue: try: options[selection].setValue(newValue.strip()) - except ValueError, exc: cli.popups.showMsg(str(exc), 3) + except ValueError, exc: + cli.popups.showMsg(str(exc), 2) + cli.controller.getController().requestRedraw(True) elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel finally: cli.popups.finalize() @@ -423,3 +428,13 @@ def _toggleEnabledAction(toggleOptions, option, value): for opt in toggleOptions: opt.setEnabled(value) +def _bridgeDestinationValidator(option, value): + if value.count(":") != 1: + raise ValueError("Bridges are of the form '<ip address>:<port>'") + + ipAddr, port = value.split(":", 1) + if not connections.isValidIpAddress(ipAddr): + raise ValueError("'%s' is not a valid ip address" % ipAddr) + elif not port.isdigit() or int(port) < 0 or int(port) > 65535: + raise ValueError("'%s' isn't a valid port number" % port) +

1 0

[arm/master] fix: correcting some port types and descriptions
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 17fa269873a561b7ba8f843c3030373014277b3a Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 1 15:57:20 2011 -0700 fix: correcting some port types and descriptions Secure mail ports were misclassified, and descriptions for the mail and web policies were missing ports. --- src/settings.cfg | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 076299d..7f2953f 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -435,8 +435,8 @@ wizard.description.opt Portforward => If needed, attempts NAT traversal using UP 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) -wizard.description.opt Websites => General Internet browsing including HTTP (80) and HTTPS (443). -wizard.description.opt Email => Protocols for receiving, but not sending email. This includes POP3 (110), POP3S (995), IMAP (143), and IMAPS (993). +wizard.description.opt Websites => General Internet browsing including HTTP (80), HTTPS (443), common alternatives (81, 8008), and proxies (3128, 8080) +wizard.description.opt Email => Protocols for receiving, but not sending email. This includes POP3 (110), POP3S (995), IMAP (143, 220), and IMAPS (993). wizard.description.opt Im => Common instant messaging protocols including Jabber, IRC, ICQ, AIM, Yahoo, MSN, SILC, GroupWise, Gadu-Gadu, Sametime, and Zephyr. wizard.description.opt Misc => Protocols from the default policy that aren't among the above. wizard.description.opt Plaintext => When blocked the policy will exclude ports that aren't commonly encrypted. @@ -836,9 +836,9 @@ 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.mail 993 # IMAPS port.exit.im 994 # IRC over SSL -port.exit.misc 995 # POP3S +port.exit.mail 995 # POP3S port.exit.misc 1194 # OpenVPN port.exit.misc 1220 # QuickTime port.exit.misc 1293 # PKT-KRB-IPSec @@ -895,6 +895,8 @@ port.encrypted 749 port.encrypted 981 port.encrypted 989 port.encrypted 990 +port.encrypted 993 +port.encrypted 995 port.encrypted 1194 port.encrypted 1293 port.encrypted 1723

1 0

[arm/master] Input field validation for circ reuse durations
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 5e0178152ddf08b4c1a8011dc74667c65c9a750a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 18:08:36 2011 -0700 Input field validation for circ reuse durations --- src/cli/wizard.py | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 16752e7..80d2fd1 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -215,6 +215,7 @@ def showWizard(): config[Options.BRIDGE1].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE2].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE3].setValidator(_bridgeDestinationValidator) + config[Options.REUSE].setValidator(_circDurationValidator) # enables custom policies when 'custom' is selected and disables otherwise policyOpt = config[Options.POLICY] @@ -432,7 +433,7 @@ def _toggleEnabledAction(toggleOptions, option, value): def _relayRateValidator(option, value): if value.count(" ") != 1: - msg = "This should be a measurement followed by the rate (for instance, \"5 MB/s\")" + msg = "This should be a rate measurement (for instance, \"5 MB/s\")" raise ValueError(msg) rate, units = value.split(" ", 1) @@ -447,7 +448,7 @@ def _relayRateValidator(option, value): def _monthlyLimitValidator(option, value): if value.count(" ") != 1: - msg = "This should be a measurement followed by the units (for instance, \"5 MB\")" + msg = "This should be a traffic size (for instance, \"5 MB\")" raise ValueError(msg) rate, units = value.split(" ", 1) @@ -457,6 +458,8 @@ def _monthlyLimitValidator(option, value): elif not units in acceptedUnits: msg = "'%s' is an invalid unit, options include \"%s\"" % (units, "\", \"".join(acceptedUnits)) raise ValueError(msg) + elif (int(rate) < 50 and units == "MB") or int(rate) < 1: + raise ValueError("To be usable as a relay's monthly limit should be at least 50 MB") def _bridgeDestinationValidator(option, value): if value.count(":") != 1: @@ -468,3 +471,18 @@ def _bridgeDestinationValidator(option, value): elif not port.isdigit() or int(port) < 0 or int(port) > 65535: raise ValueError("'%s' isn't a valid port number" % port) +def _circDurationValidator(option, value): + if value.count(" ") != 1: + msg = "This should be a time measurement (for instance, \"10 minutes\")" + raise ValueError(msg) + + rate, units = value.split(" ", 1) + acceptedUnits = ("minute", "minutes", "hour", "hours") + if not rate.isdigit(): + raise ValueError("'%s' isn't an integer" % rate) + elif not units in acceptedUnits: + msg = "'%s' is an invalid rate, options include \"minutes\" or \"hours\"" + raise ValueError(msg) + elif (int(rate) < 5 and units in ("minute", "minutes")) or int(rate) < 1: + raise ValueError("This would cause high network load, don't set this to less than five minutes") +

1 0