- tor-commits - lists.torproject.org

[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

[torouter/master] Add user name and password to config file
by hellais＠torproject.org 11 Aug '11

11 Aug '11

commit 423d7556b1af6159bc3a1d6219bcd0ec704dce7f Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 11 18:21:48 2011 +0200 Add user name and password to config file --- packages/torouter-web/README | 1 + packages/torouter-web/config.py | 1 + packages/torouter-web/tui/utils/session.py | 3 ++- 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/README b/packages/torouter-web/README index 7a8c0fa..60e1eeb 100644 --- a/packages/torouter-web/README +++ b/packages/torouter-web/README @@ -10,3 +10,4 @@ To start the web server run: python runui.py - Arturo Filasto' <hellais(a)torproject.org> + diff --git a/packages/torouter-web/config.py b/packages/torouter-web/config.py index 9411bb7..aff1f8b 100644 --- a/packages/torouter-web/config.py +++ b/packages/torouter-web/config.py @@ -8,4 +8,5 @@ cache = False globals = {} +authinfo = ("test", "test") diff --git a/packages/torouter-web/tui/utils/session.py b/packages/torouter-web/tui/utils/session.py index 375b6bc..61c04cd 100644 --- a/packages/torouter-web/tui/utils/session.py +++ b/packages/torouter-web/tui/utils/session.py @@ -1,4 +1,5 @@ import web +import config # The main session class @@ -15,7 +16,7 @@ def is_logged(): return web.config._session.login def check_login(data): - if (data.user == "test") and (data.password == "test"): + if (data.user == config.authinfo[0]) and (data.password == config.authinfo[1]): web.config._session.login = 1 return 0 return 1

1 0

[torouter/master] Add some comments
by hellais＠torproject.org 11 Aug '11

11 Aug '11

commit db774cfe565e40a7ce4def89c130f69540493bf1 Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 11 18:25:24 2011 +0200 Add some comments --- packages/torouter-web/config.py | 1 + packages/torouter-web/runui.py | 2 ++ packages/torouter-web/view.py | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/packages/torouter-web/config.py b/packages/torouter-web/config.py index aff1f8b..765c3df 100644 --- a/packages/torouter-web/config.py +++ b/packages/torouter-web/config.py @@ -8,5 +8,6 @@ cache = False globals = {} +# Add your own (username, password) pair authinfo = ("test", "test") diff --git a/packages/torouter-web/runui.py b/packages/torouter-web/runui.py index 9b33d7a..030bf91 100644 --- a/packages/torouter-web/runui.py +++ b/packages/torouter-web/runui.py @@ -10,6 +10,7 @@ from tui.utils import session from view import render +# This is the main structure of URLs urls = ( '/', 'tui.controllers.main.index', # '/config/(tor|router)', 'tui.controllers.main.config', @@ -26,6 +27,7 @@ urls = ( if __name__ == "__main__": app = web.application(urls, globals()) + # Add session management to the app session.add_session_to_app(app) app.internalerror = web.debugerror app.run() diff --git a/packages/torouter-web/view.py b/packages/torouter-web/view.py index 639415a..f4c9b39 100644 --- a/packages/torouter-web/view.py +++ b/packages/torouter-web/view.py @@ -5,6 +5,7 @@ t_globals = dict( datestr=web.datestr, ) +# create the render object render = web.template.render('tui/views', cache=config.cache, globals=t_globals) render._keywords['globals']['render'] = render

1 0

[torouter/master] Move styling to static/ folder
by hellais＠torproject.org 11 Aug '11

11 Aug '11

commit 6d6eb966bc080325c3fdfd0320df794cdf523ea8 Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 11 18:34:26 2011 +0200 Move styling to static/ folder --- packages/torouter-web/config.pyc | Bin 255 -> 308 bytes packages/torouter-web/runui.pyc | Bin 1390 -> 1390 bytes packages/torouter-web/static/main.css | 29 +++++++++++++++++++ packages/torouter-web/tui/controllers/main.pyc | Bin 1196 -> 1196 bytes packages/torouter-web/tui/controllers/network.pyc | Bin 6373 -> 6373 bytes packages/torouter-web/tui/utils/session.pyc | Bin 1207 -> 1244 bytes packages/torouter-web/tui/views/base.html | 32 +------------------- packages/torouter-web/view.pyc | Bin 411 -> 411 bytes 8 files changed, 31 insertions(+), 30 deletions(-) diff --git a/packages/torouter-web/config.pyc b/packages/torouter-web/config.pyc index 23bf9e9..9ed9f95 100644 Binary files a/packages/torouter-web/config.pyc and b/packages/torouter-web/config.pyc differ diff --git a/packages/torouter-web/runui.pyc b/packages/torouter-web/runui.pyc index ce57e6c..a564a49 100644 Binary files a/packages/torouter-web/runui.pyc and b/packages/torouter-web/runui.pyc differ diff --git a/packages/torouter-web/static/main.css b/packages/torouter-web/static/main.css new file mode 100644 index 0000000..41cb47f --- /dev/null +++ b/packages/torouter-web/static/main.css @@ -0,0 +1,29 @@ + +/* Clear all */ +body { margin: 0;border: 0;padding: 0; } + +div.wrapper { + width: 800px; + margin: 0 auto; +} + +div.footer { + background-color: #CCC; + color: white; +} + +div.header { + color: white; +} + +div.header ul { + list-style: none; + height: 20px; +} + +div.header ul li { + float: left; + padding: 5px 10px; +} + + diff --git a/packages/torouter-web/tui/controllers/main.pyc b/packages/torouter-web/tui/controllers/main.pyc index 6fb29f0..93200bc 100644 Binary files a/packages/torouter-web/tui/controllers/main.pyc and b/packages/torouter-web/tui/controllers/main.pyc differ diff --git a/packages/torouter-web/tui/controllers/network.pyc b/packages/torouter-web/tui/controllers/network.pyc index ba6e816..0a0db6d 100644 Binary files a/packages/torouter-web/tui/controllers/network.pyc and b/packages/torouter-web/tui/controllers/network.pyc differ diff --git a/packages/torouter-web/tui/utils/session.pyc b/packages/torouter-web/tui/utils/session.pyc index 2084493..e825de5 100644 Binary files a/packages/torouter-web/tui/utils/session.pyc and b/packages/torouter-web/tui/utils/session.pyc differ diff --git a/packages/torouter-web/tui/views/base.html b/packages/torouter-web/tui/views/base.html index 47091f8..aca2bf9 100644 --- a/packages/torouter-web/tui/views/base.html +++ b/packages/torouter-web/tui/views/base.html @@ -5,38 +5,10 @@ $def with (page,submenu=None) <html> <head> <title>TUI - Tor Web User Interface</title> - <style type="text/css"> - body { - margin: 0; - border: 0; - padding: 0; - - } - - div.wrapper { - width: 800px; - margin: 0 auto; - } - - div.footer { - background-color: #CCC; - color: white; - } - - div.header { - background-color: #CCC; - color: white; - } - - ul#menu { - list-style: none; - - } - - </style> + <link REL="stylesheet" href="/static/main.css" type="text/css"> </head> <body> -<div id="header"> +<div class="header"> <ul id="menu"> <li><a href="/">Home</a></li> <li><a href="/network">Network</a></li> diff --git a/packages/torouter-web/view.pyc b/packages/torouter-web/view.pyc index 17728c0..3870298 100644 Binary files a/packages/torouter-web/view.pyc and b/packages/torouter-web/view.pyc differ

1 0

[torouter/master] Implement rudimentary session and login management
by hellais＠torproject.org 11 Aug '11

11 Aug '11

commit 30bf29091b7dd5531c5a096e09f3cdb6331b342f Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 11 18:18:34 2011 +0200 Implement rudimentary session and login management --- packages/torouter-web/config.py | 1 - packages/torouter-web/config.pyc | Bin 228 -> 255 bytes packages/torouter-web/runui.py | 3 + packages/torouter-web/runui.pyc | Bin 1271 -> 1390 bytes packages/torouter-web/tui/__init__.pyc | Bin 142 -> 169 bytes packages/torouter-web/tui/controllers/__init__.pyc | Bin 154 -> 181 bytes packages/torouter-web/tui/controllers/main.py | 11 ++++- packages/torouter-web/tui/controllers/main.pyc | Bin 855 -> 1196 bytes packages/torouter-web/tui/controllers/network.py | 49 +++++++++++++++---- packages/torouter-web/tui/controllers/network.pyc | Bin 5261 -> 6373 bytes packages/torouter-web/tui/controllers/tor.py | 1 + packages/torouter-web/tui/controllers/tor.pyc | Bin 1419 -> 1662 bytes packages/torouter-web/tui/utils/__init__.pyc | Bin 0 -> 175 bytes packages/torouter-web/tui/utils/session.py | 22 +++++++++ packages/torouter-web/tui/utils/session.pyc | Bin 0 -> 1207 bytes packages/torouter-web/tui/views/login.html | 7 +++ packages/torouter-web/view.pyc | Bin 384 -> 411 bytes 17 files changed, 80 insertions(+), 14 deletions(-) diff --git a/packages/torouter-web/config.py b/packages/torouter-web/config.py index 9b8f7a7..9411bb7 100644 --- a/packages/torouter-web/config.py +++ b/packages/torouter-web/config.py @@ -9,4 +9,3 @@ cache = False globals = {} - diff --git a/packages/torouter-web/config.pyc b/packages/torouter-web/config.pyc index 7eb9e48..23bf9e9 100644 Binary files a/packages/torouter-web/config.pyc and b/packages/torouter-web/config.pyc differ diff --git a/packages/torouter-web/runui.py b/packages/torouter-web/runui.py index 5f27e4f..9b33d7a 100644 --- a/packages/torouter-web/runui.py +++ b/packages/torouter-web/runui.py @@ -6,8 +6,10 @@ import web import config import tui.controllers +from tui.utils import session from view import render + urls = ( '/', 'tui.controllers.main.index', # '/config/(tor|router)', 'tui.controllers.main.config', @@ -24,6 +26,7 @@ urls = ( if __name__ == "__main__": app = web.application(urls, globals()) + session.add_session_to_app(app) app.internalerror = web.debugerror app.run() diff --git a/packages/torouter-web/runui.pyc b/packages/torouter-web/runui.pyc index dc829b3..ce57e6c 100644 Binary files a/packages/torouter-web/runui.pyc and b/packages/torouter-web/runui.pyc differ diff --git a/packages/torouter-web/tui/__init__.pyc b/packages/torouter-web/tui/__init__.pyc index df02c3e..912a260 100644 Binary files a/packages/torouter-web/tui/__init__.pyc and b/packages/torouter-web/tui/__init__.pyc differ diff --git a/packages/torouter-web/tui/controllers/__init__.pyc b/packages/torouter-web/tui/controllers/__init__.pyc index 8568b24..47771bf 100644 Binary files a/packages/torouter-web/tui/controllers/__init__.pyc and b/packages/torouter-web/tui/controllers/__init__.pyc differ diff --git a/packages/torouter-web/tui/controllers/main.py b/packages/torouter-web/tui/controllers/main.py index 2806467..7e1df50 100644 --- a/packages/torouter-web/tui/controllers/main.py +++ b/packages/torouter-web/tui/controllers/main.py @@ -1,14 +1,21 @@ import web import view, config from view import render +from tui.utils import session """ The main page for network configuration """ class index: def GET(self): - return render.base(render.index()) + if session.is_logged() > 0: + return render.base(render.index()) + else: + return render.base(render.login()) def POST(self): - return render.base(render.index()) + if session.check_login(web.input()) == 0: + return render.base(render.index()) + else: + return render.base(render.login()) diff --git a/packages/torouter-web/tui/controllers/main.pyc b/packages/torouter-web/tui/controllers/main.pyc index 8bd620b..6fb29f0 100644 Binary files a/packages/torouter-web/tui/controllers/main.pyc and b/packages/torouter-web/tui/controllers/main.pyc differ diff --git a/packages/torouter-web/tui/controllers/network.py b/packages/torouter-web/tui/controllers/network.py index 33e7f27..7022ca4 100644 --- a/packages/torouter-web/tui/controllers/network.py +++ b/packages/torouter-web/tui/controllers/network.py @@ -1,6 +1,7 @@ import web import view, config from view import render +from tui.utils import session """ This function is used to generate the network @@ -28,20 +29,34 @@ The main page for network configuration """ class main: def GET(self): - return render.base(render.main(),menu(0)) + if session.is_logged() > 0: + return render.base(render.main(),menu(0)) + else: + return render.base(render.login()) def POST(self): - return render.base(render.main(),menu(0)) + if session.is_logged() > 0: + return render.base(render.main(),menu(0)) + else: + return render.base(render.login()) """ The firewall configuration page """ class firewall: def GET(self): - return render.base(render.firewall(),menu(1)) + if session.is_logged() > 0: + return render.base(render.main(),menu(0)) + else: + return render.base(render.login()) def POST(self): - return render.base(render.firewall(),menu(1)) + if session.is_logged() > 0: + return render.base(render.firewall(),menu(1)) + else: + return render.base(render.login()) + + """ Wireless network configuration page @@ -78,23 +93,35 @@ class wireless: return True def GET(self): - if self.build_form(): - return render.base(render.wireless(self.form()),menu(2)) + if session.is_logged() > 0: + if self.build_form(): + return render.base(render.wireless(self.form()),menu(2)) + else: + return render.base(render.login()) def POST(self): - self.update_config(None) - print web.input() - return render.base(render.saved(web.input()),menu(2)) + if session.is_logged() > 0: + self.update_config(None) + print web.input() + return render.base(render.saved(web.input()),menu(2)) + else: + return render.base(render.login()) """ Wired network configuration page """ class wired: def GET(self): - return render.base(render.wired(),menu(3)) + if session.is_logged() > 0: + return render.base(render.wired(),menu(3)) + else: + return render.base(render.login()) def POST(self): - return render.base(render.wired(),menu(3)) + if session.is_logged() > 0: + return render.base(render.wired(),menu(3)) + else: + return render.base(render.login()) """ General status page, displays a bit more detail than main diff --git a/packages/torouter-web/tui/controllers/network.pyc b/packages/torouter-web/tui/controllers/network.pyc index 0fa3453..ba6e816 100644 Binary files a/packages/torouter-web/tui/controllers/network.pyc and b/packages/torouter-web/tui/controllers/network.pyc differ diff --git a/packages/torouter-web/tui/controllers/tor.py b/packages/torouter-web/tui/controllers/tor.py index 3b6116f..ca96209 100644 --- a/packages/torouter-web/tui/controllers/tor.py +++ b/packages/torouter-web/tui/controllers/tor.py @@ -1,6 +1,7 @@ import web import view, config from view import render +from tui.utils import session """ The main Tor status page diff --git a/packages/torouter-web/tui/controllers/tor.pyc b/packages/torouter-web/tui/controllers/tor.pyc index 21724c4..0c5e9f5 100644 Binary files a/packages/torouter-web/tui/controllers/tor.pyc and b/packages/torouter-web/tui/controllers/tor.pyc differ diff --git a/packages/torouter-web/tui/utils/__init__.py b/packages/torouter-web/tui/utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/packages/torouter-web/tui/utils/__init__.pyc b/packages/torouter-web/tui/utils/__init__.pyc new file mode 100644 index 0000000..3700fb7 Binary files /dev/null and b/packages/torouter-web/tui/utils/__init__.pyc differ diff --git a/packages/torouter-web/tui/utils/session.py b/packages/torouter-web/tui/utils/session.py new file mode 100644 index 0000000..375b6bc --- /dev/null +++ b/packages/torouter-web/tui/utils/session.py @@ -0,0 +1,22 @@ +import web + +# The main session class + +def add_session_to_app(app): + + if web.config.get("_session") is None: + store = web.session.DiskStore('sessions') + session = web.session.Session(app, store, initializer={'login': 0, 'privilege': 0}) + web.config._session = session + else: + session = web.config._session + +def is_logged(): + return web.config._session.login + +def check_login(data): + if (data.user == "test") and (data.password == "test"): + web.config._session.login = 1 + return 0 + return 1 + diff --git a/packages/torouter-web/tui/utils/session.pyc b/packages/torouter-web/tui/utils/session.pyc new file mode 100644 index 0000000..2084493 Binary files /dev/null and b/packages/torouter-web/tui/utils/session.pyc differ diff --git a/packages/torouter-web/tui/views/login.html b/packages/torouter-web/tui/views/login.html new file mode 100644 index 0000000..1377078 --- /dev/null +++ b/packages/torouter-web/tui/views/login.html @@ -0,0 +1,7 @@ +Login is required +<form method="POST" action="/"> + Login: <input type="text" name="user"> + Password: <input type="password" name="password"> + <input type="submit" name="login"> +</form> + diff --git a/packages/torouter-web/view.pyc b/packages/torouter-web/view.pyc index b8a529b..17728c0 100644 Binary files a/packages/torouter-web/view.pyc and b/packages/torouter-web/view.pyc differ

1 0

[arm/master] fix: quitting could cause unclean curses shutdown
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 61273dee395e4ba0969d93b194ab728ffb2fbc7f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 11 08:49:03 2011 -0700 fix: quitting could cause unclean curses shutdown If the user quit arm while we're processing tor events then there was a rather common timing issue where curses would terminate, then a daemon thread triggered a curses redraw. The result was that the terminal would be screwed up until the user ran 'reset'. This was because the daemon shutdown was outside of the curses wrapper function. Changing the ordering so we shut down daemons before curses, and setting a flag during keyboard interrupts to suppress curses redraws. --- src/cli/controller.py | 11 +++++++++-- src/util/panel.py | 7 +++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 8b87b1d..d2194ca 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -675,9 +675,14 @@ def startTorMonitor(startTime): try: curses.wrapper(drawTorMonitor, startTime) - shutdownDaemons() except KeyboardInterrupt: - # skip printing stack trace in case of keyboard interrupt + # Skip printing stack trace in case of keyboard interrupt. The + # HALT_ACTIVITY attempts to prevent daemons from triggering a curses redraw + # (which would leave the user's terminal in a screwed up state). There is + # still a tiny timing issue here (after the exception but before the flag + # is set) but I've never seen it happen in practice. + + panel.HALT_ACTIVITY = True shutdownDaemons() def drawTorMonitor(stdscr, startTime): @@ -772,4 +777,6 @@ def drawTorMonitor(stdscr, startTime): for panelImpl in displayPanels: isKeystrokeConsumed = panelImpl.handleKey(key) if isKeystrokeConsumed: break + + shutdownDaemons() diff --git a/src/util/panel.py b/src/util/panel.py index 732610c..8a95479 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -25,6 +25,9 @@ for colorLabel in uiTools.COLOR_LIST: FORMAT_TAGS["<%s>" % colorLabel] = (uiTool CONFIG = {"log.panelRecreated": log.DEBUG} +# prevents curses redraws if set +HALT_ACTIVITY = False + def loadConfig(config): config.update(CONFIG) @@ -375,8 +378,8 @@ class Panel(): abandoned """ - # skipped if not currently visible - if not self.isVisible(): return + # skipped if not currently visible or activity has been halted + if not self.isVisible() or HALT_ACTIVITY: return # if the panel's completely outside its parent then this is a no-op newHeight, newWidth = self.getPreferredSize()

1 0