- tor-commits - lists.torproject.org

r24833: {check} at least use an IP for the client that we control. (check/trunk/cgi-bin)
by Andrew Lewman 23 Jun '11

23 Jun '11

Author: phobos Date: 2011-06-23 02:33:10 +0000 (Thu, 23 Jun 2011) New Revision: 24833 Modified: check/trunk/cgi-bin/TorBulkExitList.py Log: at least use an IP for the client that we control. Modified: check/trunk/cgi-bin/TorBulkExitList.py =================================================================== --- check/trunk/cgi-bin/TorBulkExitList.py 2011-06-23 02:31:32 UTC (rev 24832) +++ check/trunk/cgi-bin/TorBulkExitList.py 2011-06-23 02:33:10 UTC (rev 24833) @@ -144,7 +144,7 @@ return possibleExits -def isUsingTor(clientIp, ELTarget = "209.237.247.217", ELPort = "80"): +def isUsingTor(clientIp, ELTarget = "38.229.70.31", ELPort = "80"): ELExitNode = ".".join(reversed(clientIp.strip().split('.'))) ELTarget = ".".join(reversed(ELTarget.strip().split('.')))

1 0

r24832: {check} comment out RawExitListURL because it isnt used and confuses (check/trunk/cgi-bin)
by Andrew Lewman 23 Jun '11

23 Jun '11

Author: phobos Date: 2011-06-23 02:31:32 +0000 (Thu, 23 Jun 2011) New Revision: 24832 Modified: check/trunk/cgi-bin/TorBulkExitList.py Log: comment out RawExitListURL because it isnt used and confuses me, change to an actual tmpfs. Modified: check/trunk/cgi-bin/TorBulkExitList.py =================================================================== --- check/trunk/cgi-bin/TorBulkExitList.py 2011-06-23 02:30:21 UTC (rev 24831) +++ check/trunk/cgi-bin/TorBulkExitList.py 2011-06-23 02:31:32 UTC (rev 24832) @@ -69,7 +69,7 @@ # Someday, do a real http get request here # read into buffer, return buffer RawExitList with contents. # follow instructions from http://docs.python.org/lib/module-urllib.html - RawExitListURL = "http://exitlist.torproject.org/exitAddresses" + # RawExitListURL = "http://exitlist.torproject.org/exitAddresses" # Currently fake this and return a static file: RawExitList = '/srv/check.torproject.org/tordnsel/state/exit-addresses' @@ -84,8 +84,8 @@ """ maxListAge = 1600 - parsedListDirPath = "/tmp/TorBulkCheck/" - parsedExitList = "/tmp/TorBulkCheck/parsed-exit-list" + parsedListDirPath = "/dev/shm/TorBulkCheck/" + parsedExitList = "/dev/shm/TorBulkCheck/parsed-exit-list" try: parsedListDir = os.stat(parsedListDirPath)

1 0

r24831: {check} fix the ElTarget IP address. (check/trunk/cgi-bin)
by Andrew Lewman 23 Jun '11

23 Jun '11

Author: phobos Date: 2011-06-23 02:30:21 +0000 (Thu, 23 Jun 2011) New Revision: 24831 Modified: check/trunk/cgi-bin/TorCheck.py Log: fix the ElTarget IP address. Modified: check/trunk/cgi-bin/TorCheck.py =================================================================== --- check/trunk/cgi-bin/TorCheck.py 2011-06-21 12:58:44 UTC (rev 24830) +++ check/trunk/cgi-bin/TorCheck.py 2011-06-23 02:30:21 UTC (rev 24831) @@ -57,7 +57,7 @@ # ELPort is now set by the caller # We'll try to reach this host - ElTarget = "31.70.229.38" + ElTarget = "38.229.70.31" # This is the ExitList DNS server we want to query ELHost = "ip-port.exitlist.torproject.org"

1 0

[torbutton/master] Bug 2843: Update preferences window to support env var.
by mikeperry＠torproject.org 23 Jun '11

23 Jun '11

commit 8ba1b90bd4b0d4309b96288239fded1e4bd099ee Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Jun 22 15:40:58 2011 -0700 Bug 2843: Update preferences window to support env var. These changes only make the preferences window sane wrt to the TOR_SOCKS_PORT environment var. We still need some code to set the pref during startup. --- src/chrome/content/preferences.js | 47 ++++++++++++++++++++++++--------- src/chrome/content/torbutton_util.js | 21 +++++++++++++++ 2 files changed, 55 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index c18d40a..d72509a 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -14,26 +14,34 @@ function torbutton_prefs_set_field_attributes(doc) doc.getElementById('torbutton_panelStyle').setAttribute("disabled", !doc.getElementById('torbutton_displayStatusPanel').checked); doc.getElementById('torbutton_panelStyleText').setAttribute("disabled", !doc.getElementById('torbutton_displayStatusPanel').checked); doc.getElementById('torbutton_panelStyleIcon').setAttribute("disabled", !doc.getElementById('torbutton_displayStatusPanel').checked); + // Privoxy is always recommended for Firefoxes not supporting socks_remote_dns if (doc.getElementById('torbutton_transparentTor').selected) { doc.getElementById('torbutton_settingsMethod').value = 'transparent'; - } - else if (!torbutton_check_socks_remote_dns()) { + } else if (!torbutton_check_socks_remote_dns()) { doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", true); } else { doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", doc.getElementById('torbutton_settingsMethod').value != 'recommended'); } - var proxy_port; - var proxy_host; - if (doc.getElementById('torbutton_usePrivoxy').checked) { - proxy_host = '127.0.0.1'; - proxy_port = 8118; - } else { - proxy_host = ''; - proxy_port = 0; - } if (doc.getElementById('torbutton_settingsMethod').value == 'recommended') { + var proxy_port; + var proxy_host; + if (torbutton_has_good_socks()) { + doc.getElementById('torbutton_usePrivoxy').checked = false; + doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", true); + proxy_host = ''; + proxy_port = 0; + } else { + if (doc.getElementById('torbutton_usePrivoxy').checked) { + proxy_host = '127.0.0.1'; + proxy_port = 8118; + } else { + proxy_host = ''; + proxy_port = 0; + } + } + torbutton_log(2, "using recommended settings"); if (!torbutton_check_socks_remote_dns()) { doc.getElementById('torbutton_httpProxy').value = proxy_host; @@ -55,8 +63,21 @@ function torbutton_prefs_set_field_attributes(doc) doc.getElementById('torbutton_gopherProxy').value = ''; doc.getElementById('torbutton_gopherPort').value = 0; } - doc.getElementById('torbutton_socksHost').value = '127.0.0.1'; - doc.getElementById('torbutton_socksPort').value = 9050; + + var environ = Components.classes["@mozilla.org/process/environment;1"] + .getService(Components.interfaces.nsIEnvironment); + + if (environ.exists("TOR_SOCKS_PORT")) { + doc.getElementById('torbutton_socksPort').value = parseInt(environ.get("TOR_SOCKS_PORT")); + } else { + doc.getElementById('torbutton_socksPort').value = 9050; + } + + if (environ.exists("TOR_SOCKS_HOST")) { + doc.getElementById('torbutton_socksHost').value = environ.get("TOR_SOCKS_HOST"); + } else { + doc.getElementById('torbutton_socksHost').value = '127.0.0.1'; + } doc.getElementById('torbutton_httpProxy').disabled = true; doc.getElementById('torbutton_httpPort').disabled = true; diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js index fb17932..808c826 100644 --- a/src/chrome/content/torbutton_util.js +++ b/src/chrome/content/torbutton_util.js @@ -6,6 +6,7 @@ var appInfo = Components.classes["@mozilla.org/xre/app-info;1"] .getService(Components.interfaces.nsIXULAppInfo); var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"] .getService(Components.interfaces.nsIVersionComparator); +var m_tb_ff5 = false; var m_tb_ff4 = false; if(versionChecker.compare(appInfo.version, "4.0a1") >= 0) { @@ -13,6 +14,11 @@ if(versionChecker.compare(appInfo.version, "4.0a1") >= 0) { } else { m_tb_ff4 = false; } +if(versionChecker.compare(appInfo.version, "5.0a1") >= 0) { + m_tb_ff5 = true; +} else { + m_tb_ff5 = false; +} function torbutton_eclog(nLevel, sMsg) { @@ -97,6 +103,21 @@ function torbutton_check_socks_remote_dns() } } +function torbutton_has_good_socks() { + if(m_tb_ff5) { + return true; + } + + // TBB will set this pref if it has the SOCKS timeout patch applied + var environ = Components.classes["@mozilla.org/process/environment;1"] + .getService(Components.interfaces.nsIEnvironment); + + if (environ.exists("TOR_SOCKS_PORT")) + return true; + + return false; +} + function torbutton_check_status() { var liveprefs = false; var torprefs = false;

1 0

[torbutton/master] Bug 2843: Handle TOR_SOCKS env vars on prefs init.
by mikeperry＠torproject.org 23 Jun '11

23 Jun '11

commit c08fc99d42fbd89f63aba38d871162295fa45530 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Jun 22 16:06:17 2011 -0700 Bug 2843: Handle TOR_SOCKS env vars on prefs init. We still need to fix #2338 to deal with this properly. TBB will never read the env var otherwise. --- src/chrome/content/torbutton.js | 68 +++++++++++++++++++++------------------ 1 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 08cb506..4016800 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -634,6 +634,8 @@ function torbutton_open_link_as_tor(tabFlag) { // this function duplicates a lot of code in preferences.js for deciding our // recommended settings. figure out a way to eliminate the redundancy. // TODO: Move it to torbutton_util.js? + +// XXX: Still doesn't help torbrowser... function torbutton_init_prefs() { var torprefs = false; var proxy_port; @@ -641,26 +643,26 @@ function torbutton_init_prefs() { torbutton_log(2, "called init_prefs()"); torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - // Privoxy is always recommended for Firefoxes not supporting socks_remote_dns - if (!torbutton_check_socks_remote_dns()) - torprefs.setBoolPref('use_privoxy', true); + if (torprefs.getCharPref('settings_method') == 'recommended') { + torbutton_log(2, "using recommended settings"); + if (torbutton_has_good_socks()) { + proxy_host = ''; + proxy_port = 0; + } else { + // Privoxy is always recommended for Firefoxes not supporting socks_remote_dns + if (!torbutton_check_socks_remote_dns()) + torprefs.setBoolPref('use_privoxy', true); - if (torprefs.getBoolPref('use_privoxy')) - { - proxy_host = '127.0.0.1'; - proxy_port = 8118; - } - else - { - proxy_host = ''; - proxy_port = 0; - } + if (torprefs.getBoolPref('use_privoxy')) { + proxy_host = '127.0.0.1'; + proxy_port = 8118; + } else { + proxy_host = ''; + proxy_port = 0; + } + } - if (torprefs.getCharPref('settings_method') == 'recommended') - { - torbutton_log(2, "using recommended settings"); - if (torbutton_check_socks_remote_dns()) - { + if (torbutton_check_socks_remote_dns()) { torprefs.setCharPref('http_proxy', proxy_host); torprefs.setCharPref('https_proxy', proxy_host); torprefs.setCharPref('ftp_proxy', ''); @@ -683,21 +685,25 @@ function torbutton_init_prefs() { torprefs.setIntPref('https_port', proxy_port); torprefs.setIntPref('ftp_port', proxy_port); } - torprefs.setCharPref('socks_host', '127.0.0.1'); - torprefs.setIntPref('socks_port', 9050); + + var environ = Components.classes["@mozilla.org/process/environment;1"] + .getService(Components.interfaces.nsIEnvironment); + + if (environ.exists("TOR_SOCKS_PORT")) { + torprefs.setIntPref('socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); + } else { + torprefs.setIntPref('socks_port', 9050); + } + + if (environ.exists("TOR_SOCKS_HOST")) { + torprefs.setCharPref('socks_host', environ.get("TOR_SOCKS_HOST")); + } else { + torprefs.setCharPref('socks_host', '127.0.0.1'); + } + } torbutton_log(1, 'http_port='+torprefs.getIntPref('http_port')); - // m_tb_prefs.setCharPref('extensions.torbutton.http_proxy', m_http_proxy); - // m_tb_prefs.setIntPref('extensions.torbutton.http_port', m_http_port); - // m_tb_prefs.setCharPref('extensions.torbutton.https_proxy', m_https_proxy); - // m_tb_prefs.setIntPref('extensions.torbutton.https_port', m_https_port); - // m_tb_prefs.setCharPref('extensions.torbutton.ftp_proxy', m_ftp_proxy); - // m_tb_prefs.setIntPref('extensions.torbutton.ftp_port', m_ftp_port); - // m_tb_prefs.setCharPref('extensions.torbutton.gopher_proxy', m_gopher_proxy); - // m_tb_prefs.setIntPref('extensions.torbutton.gopher_port', m_gopher_port); - // m_tb_prefs.setCharPref('extensions.torbutton.socks_host', m_socks_host); - // m_tb_prefs.setIntPref('extensions.torbutton.socks_port', m_socks_port); } function torbutton_get_button_from_toolbox() {

1 0

[torbutton/master] Bug 2338: Force toggle at startup if tor is enabled
by mikeperry＠torproject.org 23 Jun '11

23 Jun '11

commit 9f182ff942cd51ae0c553a5fd94205080b8a1a47 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Jun 22 17:12:27 2011 -0700 Bug 2338: Force toggle at startup if tor is enabled The toggle ensures our applied prefs match the current torbutton xpi values. It also ensures our proxy matches the environment variable (#2843). --- src/chrome/content/torbutton.js | 44 ++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4016800..d62549a 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2498,7 +2498,7 @@ function torbutton_tag_new_browser(browser, tor_tag, no_plugins) { } } -function torbutton_conditional_set(state) { +function torbutton_set_launch_state(state, session_restore) { if (!m_tb_wasinited) torbutton_init(); var no_plugins = m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins"); @@ -2515,7 +2515,7 @@ function torbutton_conditional_set(state) { var browser = win.getBrowser(); if(!browser) { // XXX: Could add a location here.. - torbutton_log(5, "No browser for plugin window in conditional_set."); + torbutton_log(5, "No browser for plugin window in set_launch_state."); continue; } var browsers = browser.browsers; @@ -2546,11 +2546,35 @@ function torbutton_conditional_set(state) { } } - torbutton_log(4, "Restoring tor state"); - if (torbutton_check_status() == state) return; - - if(state) torbutton_enable_tor(true); - else torbutton_disable_tor(); + + if (torbutton_check_status() == state) { + // Do a quick toggle if tor is always enabled to ensure we update prefs properly + // in the event of an upgrade, offline proxy change, etc + if (state) { + torbutton_disable_tor(); + torbutton_enable_tor(true); + torbutton_log(4, "Tor state updated."); + + // Load our homepage again. We just killed it via the toggle. + if (!session_restore) { + var homepage = m_tb_prefs.getCharPref("browser.startup.homepage"); + gBrowser.loadURI(homepage, null, null); + } + } else { + torbutton_log(3, "Leaving tor disabled"); + } + } else { + torbutton_log(4, "Restoring proper tor state"); + + if(state) torbutton_enable_tor(true); + else torbutton_disable_tor(); + + // Load our homepage again. We just killed it via the toggle. + if (!session_restore) { + var homepage = m_tb_prefs.getCharPref("browser.startup.homepage"); + gBrowser.loadURI(homepage, null, null); + } + } } function torbutton_restore_cookies(tor_enabled) @@ -2645,9 +2669,9 @@ function torbutton_crash_recover() m_tb_prefs.setBoolPref("extensions.torbutton.settings_applied", state); if(m_tb_prefs.getBoolPref("extensions.torbutton.restore_tor")) - torbutton_conditional_set(true); + torbutton_set_launch_state(true, !m_tb_prefs.getBoolPref("extensions.torbutton.notor_sessionstore")); else - torbutton_conditional_set(false); + torbutton_set_launch_state(false, !m_tb_prefs.getBoolPref("extensions.torbutton.nonontor_sessionstore")); if (state) { // Need to maybe generate google cookie if tor is enabled @@ -3395,7 +3419,7 @@ function torbutton_set_initial_state() { torbutton_log(3, "Setting initial tor state to: "+restore_tor); - torbutton_conditional_set(restore_tor); + torbutton_set_launch_state(restore_tor, false); m_tb_prefs.setBoolPref("extensions.torbutton.noncrashed", false);

1 0

[tor/maint-0.2.2] Fix comment typo
by nickm＠torproject.org 22 Jun '11

22 Jun '11

commit 8a55da57ed17dfb9cefe3193cbda53a15547630e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Jun 19 01:25:51 2011 -0700 Fix comment typo --- src/test/tinytest_demo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test/tinytest_demo.c b/src/test/tinytest_demo.c index bd33cc3..4d2f588 100644 --- a/src/test/tinytest_demo.c +++ b/src/test/tinytest_demo.c @@ -39,7 +39,7 @@ /* ============================================================ */ /* First, let's see if strcmp is working. (All your test cases should be - * functions declared to take a single void * as) an argument. */ + * functions declared to take a single void * as an argument.) */ void test_strcmp(void *data) {

1 0

[tor/maint-0.2.2] Fix minor comment issues
by nickm＠torproject.org 22 Jun '11

22 Jun '11

commit d7254bea11a0fc2685cc2ea24fb57d2ab3945b2f Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Jun 19 01:28:40 2011 -0700 Fix minor comment issues --- src/common/compat.c | 2 +- src/or/connection.c | 6 +++--- src/or/or.h | 6 +++--- src/test/Makefile.am | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 9377959..c983925 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -415,7 +415,7 @@ tor_vasprintf(char **strp, const char *fmt, va_list args) * * This function is not timing-safe. * - * Requires that nlen be greater than zero. + * Requires that nlen be greater than zero. */ const void * tor_memmem(const void *_haystack, size_t hlen, diff --git a/src/or/connection.c b/src/or/connection.c index a9e3a74..b2412a2 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2751,15 +2751,15 @@ connection_outbuf_too_full(connection_t *conn) return (conn->outbuf_flushlen > 10*CELL_PAYLOAD_SIZE); } -/** Try to flush more bytes onto conn-\>s. +/** Try to flush more bytes onto conn-\>s. * * This function gets called either from conn_write() in main.c * when poll() has declared that conn wants to write, or below * from connection_write_to_buf() when an entire TLS record is ready. * - * Update conn-\>timestamp_lastwritten to now, and call flush_buf + * Update conn-\>timestamp_lastwritten to now, and call flush_buf * or flush_buf_tls appropriately. If it succeeds and there are no more - * more bytes on conn->outbuf, then call connection_finished_flushing + * more bytes on conn-\>outbuf, then call connection_finished_flushing * on it too. * * If force, then write as many bytes as possible, ignoring bandwidth diff --git a/src/or/or.h b/src/or/or.h index 97fecd1..1909887 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2318,14 +2318,14 @@ typedef struct or_circuit_t { cell_ewma_t p_cell_ewma; } or_circuit_t; -/** Convert a circuit subtype to a circuit_t.*/ +/** Convert a circuit subtype to a circuit_t. */ #define TO_CIRCUIT(x) (&((x)->_base)) -/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Asserts +/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Assert * if the cast is impossible. */ static or_circuit_t *TO_OR_CIRCUIT(circuit_t *); /** Convert a circuit_t* to a pointer to the enclosing origin_circuit_t. - * Asserts if the cast is impossible. */ + * Assert if the cast is impossible. */ static origin_circuit_t *TO_ORIGIN_CIRCUIT(circuit_t *); static INLINE or_circuit_t *TO_OR_CIRCUIT(circuit_t *x) diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 546fa2f..904719d 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ -I"$(top_srcdir)/src/or" # -L flags need to go in LDFLAGS. -l flags need to go in LDADD. -# This seems to matter nowhere but on windows, but I assure you that it +# This seems to matter nowhere but on Windows, but I assure you that it # matters a lot there, and is quite hard to debug if you forget to do it. test_SOURCES = \

1 0

[tor/maint-0.2.2] Improve documentation of smartlist_split_string
by nickm＠torproject.org 22 Jun '11

22 Jun '11

commit 2b5ebc70973b1c0dd62201908632733c0953a4ec Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Jun 22 13:47:32 2011 -0700 Improve documentation of smartlist_split_string --- src/common/container.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/container.c b/src/common/container.c index da44b7f..1515c38 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -338,7 +338,8 @@ smartlist_insert(smartlist_t *sl, int idx, void *val) /** * Split a string str along all occurrences of sep, - * adding the split strings, in order, to sl. + * appending the (newly allocated) split strings, in order, to + * sl. Return the number of strings added to sl. * * If flags&SPLIT_SKIP_SPACE is true, remove initial and * trailing space from each entry. @@ -347,7 +348,7 @@ smartlist_insert(smartlist_t *sl, int idx, void *val) * If flags&SPLIT_STRIP_SPACE is true, strip spaces from each * split string. * - * If max>0, divide the string into no more than max pieces. If + * If max\>0, divide the string into no more than max pieces. If * sep is NULL, split on any sequence of horizontal space. */ int

1 0

[arm/master] Relay setup wizard role selection
by atagar＠torproject.org 22 Jun '11

22 Jun '11

commit 5eb2155266cf4d50af23a9c0cd06d5ab05db9553 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 21 20:14:09 2011 -0700 Relay setup wizard role selection This provides the first prompt of the relay setup wizard which has options for the general role Tor will have. Options include: - Internal Realy - Exit Relay - Bridge - Client - Cancel Selection is currenty a no-op. Next thing to do are the sub-dialogs these options go to... --- README | 1 + src/cli/__init__.py | 2 +- src/cli/controller.py | 7 +++- src/cli/menu/actions.py | 2 + src/cli/menu/menu.py | 1 + src/cli/wizard.py | 98 +++++++++++++++++++++++++++++++++++++++++++++++ src/settings.cfg | 15 +++++++ src/util/uiTools.py | 11 +++++ 8 files changed, 135 insertions(+), 2 deletions(-) diff --git a/README b/README index 44fabf1..835b02b 100644 --- a/README +++ b/README @@ -187,6 +187,7 @@ Layout: headerPanel.py - top of all pages, providing general information descriptorPopup.py - displays connection descriptor data popups.py - toolkit providing display popups + wizard.py - provides the relay setup wizard logPanel.py - (page 1) displays tor, arm, and torctl events configPanel.py - (page 3) editor panel for the tor configuration diff --git a/src/cli/__init__.py b/src/cli/__init__.py index 1564f68..435883d 100644 --- a/src/cli/__init__.py +++ b/src/cli/__init__.py @@ -2,5 +2,5 @@ Panels, popups, and handlers comprising the arm user interface. """ -__all__ = ["configPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "popups", "torrcPanel"] +__all__ = ["configPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "popups", "torrcPanel", "wizard"] diff --git a/src/cli/controller.py b/src/cli/controller.py index e20e023..e771a26 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -8,6 +8,7 @@ import curses import threading import cli.menu.menu +import cli.wizard import cli.popups import cli.headerPanel import cli.logPanel @@ -455,6 +456,7 @@ def startTorMonitor(startTime): cli.graphing.graphPanel.loadConfig(config) cli.connections.connEntry.loadConfig(config) + cli.wizard.loadConfig(config) # attempts to fetch the tor pid, warning if unsuccessful (this is needed for # checking its resource usage, among other things) @@ -536,7 +538,8 @@ def drawTorMonitor(stdscr, startTime): # main draw loop overrideKey = None # uses this rather than waiting on user input isUnresponsive = False # flag for heartbeat responsiveness check - + if not torTools.getConn().isAlive(): overrideKey = ord('w') # shows wizard + while not control.isDone(): displayPanels = control.getDisplayPanels() isUnresponsive = heartbeatCheck(isUnresponsive) @@ -593,6 +596,8 @@ def drawTorMonitor(stdscr, startTime): log.log(log.ERR, "Error detected when reloading tor: %s" % sysTools.getFileErrorMsg(exc)) elif key == ord('h') or key == ord('H'): overrideKey = cli.popups.showHelpPopup() + elif key == ord('w') or key == ord('W'): + cli.wizard.showWizard() else: for panelImpl in displayPanels: isKeystrokeConsumed = panelImpl.handleKey(key) diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index c571bd8..3c90b10 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -5,6 +5,7 @@ Generates the menu for arm, binding options with their related actions. import functools import cli.popups +import cli.wizard import cli.controller import cli.menu.item import cli.graphing.graphPanel @@ -53,6 +54,7 @@ def makeActionsMenu(): actionsMenu = cli.menu.item.Submenu("Actions") actionsMenu.add(cli.menu.item.MenuItem("Close Menu", None)) actionsMenu.add(cli.menu.item.MenuItem("New Identity", headerPanel.sendNewnym)) + actionsMenu.add(cli.menu.item.MenuItem("Setup Wizard", cli.wizard.showWizard)) if control.isPaused(): label, arg = "Unpause", False else: label, arg = "Pause", True diff --git a/src/cli/menu/menu.py b/src/cli/menu/menu.py index 1dbbbd0..8302551 100644 --- a/src/cli/menu/menu.py +++ b/src/cli/menu/menu.py @@ -109,6 +109,7 @@ def showMenu(): popup.win.refresh() + curses.cbreak() key = control.getScreen().getch() cursor.handleKey(key) diff --git a/src/cli/wizard.py b/src/cli/wizard.py new file mode 100644 index 0000000..2b7cdf7 --- /dev/null +++ b/src/cli/wizard.py @@ -0,0 +1,98 @@ +""" +Provides user prompts for setting up a new relay. This autogenerates a torrc +that's used by arm to start its tor instance. +""" + +import curses + +import cli.popups +import cli.controller + +from util import enum, uiTools + +# basic configuration types we can run as +RunType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") + +# other options provided in the prompts +CANCEL, BACK = "Cancel", "Back" + +CONFIG = {"wizard.role.message": "", + "wizard.role.option.label": {}, + "wizard.role.option.description": {}} + +def loadConfig(config): + config.update(CONFIG) + +def showWizard(): + myRole = promptRunType() + +def promptRunType(): + """ + Provides a prompt for selecting the general role we'd like Tor to run with. + This returns a RunType enumeration for the selection, or None if the dialog + was canceled. + """ + + popup, _, _ = cli.popups.init(23, 58) + if not popup: return + control = cli.controller.getController() + key, selection = 0, 0 + + # constructs (enum, label, [description lines]) tuples for our options + options = [] + + for runType in RunType.values() + [CANCEL]: + label = CONFIG["wizard.role.option.label"].get(runType, "") + descRemainder = CONFIG["wizard.role.option.description"].get(runType, "") + descLines = [] + + while descRemainder: + descLine, descRemainder = uiTools.cropStr(descRemainder, 54, None, endType = None, getRemainder = True) + descLines.append(descLine.strip()) + + options.append((runType, label, descLines)) + + try: + popup.win.box() + curses.cbreak() + format = uiTools.getColor("green") + y, msgRemainder = 1, CONFIG["wizard.role.message"] + + # provides the welcoming message + while msgRemainder: + msg, msgRemainder = uiTools.cropStr(msgRemainder, 54, None, endType = None, getRemainder = True) + popup.addstr(y, 2, msg.strip(), format | curses.A_BOLD) + y += 1 + + while not uiTools.isSelectionKey(key): + offset = 0 + + for i in range(len(options)): + _, label, lines = options[i] + optionFormat = format | curses.A_STANDOUT if i == selection else format + + # Curses has a weird bug where there's a one-pixel alignment + # difference between bold and regular text, so it looks better + # to render the whitespace here as not being bold. + + offset += 1 + popup.addstr(y + offset, 2, label, optionFormat | curses.A_BOLD) + popup.addstr(y + offset, 2 + len(label), " " * (54 - len(label)), optionFormat) + offset += 1 + + for line in lines: + popup.addstr(y + offset, 2, uiTools.padStr(line, 54), optionFormat) + offset += 1 + + popup.win.refresh() + key = control.getScreen().getch() + + if key == curses.KEY_UP: selection = max(0, selection - 1) + elif key == curses.KEY_DOWN: selection = min(len(options) - 1, selection + 1) + elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel + finally: + cli.popups.finalize() + + selectedOption = options[selection][0] + return None if selectedOption == CANCEL else selectedOption + diff --git a/src/settings.cfg b/src/settings.cfg index bced9a4..2ad2784 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -340,6 +340,21 @@ msg.ARM_DEBUG GETINFO traffic/written msg.ARM_DEBUG GETCONF msg.ARM_DEBUG Unable to query process resource usage from ps +# descriptions used in the relay setup wizard +wizard.role.message Welcome to the Tor network! This will step you through the configuration process for being a part of it. To start with, what role would you like to have? + +wizard.role.option.label Relay => Internal Relay +wizard.role.option.label Exit => Exit Relay +wizard.role.option.label Bridge => Bridge +wizard.role.option.label Client => Client +wizard.role.option.label Cancel => Cancel + +wizard.role.option.description Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. +wizard.role.option.description Exit => Connects between Tor an the outside Internet. This is a vital role, but can lead to abuse complaints. +wizard.role.option.description Bridge => Non-public relay specifically for helping censored users. +wizard.role.option.description Client => Use the network without contributing to it. +wizard.role.option.description Cancel => Close without starting Tor. + # some config options are fetched via special values torrc.map HiddenServiceDir => HiddenServiceOptions torrc.map HiddenServicePort => HiddenServiceOptions diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 40a3087..52885de 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -282,6 +282,17 @@ def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, ge if getRemainder: return (returnMsg, remainder) else: return returnMsg +def padStr(msg, size): + """ + Provides the string padded with whitespace to the given length. + + Arguments: + msg - string to be padded + size - length to be padded to + """ + + return ("%%-%is" % size) % msg + def camelCase(label, divider = "_", joiner = " "): """ Converts the given string to camel case, ie:

1 0