- tor-commits - lists.torproject.org

[tor/master] Look at the right consensus in router_add_to_routerlist()
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 60832766ac19e8f027455d23254e376042c21ef2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 10:02:24 2011 -0400 Look at the right consensus in router_add_to_routerlist() Just looking at the "latest" consensus could give us a microdesc consensus, if microdescs were enabled. That would make us decide that every routerdesc was unlisted in the latest consensus and drop them all: Ouch. Fixes bug 3113; bugfix on 0.2.3.1-alpha. --- changes/bug3113 | 4 ++++ src/or/routerlist.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug3113 b/changes/bug3113 new file mode 100644 index 0000000..7c3b5ce --- /dev/null +++ b/changes/bug3113 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Do not free all general-purposes regular descriptors just + because microdescriptor use is enabled. Fixes bug 3113; + bugfix on 0.2.3.1-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 00557a2..5aaa4a9 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -3273,7 +3273,8 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg, int authdir = authdir_mode_handles_descs(options, router->purpose); int authdir_believes_valid = 0; routerinfo_t *old_router; - networkstatus_t *consensus = networkstatus_get_latest_consensus(); + networkstatus_t *consensus = + networkstatus_get_latest_consensus_by_flavor(FLAV_NS); const smartlist_t *networkstatus_v2_list = networkstatus_get_v2_list(); int in_consensus = 0;

1 0

[tor/master] Kill redundant checks around routerset_contains_*()
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 64c8e8edda5a7f3525a1ab365c4bd72b19212322 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 7 11:52:13 2011 -0400 Kill redundant checks around routerset_contains_*() All of the routerset_contains*() functions return 0 if their routerset_t argument is NULL. Therefore, there's no point in doing "if (ExcludeNodes && routerset_contains*(ExcludeNodes...))", for example. This patch fixes every instance of if (X && routerstatus_contains*(X,...)) Note that there are other patterns that _aren't_ redundant. For example, we *don't* want to change: if (EntryNodes && !routerstatus_contains(EntryNodes,...)) Fixes #2797. No bug here; just needless code. --- src/or/circuitbuild.c | 6 ++---- src/or/connection_edge.c | 3 +-- src/or/directory.c | 2 +- src/or/rendclient.c | 2 +- src/or/rendservice.c | 2 +- src/or/routerlist.c | 7 ++++--- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 4ec45bc..90d9280 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2693,8 +2693,7 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) n_supported[i] = -1; continue; /* skip routers that are known to be down or bad exits */ } - if (options->_ExcludeExitNodesUnion && - routerset_contains_node(options->_ExcludeExitNodesUnion, node)) { + if (routerset_contains_node(options->_ExcludeExitNodesUnion, node)) { n_supported[i] = -1; continue; /* user asked us not to use it, no matter what */ } @@ -3505,8 +3504,7 @@ entry_is_live(entry_guard_t *e, int need_uptime, int need_capacity, return NULL; } } - if (options->EntryNodes && - routerset_contains_node(options->EntryNodes, node)) { + if (routerset_contains_node(options->EntryNodes, node)) { /* they asked for it, they get it */ need_uptime = need_capacity = 0; } diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index c490148..3f6e87c 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3146,8 +3146,7 @@ connection_ap_can_use_exit(edge_connection_t *conn, const node_t *exit) if (!conn->chosen_exit_name && node_exit_policy_rejects_all(exit)) return 0; } - if (options->_ExcludeExitNodesUnion && - routerset_contains_node(options->_ExcludeExitNodesUnion, exit)) { + if (routerset_contains_node(options->_ExcludeExitNodesUnion, exit)) { /* Not a suitable exit. Refuse it. */ return 0; } diff --git a/src/or/directory.c b/src/or/directory.c index 9e1373d..17413ed 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -306,7 +306,7 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, if (exclude_self && router_digest_is_me(ds->digest)) continue; - if (options->ExcludeNodes && options->StrictNodes && + if (options->StrictNodes && routerset_contains_routerstatus(options->ExcludeNodes, rs, -1)) { log_warn(LD_DIR, "Wanted to contact authority '%s' for %s, but " "it's in our ExcludedNodes list and StrictNodes is set. " diff --git a/src/or/rendclient.c b/src/or/rendclient.c index b618d0f..5164559 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -948,7 +948,7 @@ rend_client_get_random_intro_impl(const rend_cache_entry_t *entry, intro->extend_info = extend_info_from_node(node); } /* Check if we should refuse to talk to this router. */ - if (options->ExcludeNodes && strict && + if (strict && routerset_contains_extendinfo(options->ExcludeNodes, intro->extend_info)) { n_excluded++; diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 4413ae9..47a9fc7 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1079,7 +1079,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, } /* Check if we'd refuse to talk to this router */ - if (options->ExcludeNodes && options->StrictNodes && + if (options->StrictNodes && routerset_contains_extendinfo(options->ExcludeNodes, extend_info)) { log_warn(LD_REND, "Client asked to rendezvous at a relay that we " "exclude, and StrictNodes is set. Refusing service."); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 15f643c..00557a2 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1132,7 +1132,7 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags) if ((type & MICRODESC_DIRINFO) && !is_trusted && !node->rs->version_supports_microdesc_cache) continue; - if (try_excluding && options->ExcludeNodes && + if (try_excluding && routerset_contains_routerstatus(options->ExcludeNodes, status, country)) { ++n_excluded; @@ -1237,7 +1237,7 @@ router_pick_trusteddirserver_impl(dirinfo_type_t type, int flags, continue; if (requireother && me && router_digest_is_me(d->digest)) continue; - if (try_excluding && options->ExcludeNodes && + if (try_excluding && routerset_contains_routerstatus(options->ExcludeNodes, &d->fake_status, -1)) { ++n_excluded; @@ -5567,7 +5567,8 @@ routerset_contains(const routerset_t *set, const tor_addr_t *addr, const char *nickname, const char *id_digest, country_t country) { - if (!set || !set->list) return 0; + if (!set || !set->list) + return 0; if (nickname && strmap_get_lc(set->names, nickname)) return 4; if (id_digest && digestmap_get(set->digests, id_digest))

1 0

[tor/master] Merge branch 'bug2797'
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 3799ce7970a5d1fe21ce2921c763f06e4369cfee Merge: 7dcd105 64c8e8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 09:48:38 2011 -0400 Merge branch 'bug2797' src/or/circuitbuild.c | 6 ++---- src/or/connection_edge.c | 3 +-- src/or/directory.c | 2 +- src/or/rendclient.c | 2 +- src/or/rendservice.c | 2 +- src/or/routerlist.c | 7 ++++--- 6 files changed, 10 insertions(+), 12 deletions(-)

1 0

[metrics-web/master] Show possible censorship events in user graphs.
by karsten＠torproject.org 11 Jul '11

11 Jul '11

commit ca34678f08780173a2e6736acf48db80e5903f3a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 11 13:24:33 2011 +0200 Show possible censorship events in user graphs. --- rserve/graphs.R | 23 ++++++++++++++++++- .../ernie/web/GraphParameterChecker.java | 23 +++++++++++++++++++- web/WEB-INF/users.jsp | 5 ++++ 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index cff39a2..c6ba4fd 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -600,7 +600,7 @@ plot_relayflags <- function(start, end, flags, granularity, path, dpi) { ggsave(filename = path, width = 8, height = 5, dpi = as.numeric(dpi)) } -plot_direct_users <- function(start, end, country, path, dpi) { +plot_direct_users <- function(start, end, country, events, path, dpi) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, r, bwp, brn, bwn, brp, bwr, brr ", @@ -630,7 +630,25 @@ plot_direct_users <- function(start, end, country, path, dpi) { date_breaks <- date_breaks( as.numeric(max(as.Date(u$date, "%Y-%m-%d")) - min(as.Date(u$date, "%Y-%m-%d")))) - ggplot(u, aes(x = as.Date(date, "%Y-%m-%d"), y = users)) + + plot <- ggplot(u, aes(x = as.Date(date, "%Y-%m-%d"), y = users)) + if (events == "on" & country != "all") { + r <- read.csv( + "/srv/metrics.torproject.org/web/direct-users-ranges.csv", + stringsAsFactors = FALSE) + r <- r[r$date >= start & r$date <= end & r$country == country, + c("date", "minusers", "maxusers")] + r <- cast(rbind(melt(u, id.vars = "date"), melt(r, id.vars = "date"))) + upturns <- r[r$users > r$maxusers, 1:2] + downturns <- r[r$users < r$minusers, 1:2] + plot <- plot + + geom_ribbon(data = r, aes(ymin = minusers, ymax = maxusers), + fill = "gray") + + geom_point(data = upturns, aes(x = date, y = users), size = 5, + colour = "dodgerblue2") + + geom_point(data = downturns, aes(x = date, y = users), size = 5, + colour = "firebrick2") + } + plot <- plot + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", "https://metrics.torproject.org/", sep = ""), @@ -639,6 +657,7 @@ plot_direct_users <- function(start, end, country, path, dpi) { scale_y_continuous(name = "", limits = c(0, max(u$users, na.rm = TRUE)), formatter = formatter) + opts(title = title) + print(plot) ggsave(filename = path, width = 8, height = 5, dpi = as.numeric(dpi)) } diff --git a/src/org/torproject/ernie/web/GraphParameterChecker.java b/src/org/torproject/ernie/web/GraphParameterChecker.java index 95e4cf0..7349bf9 100644 --- a/src/org/torproject/ernie/web/GraphParameterChecker.java +++ b/src/org/torproject/ernie/web/GraphParameterChecker.java @@ -50,7 +50,7 @@ public class GraphParameterChecker { this.availableGraphs.put("bwhist-flags", "start,end,filename,dpi"); this.availableGraphs.put("dirbytes", "start,end,filename,dpi"); this.availableGraphs.put("direct-users", - "start,end,country,filename,dpi"); + "start,end,country,events,filename,dpi"); this.availableGraphs.put("bridge-users", "start,end,country,filename,dpi"); this.availableGraphs.put("gettor", "start,end,bundle,filename,dpi"); @@ -70,6 +70,7 @@ public class GraphParameterChecker { sb.append("," + country[0]); } this.knownParameterValues.put("country", sb.toString()); + this.knownParameterValues.put("events", "on,off"); this.knownParameterValues.put("bundle", "all,en,zh_CN,fa"); this.knownParameterValues.put("source", "all,siv,moria,torperf"); this.knownParameterValues.put("filesize", "50kb,1mb,5mb"); @@ -197,6 +198,26 @@ public class GraphParameterChecker { recognizedGraphParameters.put("country", countryParameters); } + /* Parse whether the estimated min/max range shall be displayed if + * supported by the graph type. This parameter can either be "on" or + * "off," where "off" is the default. */ + if (supportedGraphParameters.contains("events")) { + String[] eventsParameter = (String[]) requestParameters.get( + "events"); + List<String> knownRanges = Arrays.asList( + this.knownParameterValues.get("events").split(",")); + if (eventsParameter != null) { + if (eventsParameter.length != 1 || + eventsParameter[0].length() == 0 || + !knownRanges.contains(eventsParameter[0])) { + return null; + } + } else { + eventsParameter = new String[] { "off" }; + } + recognizedGraphParameters.put("events", eventsParameter); + } + /* Parse GetTor bundle if supported by the graph type. Only a single * bundle can be passed. If no bundle is passed, use "all" as * default. */ diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp index 60be8ab..814c15c 100644 --- a/web/WEB-INF/users.jsp +++ b/web/WEB-INF/users.jsp @@ -43,6 +43,11 @@ based on the requests seen by a few dozen directory mirrors.</p> </c:forEach> </select> </p><p> + Show possible censorship events if available (BETA) + <input type="checkbox" name="events" value="on" + <c:if test="${direct_users_events[0] eq 'on'}"> checked</c:if> + ></input> + </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${direct_users_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> <option value="150"<c:if test="${direct_users_dpi[0] eq '150'}"> selected</c:if>>Print low - 1200x750</option>

1 0

[metrics-tasks/master] Export min/max ranges of daily user numbers (#2718).
by karsten＠torproject.org 11 Jul '11

11 Jul '11

commit 9f401d1782ea8b16ad01ed35309d8c8404e26670 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 11 13:14:01 2011 +0200 Export min/max ranges of daily user numbers (#2718). --- task-2718/detector.py | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/task-2718/detector.py b/task-2718/detector.py index 0370d02..716bbdf 100644 --- a/task-2718/detector.py +++ b/task-2718/detector.py @@ -290,6 +290,25 @@ def plot_all(tss, minx, maxx, INTERV, DAYS=None, rdir="img"): plot_target(tss, c,xtitle, minx, maxx, DAYS, INTERV) summary_file.close() +def write_all(tss, minc, maxc, INTERVAL=7): + ranges_file = file("direct-users-ranges.csv", "w") + ranges_file.write("date,country,minusers,maxusers\n") + exclude = set(["all", "??", "date"]) + for c in tss.country_codes: + if c in exclude: + continue + print ".", + series = tss.get_country_series(c) + for i, v in enumerate(series): + if i > 0 and i - INTERVAL >= 0 and series[i] != None and series[i-INTERVAL] != None and series[i-INTERVAL] != 0 and minc[i]!= None and maxc[i]!= None: + minv = minc[i] * poisson.ppf(1-0.9999, series[i-INTERVAL]) + maxv = maxc[i] * poisson.ppf(0.9999, series[i-INTERVAL]) + if not minv < maxv: + print minv, maxv, series[i-INTERVAL], minc[i], maxc[i] + assert minv < maxv + ranges_file.write("%s,%s,%s,%s\n" % (tss.all_dates[i], c, minv, maxv)) + ranges_file.close() + def main(): # Change these to customize script CSV_FILE = "direct-users.csv" @@ -301,6 +320,7 @@ def main(): l = tss.get_largest_locations(50) minx, maxx = make_tendencies_minmax(l, INTERV) plot_all(tss, minx, maxx, INTERV, DAYS, rdir=GRAPH_DIR) + write_all(tss, minx, maxx, INTERV) if __name__ == "__main__": main()

1 0

[flashproxy/master] deleting a bunch of old testing scripts
by dcf＠torproject.org 10 Jul '11

10 Jul '11

commit d19e8dbec32ceff107b5897e43546a833954d2c8 Author: ellitron <jdellit(a)stanford.edu> Date: Sat Jul 9 18:42:24 2011 -0700 deleting a bunch of old testing scripts --- testing/fac_test_input_0 | 5 ----- testing/fac_test_input_1 | 5 ----- testing/fac_test_input_2 | 5 ----- testing/fac_test_input_3 | 5 ----- testing/fac_test_input_4 | 5 ----- testing/fac_test_input_5 | 5 ----- testing/fac_test_input_6 | 5 ----- testing/tester.py | 9 --------- 8 files changed, 0 insertions(+), 44 deletions(-) diff --git a/testing/fac_test_input_0 b/testing/fac_test_input_0 deleted file mode 100644 index f898fab..0000000 --- a/testing/fac_test_input_0 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -clientt=127.0.0.1:88 - - diff --git a/testing/fac_test_input_1 b/testing/fac_test_input_1 deleted file mode 100644 index f5e686c..0000000 --- a/testing/fac_test_input_1 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -client==127.0.0.1:88 - - diff --git a/testing/fac_test_input_2 b/testing/fac_test_input_2 deleted file mode 100644 index c987aa0..0000000 --- a/testing/fac_test_input_2 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -client=127.0.0:88 - - diff --git a/testing/fac_test_input_3 b/testing/fac_test_input_3 deleted file mode 100644 index a5ca4f4..0000000 --- a/testing/fac_test_input_3 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -client=127.0.0.A:88 - - diff --git a/testing/fac_test_input_4 b/testing/fac_test_input_4 deleted file mode 100644 index b6846b8..0000000 --- a/testing/fac_test_input_4 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -client=127.0.0.1::88 - - diff --git a/testing/fac_test_input_5 b/testing/fac_test_input_5 deleted file mode 100644 index fa1e99b..0000000 --- a/testing/fac_test_input_5 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -client=127.0.0.1:88A - - diff --git a/testing/fac_test_input_6 b/testing/fac_test_input_6 deleted file mode 100644 index 0e29ba6..0000000 --- a/testing/fac_test_input_6 +++ /dev/null @@ -1,5 +0,0 @@ -POST / HTTP/1.0 - -client=127.0.0.:88 - - diff --git a/testing/tester.py b/testing/tester.py deleted file mode 100755 index f2aeeed..0000000 --- a/testing/tester.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/python - -import os -import sys - -for i in range(int(sys.argv[1])): - print "Running test " + str(i) + "..." - os.system("cat fac_test_input_" + str(i) + " | ncat 127.0.0.1 9002") -

1 0

[flashproxy/master] added first experiment, scripted
by dcf＠torproject.org 10 Jul '11

10 Jul '11

commit 0dc4392cfecad180703e7d056a31c137ed33fd4c Author: ellitron <jdellit(a)stanford.edu> Date: Sat Jul 9 20:52:17 2011 -0700 added first experiment, scripted --- experiments/00 | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ experiments/README | 6 +++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/experiments/00 b/experiments/00 new file mode 100755 index 0000000..973ee30 --- /dev/null +++ b/experiments/00 @@ -0,0 +1,58 @@ +#!/bin/bash + +# Go to flashproxy repo root dir +cd .. + +# Create 1GB dump file +echo "creating dump file..." +rm dump +dd if=/dev/null of=dump bs=1G seek=1 & + +sleep 1 + +# Start http server +echo "starting http server..." +thttpd -p 1080 + +sleep 1 + +# Start crossdomain policy server +echo "starting cross domain policy server..." +sudo ./crossdomaind.py & + +sleep 1 + +# Start the facilitator +echo "starting facilitator..." +./facilitator.py 4701 -r 127.0.0.1:1080 + +sleep 1 + +# Start the flash proxy +echo "starting flash proxy..." +google-chrome --app=http://localhost:1080/swfcat.swf?facilitator=127.0.0.1:4701 + +sleep 1 + +# Start socat adapter +echo "starting socat adapter..." +socat TCP-LISTEN:9000,reuseaddr,fork TCP-LISTEN:2000,reuseaddr & + +sleep 1 + +# Register with facilitator +echo "registering with facilitator..." +echo $'POST / HTTP/1.0\r\n\r\nclient=127.0.0.1:9000' | ncat localhost 4701 --send-only + +sleep 10 + +# wget the dump file +echo "getting the dump file..." +wget http://localhost:2000/dump -O - > /dev/null + +# Slaughter the processes +ps -ef | sed -n '/thttpd/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} +ps -ef | sed -n '/crossdomaind.py/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} +ps -ef | sed -n '/facilitator.py/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} +ps -ef | sed -n '/socat/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} + diff --git a/experiments/README b/experiments/README new file mode 100644 index 0000000..5d65b28 --- /dev/null +++ b/experiments/README @@ -0,0 +1,6 @@ +Scripts for running experiments. + +This README contains descriptions of each numbered experiment. + +Experiment +00 - Includes socat, crossdomaind, swfcat, httpd, and facilitator

1 0

[flashproxy/master] Flush the socket on each proxy transfer.
by dcf＠torproject.org 10 Jul '11

10 Jul '11

commit 1131da601b4bb03025d94bfaee06e2e2a2343bf0 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 10 01:30:35 2011 -0700 Flush the socket on each proxy transfer. The documentation for the Socket class says, "Data written by the write methods is not immediately transmitted; it is queued until the flush() method is called." This appears not to be the case on Mac and GNU/Linux, but is the case on Windows. --- ProxyPair.as | 1 + RTMFPSocket.as | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ProxyPair.as b/ProxyPair.as index 62c6ec2..2b66532 100644 --- a/ProxyPair.as +++ b/ProxyPair.as @@ -127,6 +127,7 @@ package bytes = new ByteArray(); s_from.readBytes(bytes, 0, n); s_to.writeBytes(bytes); + s_to.flush(); ui.rate_limit.update(n); log(label + ": read " + bytes.length + "."); } diff --git a/RTMFPSocket.as b/RTMFPSocket.as index 49c297b..9dca232 100644 --- a/RTMFPSocket.as +++ b/RTMFPSocket.as @@ -205,5 +205,10 @@ package /* Use a short method name because it's sent over the wire. */ outgoing.send("r", sendbuf); } + + public function flush():void + { + /* Ignored. */ + } } }

1 0

[flashproxy/master] Set "Cache-Control: no-cache" in facilitator client responses.
by dcf＠torproject.org 10 Jul '11

10 Jul '11

commit f6cd763b28da36f7e00479033e2e6993a7616253 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 10 01:27:25 2011 -0700 Set "Cache-Control: no-cache" in facilitator client responses. Flash Player on Internet Explorer appears to use the browser cache, getting stale facilitator results. --- facilitator.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/facilitator.py b/facilitator.py index 4d08673..eaad855 100755 --- a/facilitator.py +++ b/facilitator.py @@ -291,6 +291,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): client_str = "" self.send_response(200) self.send_header("Content-Type", "x-www-form-urlencoded") + self.send_header("Cache-Control", "no-cache") self.end_headers() data = {}

1 0

[arm/master] Starting Tor instance at wizard completion
by atagar＠torproject.org 10 Jul '11

10 Jul '11

commit 95cd487cc30c86d62f6ae44cc41cf44129d917ad Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 8 16:30:17 2011 -0700 Starting Tor instance at wizard completion This starts (or attempts to start) a Tor instance when the wizard finishes. Currently this just works for the basic use case where we have the permissions necessary to start Tor. --- src/cli/controller.py | 13 ++++++++++ src/cli/wizard.py | 51 +++++++++++++++++++++++++++----------- src/resources/torrcTemplate.txt | 1 + src/util/torConfig.py | 2 +- 4 files changed, 51 insertions(+), 16 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index c9ab6e7..633296e 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -3,6 +3,7 @@ Main interface loop for arm, periodically redrawing the screen and issuing user input to the proper panels. """ +import os import time import curses import threading @@ -25,6 +26,7 @@ from util import connections, conf, enum, log, panel, sysTools, torConfig, torTo ARM_CONTROLLER = None CONFIG = {"startup.events": "N3", + "startup.dataDirectory": "~/.arm", "startup.blindModeEnabled": False, "features.panels.show.graph": True, "features.panels.show.log": True, @@ -366,6 +368,17 @@ class Controller: if redraw: controlPanel.redraw(True) else: self._forceRedraw = True + def getDataDirectory(self): + """ + Provides the path where arm's resources are being placed. The path ends + with a slash and is created if it doesn't already exist. + """ + + dataDir = CONFIG["startup.dataDirectory"] + if not dataDir.endswith("/"): dataDir += "/" + if not os.path.exists(dataDir): os.makedirs(dataDir) + return os.path.expanduser(dataDir) + def isDone(self): """ True if arm should be terminated, false otherwise. diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 946ecd1..3ab3b9d 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -5,13 +5,16 @@ that's used by arm to run its own tor instance. import os import sys +import shutil import functools import curses import cli.popups import cli.controller -from util import connections, enum, log, torConfig, uiTools +from TorCtl import TorCtl + +from util import connections, enum, log, torConfig, torTools, uiTools # template used to generate the torrc TORRC_TEMPLATE = "resources/torrcTemplate.txt" @@ -72,8 +75,7 @@ MSG_COLOR = "green" OPTION_COLOR = "yellow" DISABLED_COLOR = "cyan" -CONFIG = {"startup.dataDirectory": "~/.arm", - "wizard.message.role": "", +CONFIG = {"wizard.message.role": "", "wizard.message.relay": "", "wizard.message.exit": "", "wizard.message.bridge": "", @@ -251,6 +253,7 @@ def showWizard(): # remembers the last selection made on the type prompt page relaySelection = RelayType.RELAY + controller = cli.controller.getController() while True: if relayType == None: @@ -265,18 +268,36 @@ def showWizard(): elif selection == NEXT: generatedTorrc = getTorrc(relayType, config) - dataDir = CONFIG["startup.dataDirectory"] - if not dataDir.endswith("/"): dataDir += "/" - torrcLocation = os.path.expanduser(dataDir) + "torrc" - - cli.controller.getController().requestRedraw(True) + torrcLocation = controller.getDataDirectory() + "torrc" + controller.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: + log.log(log.INFO, "Writing torrc to '%s':\n%s" % (torrcLocation, generatedTorrc)) + + # if the torrc already exists then save it to a _bak file + if os.path.exists(torrcLocation): + shutil.copy(torrcLocation, torrcLocation + "_bak") + + # writes the torrc contents + torrcFile = open(torrcLocation, "w") + torrcFile.write(generatedTorrc) + torrcFile.close() + + try: + os.system("tor --quiet -f %s&" % torrcLocation) + torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = 9052) + + if authType == TorCtl.AUTH_TYPE.COOKIE: + torctlConn.authenticate(authValue) + torTools.getConn().init(torctlConn) + else: + raise IOError("unexpected authentication type '%s'" % authType) + except IOError, exc: + log.log(log.WARN, "Unable to start tor: %s" % exc) + break + elif confirmationSelection == CANCEL: break # redraws screen to clear away the dialog we just showed cli.controller.getController().requestRedraw(True) @@ -464,9 +485,9 @@ def getTorrc(relayType, config): 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" + dataDir = cli.controller.getController().getDataDirectory() + templateOptions["NOTICE_PATH"] = dataDir + "exit-notice.html" + templateOptions["LOG_ENTRY"] = "notice file %stor-log" % dataDir policyCategories = [] if not config[Options.POLICY].getValue(): @@ -564,7 +585,7 @@ def showConfirmationDialog(torrcContents, torrcLocation): div = option.find("#") if div != -1: option, comment = option[:div], option[div:] - div = option.find(" ") + div = option.strip().find(" ") if div != -1: option, arg = option[:div], option[div:] drawX = 2 + xOffset diff --git a/src/resources/torrcTemplate.txt b/src/resources/torrcTemplate.txt index abedd7f..072f847 100644 --- a/src/resources/torrcTemplate.txt +++ b/src/resources/torrcTemplate.txt @@ -9,6 +9,7 @@ [NEWLINE] ControlPort 9052 # port controllers can connect to CookieAuthentication 1 # method for controller authentication +Log [LOG_ENTRY] # location to log notices, warnings, and errors [IF RELAY | EXIT | BRIDGE] RunAsDaemon 1 # runs as a background process diff --git a/src/util/torConfig.py b/src/util/torConfig.py index e5f1cb2..8510c7a 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -930,7 +930,7 @@ def renderTorrc(template, options, commentIndent = 30): comment = "# %s" % comment.strip() # parses the argument from the option - if " " in parsedLine: + if " " in parsedLine.strip(): option, arg = parsedLine.split(" ", 1) option = option.strip() else:

1 0