- tor-commits - lists.torproject.org

[arm/master] Wizard components for a startup option
by atagar＠torproject.org 12 Aug '11

12 Aug '11

commit 6cc6ede6e19c28b5df1b0c88288ce3da20f0f84c Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Aug 12 09:48:43 2011 -0700 Wizard components for a startup option This adds platform detection and a check for the system torrc option for the wizard startup option. However, this still isn't enabled nor is the option implemented (so this has no impact on users). I'm suspecting that system startup is a bigger can of worms than I'd like to open right now, even if restricted to Debian and Ubuntu platforms so gonna leave the rest unimplemented for now... --- src/cli/wizard.py | 34 +++++++++++++++++++++++++++------- src/resources/torrcTemplate.txt | 2 +- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 82b2825..40cf632 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -9,6 +9,7 @@ import sys import random import shutil import getpass +import platform import functools import curses @@ -283,22 +284,29 @@ 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)) _toggleEnabledAction(customPolicies, policyOpt, policyOpt.getValue()) + lowPortsOpt = config[Options.LOWPORTS] + disclaimerNotice = [config[Options.NOTICE]] + lowPortsOpt.setValidator(functools.partial(_toggleEnabledAction, disclaimerNotice)) + _toggleEnabledAction(disclaimerNotice, lowPortsOpt, lowPortsOpt.getValue()) + # enables bridge entries when "Use Bridges" is set and disables otherwise useBridgeOpt = config[Options.BRIDGED] bridgeEntries = [config[opt] for opt in BRIDGE_ENTRIES] useBridgeOpt.setValidator(functools.partial(_toggleEnabledAction, bridgeEntries)) _toggleEnabledAction(bridgeEntries, useBridgeOpt, useBridgeOpt.getValue()) + # enables running at startup when 'Use System Instance' is deselected and + # disables otherwise + systemOpt = config[Options.SYSTEM] + startupOpt = [config[Options.STARTUP]] + systemOpt.setValidator(functools.partial(_toggleEnabledAction, startupOpt, True)) + _toggleEnabledAction(startupOpt, systemOpt, not systemOpt.getValue()) + # remembers the last selection made on the type prompt page controller = cli.controller.getController() manager = controller.getTorManager() @@ -318,11 +326,16 @@ def showWizard(): # If we haven't run 'resources/torrcOverride/override.py --init' or lack # permissions then we aren't able to deal with the system wide tor instance. - # Also drop the optoin if we aren't installed since override.py won't be at + # Also drop the option if we aren't installed since override.py won't be at # the expected path. if not os.path.exists(os.path.dirname(SYSTEM_DROP_PATH)) or not os.path.exists(OVERRIDE_SCRIPT): disabledOpt.append(Options.SYSTEM) + # Running at startup is currently only supported for Debian and Ubuntu. + # Patches welcome for supporting other platforms. + if not platform.dist()[0] in ("debian", "Ubuntu"): + disabledOpt.append(Options.STARTUP) + while True: if relayType == None: selection = promptRelayType(relaySelection) @@ -742,6 +755,10 @@ def getTorrc(relayType, config, disabledOpt): if opt.upper() in templateOptions: del templateOptions[opt.upper()] + startupOpt = Options.STARTUP.upper() + if not config[Options.STARTUP].isEnabled() and startupOpt in templateOptions: + del templateOptions[startupOpt] + # removes options if they match the tor defaults for opt in TOR_DEFAULTS: if templateOptions[opt.upper()] == TOR_DEFAULTS[opt]: @@ -919,7 +936,7 @@ def _obscureChar(inputText, target, options): return inputText.replace(target, replacement) -def _toggleEnabledAction(toggleOptions, option, value): +def _toggleEnabledAction(toggleOptions, option, value, invert = False): """ Enables or disables custom exit policy options based on our selection. @@ -928,8 +945,11 @@ def _toggleEnabledAction(toggleOptions, option, value): selection (ie, true -> enabled, false -> disabled) options - our config option value - the value we're being set to + invert - inverts selection if true """ + if invert: value = not value + for opt in toggleOptions: opt.setEnabled(value) diff --git a/src/resources/torrcTemplate.txt b/src/resources/torrcTemplate.txt index 744a481..c6e61f0 100644 --- a/src/resources/torrcTemplate.txt +++ b/src/resources/torrcTemplate.txt @@ -22,7 +22,7 @@ CookieAuthentication 1 # method for controller authentication [IF RELAY | EXIT | BRIDGE] RunAsDaemon 1 # runs as a background process - [IF LOWPORTS] + [IF LOWPORTS | STARTUP] User [USERNAME] # lowers our permissions to this user [END IF] [END IF]

1 0

[arm/master] fix: selecting a non-existant option crashed
by atagar＠torproject.org 12 Aug '11

12 Aug '11

commit 0964e3e0c1780f91935195d45120ecda3f556765 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Aug 12 09:56:20 2011 -0700 fix: selecting a non-existant option crashed When not attached to a tor instance there weren't any tor configuration options available. If the user pressed 'enter' to edit an option this crashed arm. --- src/cli/configPanel.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index 2e8e1c1..bd9cba9 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -321,7 +321,7 @@ class ConfigPanel(panel.Panel): isChanged = self.scroller.handleKey(key, self._getConfigOptions(), pageHeight) if isChanged: self.redraw(True) - elif uiTools.isSelectionKey(key): + elif uiTools.isSelectionKey(key) and self._getConfigOptions(): # Prompts the user to edit the selected configuration value. The # interface is locked to prevent updates between setting the value # and showing any errors.

1 0

[arm/master] fix: switching hotkey for saving config to 'v'
by atagar＠torproject.org 12 Aug '11

12 Aug '11

commit 7c04d48fd8054790c84b1b85cd11d91d72bff35d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Aug 12 09:59:38 2011 -0700 fix: switching hotkey for saving config to 'v' The previous 'w' keybinding conflicted with the relay setup wizard so picking another. --- src/cli/configPanel.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index bd9cba9..31118c9 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -366,7 +366,7 @@ class ConfigPanel(panel.Panel): self.redraw(True) elif key == ord('s') or key == ord('S'): self.showSortDialog() - elif key == ord('w') or key == ord('W'): + elif key == ord('v') or key == ord('V'): self.showWriteDialog() else: isKeystrokeConsumed = False @@ -483,7 +483,7 @@ class ConfigPanel(panel.Panel): options.append(("page up", "scroll up a page", None)) options.append(("page down", "scroll down a page", None)) options.append(("enter", "edit configuration option", None)) - options.append(("w", "save configuration", None)) + options.append(("v", "save configuration", None)) options.append(("a", "toggle option filtering", None)) options.append(("s", "sort ordering", None)) return options

1 0

[torouter/master] add .gitignore
by ioerror＠torproject.org 11 Aug '11

11 Aug '11

commit 49d2d4bf2ef7bf7098a034aa1004a3617a9cda9d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Aug 11 14:58:17 2011 +0200 add .gitignore --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0d20b64 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pyc

1 0

[torouter/master] Add logout functionality
by hellais＠torproject.org 11 Aug '11

11 Aug '11

commit 9098dbd20065f0e8cdff2631a7e3e29ef89cf27d Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 11 22:32:12 2011 +0200 Add logout functionality --- packages/torouter-web/runui.py | 3 ++- packages/torouter-web/tui/controllers/main.py | 5 +++++ packages/torouter-web/tui/utils/session.py | 3 +++ packages/torouter-web/tui/views/base.html | 1 + packages/torouter-web/tui/views/logout.html | 1 + 5 files changed, 12 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/runui.py b/packages/torouter-web/runui.py index 030bf91..3d2dfc8 100644 --- a/packages/torouter-web/runui.py +++ b/packages/torouter-web/runui.py @@ -20,7 +20,8 @@ urls = ( '/network/wired', 'tui.controllers.network.wired', '/network/status', 'tui.controllers.network.status', '/tor', 'tui.controllers.tor.status', - '/tor/config', 'tui.controllers.tor.config' + '/tor/config', 'tui.controllers.tor.config', + '/logout', 'tui.controllers.main.logout' ) # '/wizard/([0-9a-f]{1,2})?', 'tui.controllers.wizard.step', # '/status', 'tui.controllers.status') diff --git a/packages/torouter-web/tui/controllers/main.py b/packages/torouter-web/tui/controllers/main.py index 7e1df50..060caa6 100644 --- a/packages/torouter-web/tui/controllers/main.py +++ b/packages/torouter-web/tui/controllers/main.py @@ -19,3 +19,8 @@ class index: else: return render.base(render.login()) +class logout: + def GET(self): + session.logout() + return render.base(render.logout()) + diff --git a/packages/torouter-web/tui/utils/session.py b/packages/torouter-web/tui/utils/session.py index 61c04cd..a554dad 100644 --- a/packages/torouter-web/tui/utils/session.py +++ b/packages/torouter-web/tui/utils/session.py @@ -21,3 +21,6 @@ def check_login(data): return 0 return 1 +def logout(): + web.config._session.kill() + diff --git a/packages/torouter-web/tui/views/base.html b/packages/torouter-web/tui/views/base.html index aca2bf9..bce4110 100644 --- a/packages/torouter-web/tui/views/base.html +++ b/packages/torouter-web/tui/views/base.html @@ -13,6 +13,7 @@ $def with (page,submenu=None) <li><a href="/">Home</a></li> <li><a href="/network">Network</a></li> <li><a href="/tor">Tor</a></li> + <li><a href="/logout">logout</a></li> </ul> $:submenu </div> diff --git a/packages/torouter-web/tui/views/logout.html b/packages/torouter-web/tui/views/logout.html new file mode 100644 index 0000000..f027ed4 --- /dev/null +++ b/packages/torouter-web/tui/views/logout.html @@ -0,0 +1 @@ +Successfully logged out!

1 0

[tor/master] Merge branch 'bug3643'
by nickm＠torproject.org 11 Aug '11

11 Aug '11

commit cd44145c5b1f8f49f6ddd2c9a2d5aaa5c6ef85db Merge: 5da9f72 92bea30 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Aug 11 07:56:38 2011 +0200 Merge branch 'bug3643' changes/bug3643 | 4 ++++ configure.in | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-)

1 0

[tor/master] Don't warn on http connection to my orport
by nickm＠torproject.org 11 Aug '11

11 Aug '11

commit f137ae896ef2741079ac698e8cabf229b9f4cde8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Aug 11 20:37:51 2011 +0200 Don't warn on http connection to my orport Also remove a few other related warnings that could occur during the ssl handshake. We do this because the relay operator can't do anything about them, and they aren't their fault. --- changes/bug3700 | 6 ++++++ src/common/tortls.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/changes/bug3700 b/changes/bug3700 new file mode 100644 index 0000000..cef7296 --- /dev/null +++ b/changes/bug3700 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Get rid of a harmless warning that could happen on relays running + with bufferevents. The warning was caused by someone doing an http + request to a relay's orport. Also don't warn for a few related + non-errors. Fixes bug 3700; bugfix on 0.2.3.1-alpha. + diff --git a/src/common/tortls.c b/src/common/tortls.c index 21f2c50..4556030 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -273,6 +273,22 @@ tor_tls_log_one_error(tor_tls_t *tls, unsigned long err, addr = tls ? tls->address : NULL; + /* Some errors are known-benign, meaning they are the fault of the other + * side of the connection. The caller doesn't know this, so override the + * priority for those cases. */ + switch (ERR_GET_REASON(err)) { + case SSL_R_HTTP_REQUEST: + case SSL_R_HTTPS_PROXY_REQUEST: + case SSL_R_RECORD_LENGTH_MISMATCH: + case SSL_R_RECORD_TOO_LARGE: + case SSL_R_UNKNOWN_PROTOCOL: + case SSL_R_UNSUPPORTED_PROTOCOL: + severity = LOG_INFO; + break; + default: + break; + } + msg = (const char*)ERR_reason_error_string(err); lib = (const char*)ERR_lib_error_string(err); func = (const char*)ERR_func_error_string(err);

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug3700'
by nickm＠torproject.org 11 Aug '11

11 Aug '11

commit 70216cb096b5b5daea78abe50681ad1537d584a0 Merge: 8c643b5 f137ae8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 11 14:42:15 2011 -0400 Merge remote-tracking branch 'sebastian/bug3700' changes/bug3700 | 6 ++++++ src/common/tortls.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-)

1 0

[arm/master] fix: display control socket path in header panel
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit dc49b356cade11e38f0a826c6660b23883e4e99a Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 11 09:56:56 2011 -0700 fix: display control socket path in header panel Replacing the 'Control Port (<authType>): <port>' entry in the header panel with 'Control Socket: <socketPath>' when connected via a control socket. --- src/cli/headerPanel.py | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 0e8c018..2c32af8 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -51,7 +51,7 @@ class HeaderPanel(panel.Panel, threading.Thread): Top area contenting tor settings and system information. Stats are stored in the vals mapping, keys including: tor/ version, versionStatus, nickname, orPort, dirPort, controlPort, - exitPolicy, isAuthPassword (bool), isAuthCookie (bool), + socketPath, exitPolicy, isAuthPassword (bool), isAuthCookie (bool), orListenAddr, *address, *fingerprint, *flags, pid, startTime, *fdUsed, fdLimit, isFdLimitEstimate sys/ hostname, os, version @@ -239,17 +239,21 @@ class HeaderPanel(panel.Panel, threading.Thread): includeControlPort = False if includeControlPort: - if self.vals["tor/isAuthPassword"]: authType = "password" - elif self.vals["tor/isAuthCookie"]: authType = "cookie" - else: authType = "open" - - if x + 19 + len(self.vals["tor/controlPort"]) + len(authType) <= leftWidth: - authColor = "red" if authType == "open" else "green" - self.addstr(1, x, ", Control Port (") - self.addstr(1, x + 16, authType, uiTools.getColor(authColor)) - self.addstr(1, x + 16 + len(authType), "): %s" % self.vals["tor/controlPort"]) - elif x + 16 + len(self.vals["tor/controlPort"]) <= leftWidth: - self.addstr(1, 0, ", Control Port: %s" % self.vals["tor/controlPort"]) + if self.vals["tor/controlPort"] == "0": + # connected via a control socket + self.addstr(1, x, ", Control Socket: %s" % self.vals["tor/socketPath"]) + else: + if self.vals["tor/isAuthPassword"]: authType = "password" + elif self.vals["tor/isAuthCookie"]: authType = "cookie" + else: authType = "open" + + if x + 19 + len(self.vals["tor/controlPort"]) + len(authType) <= leftWidth: + authColor = "red" if authType == "open" else "green" + self.addstr(1, x, ", Control Port (") + self.addstr(1, x + 16, authType, uiTools.getColor(authColor)) + self.addstr(1, x + 16 + len(authType), "): %s" % self.vals["tor/controlPort"]) + elif x + 16 + len(self.vals["tor/controlPort"]) <= leftWidth: + self.addstr(1, 0, ", Control Port: %s" % self.vals["tor/controlPort"]) # Line 3 / Line 1 Right (system usage info) y, x = (0, leftWidth) if isWide else (2, 0) @@ -474,7 +478,8 @@ class HeaderPanel(panel.Panel, threading.Thread): self.vals["tor/nickname"] = conn.getOption("Nickname", "") self.vals["tor/orPort"] = conn.getOption("ORPort", "0") self.vals["tor/dirPort"] = conn.getOption("DirPort", "0") - self.vals["tor/controlPort"] = conn.getOption("ControlPort", "") + self.vals["tor/controlPort"] = conn.getOption("ControlPort", "0") + self.vals["tor/socketPath"] = conn.getOption("ControlSocket", "") self.vals["tor/isAuthPassword"] = conn.getOption("HashedControlPassword") != None self.vals["tor/isAuthCookie"] = conn.getOption("CookieAuthentication") == "1"

1 0

[torouter/master] Remove python bytecode
by hellais＠torproject.org 11 Aug '11

11 Aug '11

commit cc32bd87b24f9c0bcb384a9cb772f46da9b35d00 Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 11 18:37:27 2011 +0200 Remove python bytecode --- packages/torouter-web/config.pyc | Bin 308 -> 0 bytes packages/torouter-web/runui.pyc | Bin 1390 -> 0 bytes packages/torouter-web/tui/__init__.pyc | Bin 169 -> 0 bytes packages/torouter-web/tui/controllers/__init__.pyc | Bin 181 -> 0 bytes packages/torouter-web/tui/controllers/main.pyc | Bin 1196 -> 0 bytes packages/torouter-web/tui/controllers/network.pyc | Bin 6373 -> 0 bytes packages/torouter-web/tui/controllers/tor.pyc | Bin 1662 -> 0 bytes packages/torouter-web/tui/utils/__init__.pyc | Bin 175 -> 0 bytes packages/torouter-web/tui/utils/session.pyc | Bin 1244 -> 0 bytes packages/torouter-web/view.pyc | Bin 411 -> 0 bytes 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/torouter-web/config.pyc b/packages/torouter-web/config.pyc deleted file mode 100644 index 9ed9f95..0000000 Binary files a/packages/torouter-web/config.pyc and /dev/null differ diff --git a/packages/torouter-web/runui.pyc b/packages/torouter-web/runui.pyc deleted file mode 100644 index a564a49..0000000 Binary files a/packages/torouter-web/runui.pyc and /dev/null differ diff --git a/packages/torouter-web/tui/__init__.pyc b/packages/torouter-web/tui/__init__.pyc deleted file mode 100644 index 912a260..0000000 Binary files a/packages/torouter-web/tui/__init__.pyc and /dev/null differ diff --git a/packages/torouter-web/tui/controllers/__init__.pyc b/packages/torouter-web/tui/controllers/__init__.pyc deleted file mode 100644 index 47771bf..0000000 Binary files a/packages/torouter-web/tui/controllers/__init__.pyc and /dev/null differ diff --git a/packages/torouter-web/tui/controllers/main.pyc b/packages/torouter-web/tui/controllers/main.pyc deleted file mode 100644 index 93200bc..0000000 Binary files a/packages/torouter-web/tui/controllers/main.pyc and /dev/null differ diff --git a/packages/torouter-web/tui/controllers/network.pyc b/packages/torouter-web/tui/controllers/network.pyc deleted file mode 100644 index 0a0db6d..0000000 Binary files a/packages/torouter-web/tui/controllers/network.pyc and /dev/null differ diff --git a/packages/torouter-web/tui/controllers/tor.pyc b/packages/torouter-web/tui/controllers/tor.pyc deleted file mode 100644 index 0c5e9f5..0000000 Binary files a/packages/torouter-web/tui/controllers/tor.pyc and /dev/null differ diff --git a/packages/torouter-web/tui/utils/__init__.pyc b/packages/torouter-web/tui/utils/__init__.pyc deleted file mode 100644 index 3700fb7..0000000 Binary files a/packages/torouter-web/tui/utils/__init__.pyc and /dev/null differ diff --git a/packages/torouter-web/tui/utils/session.pyc b/packages/torouter-web/tui/utils/session.pyc deleted file mode 100644 index e825de5..0000000 Binary files a/packages/torouter-web/tui/utils/session.pyc and /dev/null differ diff --git a/packages/torouter-web/view.pyc b/packages/torouter-web/view.pyc deleted file mode 100644 index 3870298..0000000 Binary files a/packages/torouter-web/view.pyc and /dev/null differ

1 0