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

[arm/release] Remove debug settings for log panel.
by atagar＠torproject.org 16 Jul '11

16 Jul '11

commit 06821d8b3764e78b930777573088e420cb7cb9e3 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Jul 4 16:38:38 2011 +0500 Remove debug settings for log panel. --- src/gui/logPanel.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 4e95db4..20331ad 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 = 'A' +STARTUP_EVENTS = 'N3' REFRESH_RATE = 3 class LogPanel: @@ -96,6 +96,9 @@ class LogPanel: self._lastUpdate = time.time() def register_event(self, event): + if not event.type in self.loggedEvents: + return + self.lock.acquire() try: self.msgLog.appendleft(event)

1 0

[arm/release] Merge branch 'master' of git://git.torproject.org/arm
by atagar＠torproject.org 16 Jul '11

16 Jul '11

1 0

[arm/release] Input field validation for monthly limit
by atagar＠torproject.org 16 Jul '11

16 Jul '11

commit 5625ac4baf6f333e024ce4537031ef434416a0ec Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 17:51:49 2011 -0700 Input field validation for monthly limit --- src/cli/wizard.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 43d107b..16752e7 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -211,6 +211,7 @@ def showWizard(): # sets input validators config[Options.BANDWIDTH].setValidator(_relayRateValidator) + config[Options.LIMIT].setValidator(_monthlyLimitValidator) config[Options.BRIDGE1].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE2].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE3].setValidator(_bridgeDestinationValidator) @@ -444,6 +445,19 @@ def _relayRateValidator(option, value): elif (int(rate) < 20 and units == "KB/s") or int(rate) < 1: raise ValueError("To be usable as a relay the rate must be at least 20 KB/s") +def _monthlyLimitValidator(option, value): + if value.count(" ") != 1: + msg = "This should be a measurement followed by the units (for instance, \"5 MB\")" + raise ValueError(msg) + + rate, units = value.split(" ", 1) + acceptedUnits = ("MB", "GB", "TB") + if not rate.isdigit(): + raise ValueError("'%s' isn't an integer" % rate) + elif not units in acceptedUnits: + msg = "'%s' is an invalid unit, options include \"%s\"" % (units, "\", \"".join(acceptedUnits)) + raise ValueError(msg) + def _bridgeDestinationValidator(option, value): if value.count(":") != 1: raise ValueError("Bridges are of the form '<ip address>:<port>'")

1 0

[arm/release] fix: last tor runtime showed if never connected
by atagar＠torproject.org 16 Jul '11

16 Jul '11

commit c2b4bd61b78b2b5fcda639c0f791f998223955ff Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 18:13:22 2011 -0700 fix: last tor runtime showed if never connected The header panel shows when arm was last detached from Tor. However, if we have never connected to a Tor control port then this is nonesense, showing the epoch time ("16:00 12/31/1969") instead. Dropping the field in this case. --- src/cli/headerPanel.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 846c1db..5a2c1bc 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -204,10 +204,14 @@ class HeaderPanel(panel.Panel, threading.Thread): x += 17 else: statusTime = torTools.getConn().getStatus()[1] - statusTimeLabel = time.strftime("%H:%M %m/%d/%Y", time.localtime(statusTime)) + + if statusTime: + statusTimeLabel = time.strftime("%H:%M %m/%d/%Y, ", time.localtime(statusTime)) + else: statusTimeLabel = "" # never connected to tor + self.addstr(1, x, "Tor Disconnected", curses.A_BOLD | uiTools.getColor("red")) - self.addstr(1, x + 16, " (%s, press r to reconnect)" % statusTimeLabel) - x += 41 + len(statusTimeLabel) + self.addstr(1, x + 16, " (%spress r to reconnect)" % statusTimeLabel) + x += 39 + len(statusTimeLabel) includeControlPort = False if includeControlPort:

1 0

[arm/release] Generating torrc entries for special cases
by atagar＠torproject.org 16 Jul '11

16 Jul '11

commit e1760cdc972c93377fbd36aea02f8edeb7424275 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 5 20:00:47 2011 -0700 Generating torrc entries for special cases This covers the trickier torrc options (burst, exit policy, bridges, etc) that were omitted from the previous templating checkin. With this all of the torrc generation should be done - next on to the confirmation dialog... --- src/cli/wizard.py | 74 +++++++++++++++++++++++++++++++++++--- src/resources/torrcTemplate.txt | 2 + src/settings.cfg | 7 ++++ 3 files changed, 77 insertions(+), 6 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 03cfb48..d585ce5 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -72,7 +72,8 @@ MSG_COLOR = "green" OPTION_COLOR = "yellow" DISABLED_COLOR = "cyan" -CONFIG = {"wizard.message.role": "", +CONFIG = {"startup.dataDirectory": "~/.arm", + "wizard.message.role": "", "wizard.message.relay": "", "wizard.message.exit": "", "wizard.message.bridge": "", @@ -86,7 +87,14 @@ CONFIG = {"wizard.message.role": "", "wizard.label.opt": {}, "wizard.description.general": {}, "wizard.description.role": {}, - "wizard.description.opt": {}} + "wizard.description.opt": {}, + "port.category": {}, + "port.exit.all": [], + "port.exit.web": [], + "port.exit.mail": [], + "port.exit.im": [], + "port.exit.misc": [], + "port.encrypted": []} def loadConfig(config): config.update(CONFIG) @@ -437,12 +445,66 @@ def getTorrc(relayType, config): templateOptions[key.upper()] = value - #templateOptions = dict([(key.upper(), config[key].getValue()) for key in config]) templateOptions[relayType.upper()] = True templateOptions["LOW_PORTS"] = config[Options.LOWPORTS] - #templateOptions["BURST"] = config[Options.BANDWIDTH] * 2 # TODO: implement - templateOptions["NOTICE_PATH"] = "/path/to/.arm/exit-notice.html" # TODO: actually prepend the right prefix - templateOptions["EXIT_POLICY"] = "" # TODO: fill in configured policy + + # uses double the relay rate for bursts + relayRateComp = config[Options.BANDWIDTH].getValue().split(" ") + templateOptions["BURST"] = "%i %s" % (int(relayRateComp[0]) * 2, " ".join(relayRateComp[1:])) + + # exit notice will be in our data directory + dataDir = CONFIG["startup.dataDirectory"] + if not dataDir.endswith("/"): dataDir += "/" + templateOptions["NOTICE_PATH"] = os.path.expanduser(dataDir) + "exit-notice.html" + + policyCategories = [] + if not config[Options.POLICY].getValue(): + policyCategories = ["web", "mail", "im", "misc"] + else: + if config[Options.WEBSITES].getValue(): policyCategories.append("web") + if config[Options.EMAIL].getValue(): policyCategories.append("mail") + if config[Options.IM].getValue(): policyCategories.append("im") + if config[Options.MISC].getValue(): policyCategories.append("misc") + + if policyCategories: + isEncryptedOnly = not config[Options.PLAINTEXT].getValue() + + policyLines = [] + for category in ["all"] + policyCategories: + # shows a comment at the start of the section saying what it's for + topicComment = CONFIG["port.category"].get(category) + if topicComment: + while topicComment: + commentSegment, topicComment = uiTools.cropStr(topicComment, 78, None, endType = None, getRemainder = True) + policyLines.append("# " + commentSegment.strip()) + + for portEntry in CONFIG.get("port.exit.%s" % category, []): + # port entry might be an individual port or a range + + if isEncryptedOnly and (not portEntry in CONFIG["port.encrypted"]): + continue # opting to not include plaintext port and ranges + + if "-" in portEntry: + # if this is a range then use the first port's description + comment = connections.PORT_USAGE.get(portEntry[:portEntry.find("-")]) + else: comment = connections.PORT_USAGE.get(portEntry) + + entry = "ExitPolicy accept *:%s" % portEntry + if comment: policyLines.append("%-30s# %s" % (entry, comment)) + else: policyLines.append(entry) + + if category != policyCategories[-1]: + policyLines.append("") # newline to split categories + + templateOptions["EXIT_POLICY"] = "\n".join(policyLines) + + # includes input bridges + bridgeLines = [] + for bridgeOpt in [Options.BRIDGE1, Options.BRIDGE2, Options.BRIDGE3]: + bridgeValue = config[bridgeOpt].getValue() + if bridgeValue: bridgeLines.append("Bridge %s" % bridgeValue) + + templateOptions["BRIDGES"] = "\n".join(bridgeLines) return torConfig.renderTorrc(template, templateOptions) diff --git a/src/resources/torrcTemplate.txt b/src/resources/torrcTemplate.txt index 3c9387f..7462382 100644 --- a/src/resources/torrcTemplate.txt +++ b/src/resources/torrcTemplate.txt @@ -60,7 +60,9 @@ CookieAuthentication 1 # method for controller authentication DirPortFrontPage [NOTICE_PATH] # disclaimer saying that this is an exit [END IF] + [NEWLINE] [EXIT_POLICY] + ExitPolicy reject *:* # prevents any exit traffic not permitted above [END IF] [ELSE] ClientOnly 1 # prevents us from ever being used as a relay diff --git a/src/settings.cfg b/src/settings.cfg index 53da315..162327b 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -816,6 +816,12 @@ port.label.33434 traceroute # full policy is the Reduced Exit Policy, revision 9 (edited 6/28/11): # https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy?version… +port.category all => The following sets which ports can exit the tor network through you. For more information and updates on the suggested policy see: https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy +port.category web => ports for general internet browsing +port.category mail => ports for receiving email +port.category im => ports for instant messaging +port.category misc => ports for other services + port.exit.misc 20-23 # FTP, SSH, Telnet port.exit.misc 43 # WHOIS port.exit.all 53 # DNS @@ -889,6 +895,7 @@ port.exit.misc 19638 # Ensim Control Panel # encrypted traffic) port.encrypted 22 +port.encrypted 53 # dns - not really encrypted but want it anyway port.encrypted 88 port.encrypted 443 port.encrypted 464

1 0

[arm/release] fix: extra slash in fallback conf desc path
by atagar＠torproject.org 16 Jul '11

16 Jul '11

commit a90ede962f9466f1019f36cc3d0038cd170be671 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 5 14:35:39 2011 -0700 fix: extra slash in fallback conf desc path The prefix path used for fallback configuration descriptions already ended with a slash, so the resulting path had an extra... <prefix>//resources/torConfigDesc.txt this didn't harm anything but might as well be corrected. --- src/starter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index 1b6049a..234bf16 100644 --- a/src/starter.py +++ b/src/starter.py @@ -168,7 +168,7 @@ def _loadConfigurationDescriptions(pathPrefix): if not isConfigDescriptionsLoaded: try: loadStartTime = time.time() - loadedVersion = util.torConfig.loadOptionDescriptions(pathPrefix + "/resources/" + CONFIG_DESC_FILENAME, False) + loadedVersion = util.torConfig.loadOptionDescriptions("%sresources/%s" % (pathPrefix, CONFIG_DESC_FILENAME), False) isConfigDescriptionsLoaded = True msg = DESC_INTERNAL_LOAD_SUCCESS_MSG % loadedVersion

1 0

[arm/release] Configuration confirmation page for setup wizard
by atagar＠torproject.org 16 Jul '11

16 Jul '11

commit 1bb80486d2a8c9221c1e1cf7084d6245f43a24fd Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 6 17:51:00 2011 -0700 Configuration confirmation page for setup wizard This provides a dialog in the relay setup wizard with the torrc that'll be created (with syntax hilighing, scrolling, etc). --- src/cli/wizard.py | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++- src/util/panel.py | 11 +++-- 2 files changed, 114 insertions(+), 7 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 8ad7208..946ecd1 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -264,8 +264,19 @@ def showWizard(): if selection == BACK: relayType = None elif selection == NEXT: generatedTorrc = getTorrc(relayType, config) - log.log(log.NOTICE, "Resulting torrc:\n%s" % generatedTorrc) - break # TODO: implement next screen + + dataDir = CONFIG["startup.dataDirectory"] + if not dataDir.endswith("/"): dataDir += "/" + torrcLocation = os.path.expanduser(dataDir) + "torrc" + + cli.controller.getController().requestRedraw(True) + confirmationSelection = showConfirmationDialog(generatedTorrc, torrcLocation) + + if confirmationSelection == NEXT: + log.log(log.NOTICE, "Resulting torrc:\n%s" % generatedTorrc) + break # TODO: implement next screen + elif confirmationSelection == CANCEL: + break # redraws screen to clear away the dialog we just showed cli.controller.getController().requestRedraw(True) @@ -507,6 +518,101 @@ def getTorrc(relayType, config): return torConfig.renderTorrc(template, templateOptions) +def showConfirmationDialog(torrcContents, torrcLocation): + """ + Shows a confirmation dialog with the given torrc contents, returning CANCEL, + NEXT, or BACK based on the selection. + + Arguments: + torrcContents - lines of torrc contents to be presented + torrcLocation - path where the torrc will be placed + """ + + torrcLines = torrcContents.split("\n") + options = ["Cancel", "Back to Setup", "Start Tor"] + + control = cli.controller.getController() + screenHeight = control.getScreen().getmaxyx()[0] + stickyHeight = sum([stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()]) + isScrollbarVisible = len(torrcLines) + stickyHeight + 5 > screenHeight + + xOffset = 3 if isScrollbarVisible else 0 + popup, width, height = cli.popups.init(len(torrcLines) + 5, 84 + xOffset) + if not popup: return False + + try: + scroll, selection = 0, 2 + curses.cbreak() + + while True: + popup.win.erase() + popup.win.box() + + # renders the scrollbar + if isScrollbarVisible: + popup.addScrollBar(scroll, scroll + height - 5, len(torrcLines), 1, height - 4, 1) + + # shows the path where the torrc will be placed + titleMsg = "The following will be placed at '%s':" % torrcLocation + popup.addstr(0, 0, titleMsg, curses.A_STANDOUT) + + # renders the torrc contents + for i in range(scroll, min(len(torrcLines), height - 5 + scroll)): + # parses the argument and comment from options + option, arg, comment = uiTools.cropStr(torrcLines[i], width - 4 - xOffset), "", "" + + div = option.find("#") + if div != -1: option, comment = option[:div], option[div:] + + div = option.find(" ") + if div != -1: option, arg = option[:div], option[div:] + + drawX = 2 + xOffset + popup.addstr(i + 1 - scroll, drawX, option, curses.A_BOLD | uiTools.getColor("green")) + drawX += len(option) + popup.addstr(i + 1 - scroll, drawX, arg, curses.A_BOLD | uiTools.getColor("cyan")) + drawX += len(arg) + popup.addstr(i + 1 - scroll, drawX, comment, uiTools.getColor("white")) + + # divider between the torrc and the options + popup.addch(height - 4, 0, curses.ACS_LTEE) + popup.addch(height - 4, width, curses.ACS_RTEE) + popup.hline(height - 4, 1, width - 1) + if isScrollbarVisible: popup.addch(height - 4, 2, curses.ACS_BTEE) + + # renders the selection options + confirmationMsg = "Run tor with the above configuration?" + popup.addstr(height - 3, width - len(confirmationMsg) - 1, confirmationMsg, uiTools.getColor("green") | curses.A_BOLD) + + drawX = width - 1 + for i in range(len(options) - 1, -1, -1): + optionLabel = " %s " % options[i] + drawX -= (len(optionLabel) + 4) + + selectionFormat = curses.A_STANDOUT if i == selection else curses.A_NORMAL + popup.addstr(height - 2, drawX, "[", uiTools.getColor("green")) + popup.addstr(height - 2, drawX + 1, optionLabel, uiTools.getColor("green") | selectionFormat | curses.A_BOLD) + popup.addstr(height - 2, drawX + len(optionLabel) + 1, "]", uiTools.getColor("green")) + + drawX -= 1 # space gap between the options + + popup.win.refresh() + key = cli.controller.getController().getScreen().getch() + + if key == curses.KEY_LEFT: + selection = (selection - 1) % len(options) + elif key == curses.KEY_RIGHT: + selection = (selection + 1) % len(options) + elif uiTools.isScrollKey(key): + scroll = uiTools.getScrollPosition(key, scroll, height - 5, len(torrcLines)) + elif uiTools.isSelectionKey(key): + if selection == 0: return CANCEL + elif selection == 1: return BACK + else: return NEXT + elif key == 27: return CANCEL + finally: + cli.popups.finalize() + def _splitStr(msg, width): """ Splits a string into substrings of a given length. diff --git a/src/util/panel.py b/src/util/panel.py index 1be2306..5a96623 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -628,7 +628,7 @@ class Panel(): return userInput - def addScrollBar(self, top, bottom, size, drawTop = 0, drawBottom = -1): + def addScrollBar(self, top, bottom, size, drawTop = 0, drawBottom = -1, drawLeft = 0): """ Draws a left justified scroll bar reflecting position within a vertical listing. This is shorted if necessary, and left undrawn if no space is @@ -649,6 +649,7 @@ class Panel(): drawTop - starting row where the scroll bar should be drawn drawBottom - ending row where the scroll bar should end, -1 if it should span to the bottom of the panel + drawLeft - left offset at which to draw the scroll bar """ if (self.maxY - drawTop) < 2: return # not enough room @@ -673,12 +674,12 @@ class Panel(): # draws scrollbar slider for i in range(scrollbarHeight): if i >= sliderTop and i <= sliderTop + sliderSize: - self.addstr(i + drawTop, 0, " ", curses.A_STANDOUT) + self.addstr(i + drawTop, drawLeft, " ", curses.A_STANDOUT) # draws box around the scroll bar - self.win.vline(drawTop, 1, curses.ACS_VLINE, self.maxY - 2) - self.win.addch(drawBottom, 1, curses.ACS_LRCORNER) - self.win.addch(drawBottom, 0, curses.ACS_HLINE) + self.vline(drawTop, drawLeft + 1, drawBottom - 1) + self.addch(drawBottom, drawLeft + 1, curses.ACS_LRCORNER) + self.addch(drawBottom, drawLeft, curses.ACS_HLINE) def _resetSubwindow(self): """

1 0

[arm/release] fix: missing User entry from generated torrc
by atagar＠torproject.org 16 Jul '11

16 Jul '11

commit 527726affb18eec22dbc3c4bc243d74852ea6c69 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 6 15:06:45 2011 -0700 fix: missing User entry from generated torrc Adding the User config option when using low ports and a minor fix to comment alignments. --- src/cli/wizard.py | 5 ++--- src/resources/torrcTemplate.txt | 39 ++++++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index d585ce5..8ad7208 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -474,9 +474,8 @@ def getTorrc(relayType, config): # shows a comment at the start of the section saying what it's for topicComment = CONFIG["port.category"].get(category) if topicComment: - while topicComment: - commentSegment, topicComment = uiTools.cropStr(topicComment, 78, None, endType = None, getRemainder = True) - policyLines.append("# " + commentSegment.strip()) + for topicComp in _splitStr(topicComment, 78): + policyLines.append("# " + topicComp) for portEntry in CONFIG.get("port.exit.%s" % category, []): # port entry might be an individual port or a range diff --git a/src/resources/torrcTemplate.txt b/src/resources/torrcTemplate.txt index 7462382..abedd7f 100644 --- a/src/resources/torrcTemplate.txt +++ b/src/resources/torrcTemplate.txt @@ -7,34 +7,38 @@ # Descriptions of all of these configuraiton attibutes (and many more) are # available in the tor man page. [NEWLINE] -ControlPort 9052 # port controllers can connect to -CookieAuthentication 1 # method for controller authentication +ControlPort 9052 # port controllers can connect to +CookieAuthentication 1 # method for controller authentication [IF RELAY | EXIT | BRIDGE] - RunAsDaemon 1 # runs as a background process + RunAsDaemon 1 # runs as a background process + + [IF LOWPORTS] + User tor-arm # lowers our permissions to this user + [END IF] [END IF] [NEWLINE] [IF RELAY | EXIT | BRIDGE] [IF LOWPORTS] - ORPort 443 # port used for relaying traffic + ORPort 443 # port used for relaying traffic [ELSE] - ORPort 9001 # port used for relaying traffic + ORPort 9001 # port used for relaying traffic [END IF] [IF RELAY | EXIT] [IF LOWPORTS] - DirPort 80 # port used for mirroring directory information + DirPort 80 # port used for mirroring directory information [ELSE] - DirPort 9030 # port used for mirroring directory information + DirPort 9030 # port used for mirroring directory information [END IF] - Nickname [NICKNAME] # name for this relay - ContactInfo [CONTACT] # contact information in case there's an issue + Nickname [NICKNAME] # name for this relay + ContactInfo [CONTACT] # contact information in case there's an issue [END IF] [IF BRIDGE] - BridgeRelay 1 # makes us a bridge rather than a public relay + BridgeRelay 1 # makes us a bridge rather than a public relay [IF NOT DISTRIBUTE] PublishServerDescriptor 0 # keeps our bridge descriptor private @@ -43,18 +47,18 @@ CookieAuthentication 1 # method for controller authentication RelayBandwidthRate [BANDWIDTH] # limit for the bandwidth we'll use to relay RelayBandwidthBurst [BURST] # maximum rate when relaying bursts of traffic - AccountingMax [LIMIT] # maximum amount of traffic we'll relay per month + AccountingMax [LIMIT] # maximum amount of traffic we'll relay per month [IF NOT CLIENT] - SocksPort 0 # prevents tor from being used as a client + SocksPort 0 # prevents tor from being used as a client [END IF] [IF PORTFORWARD] - PortForwarding 1 # negotiates UPnP and NAT-PMP if needed + PortForwarding 1 # negotiates UPnP and NAT-PMP if needed [END IF] [IF RELAY | BRIDGE] - ExitPolicy reject *:* # prevents us from connecting to non-relays + ExitPolicy reject *:* # prevents us from connecting to non-relays [ELSE] [IF NOTICE] DirPortFrontPage [NOTICE_PATH] # disclaimer saying that this is an exit @@ -62,15 +66,16 @@ CookieAuthentication 1 # method for controller authentication [NEWLINE] [EXIT_POLICY] - ExitPolicy reject *:* # prevents any exit traffic not permitted above + ExitPolicy reject *:* # prevents any exit traffic not permitted above [END IF] [ELSE] - ClientOnly 1 # prevents us from ever being used as a relay + ClientOnly 1 # prevents us from ever being used as a relay MaxCircuitDirtiness [REUSE] # duration that circuits can be reused [IF BRIDGED] - UseBridges 1 # uses the following bridges to connect + UseBridges 1 # uses the following bridges to connect [BRIDGES] [END IF] [END IF] +[NEWLINE]

1 0

[arm/release] fix: fallback config descriptions not installed
by atagar＠torproject.org 16 Jul '11

16 Jul '11

commit 2a43cc028d97fcfcbd9e72900ed40026a78050e7 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 29 18:51:53 2011 -0700 fix: fallback config descriptions not installed The fallback descriptions for Tor's configuration options (which are used when the man page is unavailable) weren't being copied when arm's installed. This resulted in an error message and no config descriptions if the man page was unavailable. Caught by ioerror --- setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py index cdda907..9a9efdd 100644 --- a/setup.py +++ b/setup.py @@ -90,7 +90,7 @@ setup(name='arm', data_files=[("/usr/bin", ["arm"]), ("/usr/share/man/man1", [manFilename]), (docPath, ["armrc.sample"]), - ("/usr/share/arm", ["src/settings.cfg", "src/uninstall"])], + ("/usr/share/arm", ["src/settings.cfg", "src/uninstall", "src/torConfigDesc.txt"])], ) # Cleans up the temporary compressed man page.

1 0

[arm/release] Bridge configuration options for the wizard
by atagar＠torproject.org 16 Jul '11

16 Jul '11

commit bfb7140ca05ebb32a2194d844879805639907445 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 29 10:02:15 2011 -0700 Bridge configuration options for the wizard --- src/cli/wizard.py | 58 ++++++++++++++++++++++++++++++---------------------- src/settings.cfg | 5 ++++ 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 7a9eaa0..c6186e5 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -15,31 +15,38 @@ 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", "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, - Options.NOTIFY, - Options.BANDWIDTH, - Options.LIMIT, - Options.CLIENT, - Options.PORTFORWARD, - Options.STARTUP, - Options.DIVIDER, - Options.NOTICE, - Options.POLICY, - Options.WEBSITES, - Options.EMAIL, - Options.IM, - Options.MISC, - Options.PLAINTEXT)} +Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT", "DISTRIBUTE") +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, + Options.NOTIFY, + Options.BANDWIDTH, + Options.LIMIT, + Options.CLIENT, + Options.PORTFORWARD, + Options.STARTUP, + Options.DIVIDER, + Options.NOTICE, + Options.POLICY, + Options.WEBSITES, + Options.EMAIL, + Options.IM, + Options.MISC, + Options.PLAINTEXT), + RelayType.BRIDGE: (Options.DISTRIBUTE, + Options.BANDWIDTH, + Options.LIMIT, + Options.CLIENT, + Options.PORTFORWARD, + Options.STARTUP + )} # custom exit policy options CUSTOM_POLICIES = (Options.WEBSITES, Options.EMAIL, Options.IM, Options.MISC, Options.PLAINTEXT) @@ -54,6 +61,7 @@ DISABLED_COLOR = "cyan" CONFIG = {"wizard.message.role": "", "wizard.message.relay": "", + "wizard.message.bridge": "", "wizard.message.exit": "", "wizard.toggle": {}, "wizard.suboptions": [], diff --git a/src/settings.cfg b/src/settings.cfg index c945a34..f05dd71 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -344,6 +344,7 @@ msg.ARM_DEBUG Unable to query process resource usage from ps wizard.message.role Welcome to the Tor network! This will step you through the configuration process for becoming a part of it. To start with, what role would you like to have? wizard.message.relay Internal relays provide connections within the Tor network. Since you will only be connecting to Tor users and relays this is an easy, hassle free way of helping to make the network better. wizard.message.exit Exits connect between the Tor network and the outside Internet. This is the most vitally important role you can take, but it also needs some forethought. Please read 'http://www.atagar.com/torExitTips/' before proceeding further to avoid any nasty surprises! +wizard.message.bridge Bridges are non-public relays used as stepping stones for censored users for accessing the Tor network. wizard.toggle Notify => Yes, No wizard.toggle Client => Enabled, Disabled @@ -356,6 +357,7 @@ wizard.toggle Email => Allow, Block wizard.toggle Im => Allow, Block wizard.toggle Misc => Allow, Block wizard.toggle Plaintext => Allow, Block +wizard.toggle Distribute => Automated, Manual wizard.suboptions Websites wizard.suboptions Email @@ -376,6 +378,7 @@ wizard.default Email => true wizard.default Im => true wizard.default Misc => true wizard.default Plaintext => true +wizard.default Distribute => true wizard.label.general Cancel => Cancel wizard.label.general Back => Previous @@ -399,6 +402,7 @@ wizard.label.opt Email => Receiving Email wizard.label.opt Im => Instant Messaging wizard.label.opt Misc => Other Services wizard.label.opt Plaintext => Unencrypted Traffic +wizard.label.opt Distribute => Distribution wizard.description.general Cancel => Close without starting Tor. wizard.description.role Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. @@ -420,6 +424,7 @@ wizard.description.opt Email => Protocols for receiving, but not sending email. 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. +wizard.description.opt Distribute => If automated then we'll attempt to get your bridge to censored users (email auto-responders, activist networks, etc). Otherwise it'll be up to you to distribute the bridge address to people who need it. # some config options are fetched via special values torrc.map HiddenServiceDir => HiddenServiceOptions

1 0