- tor-commits - lists.torproject.org

[onionoo/master] Add Eclipse's project files to .gitignore.
by karsten＠torproject.org 14 Jun '12

14 Jun '12

commit dd7dddb9ae41ea964d64b1f8315e1713dd678766 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jun 14 12:31:09 2012 +0200 Add Eclipse's project files to .gitignore. --- .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 2848bda..40f5895 100755 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,6 @@ GeoIP.dat GeoIPASNum.dat GeoLiteCity.dat log +.classpath +.project

1 0

[onionoo/master] Include bridge nicknames in documents.
by karsten＠torproject.org 14 Jun '12

14 Jun '12

commit 3f73fb13b9dbdd23f77e7274965aa2f6eea71d06 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jun 14 12:53:27 2012 +0200 Include bridge nicknames in documents. --- src/org/torproject/onionoo/CurrentNodes.java | 19 +++++++++++-------- src/org/torproject/onionoo/DetailDataWriter.java | 2 ++ src/org/torproject/onionoo/ResourceServlet.java | 2 +- src/org/torproject/onionoo/SummaryDataWriter.java | 3 +++ web/index.html | 11 +++++++++-- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/org/torproject/onionoo/CurrentNodes.java b/src/org/torproject/onionoo/CurrentNodes.java index 5732cb9..c2a91ec 100644 --- a/src/org/torproject/onionoo/CurrentNodes.java +++ b/src/org/torproject/onionoo/CurrentNodes.java @@ -82,6 +82,7 @@ public class CurrentNodes { + " is invalid. Exiting."); System.exit(1); } + String nickname = parts[1]; String hashedFingerprint = parts[2]; String address = parts[3]; long publishedMillis = dateTimeFormat.parse(parts[4] + " " @@ -90,8 +91,8 @@ public class CurrentNodes { int dirPort = Integer.parseInt(parts[7]); SortedSet<String> relayFlags = new TreeSet<String>( Arrays.asList(parts[8].split(","))); - this.addBridge(hashedFingerprint, address, publishedMillis, - orPort, dirPort, relayFlags); + this.addBridge(nickname, hashedFingerprint, address, + publishedMillis, orPort, dirPort, relayFlags); } } br.close(); @@ -140,6 +141,7 @@ public class CurrentNodes { + " " + consensusWeight + "\n"); } for (Node entry : this.currentBridges.values()) { + String nickname = entry.getNickname(); String fingerprint = entry.getFingerprint(); String published = dateTimeFormat.format( entry.getLastSeenMillis()); @@ -151,7 +153,7 @@ public class CurrentNodes { sb.append("," + relayFlag); } String relayFlags = sb.toString().substring(1); - bw.write("b Unnamed " + fingerprint + " " + address + " " + bw.write("b " + nickname + " " + fingerprint + " " + address + " " + published + " " + orPort + " " + dirPort + " " + relayFlags + " -1\n"); } @@ -312,24 +314,25 @@ public class CurrentNodes { private void updateBridgeNetworkStatus(BridgeNetworkStatus status) { long publishedMillis = status.getPublishedMillis(); for (NetworkStatusEntry entry : status.getStatusEntries().values()) { + String nickname = entry.getNickname(); String fingerprint = entry.getFingerprint(); String address = entry.getAddress(); int orPort = entry.getOrPort(); int dirPort = entry.getDirPort(); SortedSet<String> relayFlags = entry.getFlags(); - this.addBridge(fingerprint, address, publishedMillis, orPort, - dirPort, relayFlags); + this.addBridge(nickname, fingerprint, address, publishedMillis, + orPort, dirPort, relayFlags); } } - public void addBridge(String fingerprint, String address, - long publishedMillis, int orPort, int dirPort, + public void addBridge(String nickname, String fingerprint, + String address, long publishedMillis, int orPort, int dirPort, SortedSet<String> relayFlags) { if (publishedMillis >= cutoff && (!this.currentBridges.containsKey(fingerprint) || this.currentBridges.get(fingerprint).getLastSeenMillis() < publishedMillis)) { - Node entry = new Node("Unnamed", fingerprint, address, + Node entry = new Node(nickname, fingerprint, address, publishedMillis, orPort, dirPort, relayFlags, -1L); this.currentBridges.put(fingerprint, entry); if (publishedMillis > this.lastPublishedMillis) { diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index cfae5ff..1e3be72 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -543,11 +543,13 @@ public class DetailDataWriter { /* Generate network-status-specific part. */ Node entry = bridge.getValue(); + String nickname = entry.getNickname(); String running = entry.getRunning() ? "true" : "false"; String address = entry.getAddress(); int orPort = entry.getOrPort(); StringBuilder sb = new StringBuilder(); sb.append("{\"version\":1,\n" + + "\"nickname\":\"" + nickname + "\",\n" + "\"hashed_fingerprint\":\"" + fingerprint + "\",\n" + "\"or_addresses\":[\"" + address + ":" + orPort + "\"],\n" + "\"running\":" + running + ","); diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index a85f3ec..e4f5b9f 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -475,7 +475,7 @@ public class ResourceServlet extends HttpServlet { /* Nickname matches. */ lineMatches = true; } else if ("unnamed".startsWith(searchTerm.toLowerCase()) && - line.startsWith("{\"f\":")) { + (line.startsWith("{\"f\":") || line.startsWith("{\"h\":"))) { /* Nickname "Unnamed" matches. */ lineMatches = true; } else if (line.contains("\"f\":\"" + searchTerm.toUpperCase())) { diff --git a/src/org/torproject/onionoo/SummaryDataWriter.java b/src/org/torproject/onionoo/SummaryDataWriter.java index c438692..1391c02 100644 --- a/src/org/torproject/onionoo/SummaryDataWriter.java +++ b/src/org/torproject/onionoo/SummaryDataWriter.java @@ -68,12 +68,15 @@ public class SummaryDataWriter { + "\",\n\"bridges\":["); written = 0; for (Node entry : this.currentBridges.values()) { + String nickname = !entry.getNickname().equals("Unnamed") ? + entry.getNickname() : null; String hashedFingerprint = entry.getFingerprint(); String running = entry.getRunning() ? "true" : "false"; if (written++ > 0) { bw.write(","); } bw.write("\n{" + + (nickname == null ? "" : "\"n\":\"" + nickname + "\",") + "\"h\":\"" + hashedFingerprint + "\"," + "\"r\":" + running + "}"); } diff --git a/web/index.html b/web/index.html index 93c798e..1539705 100755 --- a/web/index.html +++ b/web/index.html @@ -276,6 +276,11 @@ Required field.</li> Required field. Each array object contains the following key-value pairs: <ul> +<li><b>"nickname":</b> Bridge nickname consisting of 1–19 +alphanumerical characters. +Optional field. +Omitted if the bridge nickname is <i>"Unnamed"</i>. +<font color="blue">Added field on June 14, 2012.</font></li> <li><b>"hashed_fingerprint":</b> SHA-1 hash of the bridge fingerprint consisting of 40 upper-case hexadecimal characters. Required field.</li> @@ -603,13 +608,15 @@ of relay and/or bridge documents to be included in the response.</p> </td></tr> <tr><td><b>search</b></td><td>Return only relays with the parameter value matching the beginning of a nickname, (possibly $-prefixed) fingerprint, -or IP address, and bridges with the (possibly $-prefixed) hashed -fingerprint. +or IP address, and bridges with the nickname or (possibly $-prefixed) +hashed fingerprint. Searches are case-insensitive. Full fingerprints should always be hashed using SHA-1, regardless of searching for a relay or a bridge, in order to not accidentally leak non-hashed bridge fingerprints in the URL. <font color="blue">Parameter added on May 14, 2012.</font> +<font color="blue">Extended search to bridge nicknames on June 14, +2012.</font> </td></tr> <tr><td><b>lookup</b></td><td>Return only the relay with the parameter value matching the fingerprint or the bridge with the parameter value

1 0

[tor/master] demote two entries that don't affect most users
by arma＠torproject.org 14 Jun '12

14 Jun '12

commit 7e57609a9fff3f5050c5f20050686c6eb470f31f Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 14 05:50:32 2012 -0400 demote two entries that don't affect most users --- ChangeLog | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index bfcb459..1d8401e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,15 +14,6 @@ Changes in version 0.2.3.17-beta - 2012-06-1? out because of this change; TBB users should not be affected. o Major bugfixes: - - Change the AllowDotExit rules so they should actually work. - We now enforce AllowDotExit only immediately after receiving an - address via SOCKS or DNSPort: other sources are free to provide - .exit addresses after the resolution occurs. Fixes bug 3940; - bugfix on 0.2.2.1-alpha. - - When building Tor on Windows with -DUNICODE (not default), ensure - that error messages, filenames, and DNS server names are always - NUL-terminated when we convert them to a single-byte encoding. - Fixes bug 5909; bugfix on 0.2.2.16-alpha. - Change the default value for DynamicDHGroups (introduced in 0.2.3.9-alpha) to 0. This feature can make Tor relays less identifiable by their use of the mod_ssl DH group, but at @@ -39,12 +30,21 @@ Changes in version 0.2.3.17-beta - 2012-06-1? case for flushing marked connections. - Detect SSL handshake even when the initial attempt to write the server hello fails. Fixes bug 4592; bugfix on 0.2.0.13-alpha. + - Change the AllowDotExit rules so they should actually work. + We now enforce AllowDotExit only immediately after receiving an + address via SOCKS or DNSPort: other sources are free to provide + .exit addresses after the resolution occurs. Fixes bug 3940; + bugfix on 0.2.2.1-alpha. - Fix a (harmless) integer overflow in cell statistics reported by some fast relays. Fixes bug 5849; bugfix on 0.2.2.1-alpha. - Make sure circuitbuild.c checks LearnCircuitBuildTimeout in all the right places and never depends on the consensus parameters or computes adaptive timeouts when it is disabled. Fixes bug 5049; bugfix on 0.2.2.14-alpha. + - When building Tor on Windows with -DUNICODE (not default), ensure + that error messages, filenames, and DNS server names are always + NUL-terminated when we convert them to a single-byte encoding. + Fixes bug 5909; bugfix on 0.2.2.16-alpha. - Make Tor build correctly again with -DUNICODE -D_UNICODE defined. Fixes bug 6097; bugfix on 0.2.2.16-alpha. - Fix an edge case where TestingTorNetwork is set but the authorities

1 0

[tor/master] fold in further changes files
by arma＠torproject.org 14 Jun '12

14 Jun '12

commit 8c044af30090e3e7dea3d765ccd60aec59290cdd Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 14 05:47:55 2012 -0400 fold in further changes files --- ChangeLog | 37 ++++++++++++++++++++++++++++++++++++- changes/bug3940_redux | 5 ----- changes/bug4663 | 5 ----- changes/bug4744 | 4 ---- changes/bug5049 | 4 ---- changes/bug5210 | 2 -- changes/bug5263 | 5 ----- changes/bug5849 | 3 --- changes/bug6141 | 4 ---- changes/geoip-june2012 | 3 --- changes/prop198 | 12 ------------ 11 files changed, 36 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc7663c..bfcb459 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,24 @@ -Changes in version 0.2.3.17-alpha - 2012-06-?? +Changes in version 0.2.3.17-beta - 2012-06-1? + o Major features: + - Enable gcc and ld hardening by default. Resolves ticket 5210. + - Update TLS cipher list to match Firefox 8 and later. Resolves + ticket 4744. + - Implement the client side of proposal 198: remove support for + clients falsely claiming to support standard ciphersuites that + they can actually provide. As of modern OpenSSL versions, it's not + necessary to fake any standard ciphersuite, and doing so prevents + us from using better ciphersuites in the future, since servers + can't know whether an advertised ciphersuite is really supported or + not. Some hosts -- notably, ones with very old versions of OpenSSL + or where OpenSSL has been built with ECC disabled -- will stand + out because of this change; TBB users should not be affected. o Major bugfixes: + - Change the AllowDotExit rules so they should actually work. + We now enforce AllowDotExit only immediately after receiving an + address via SOCKS or DNSPort: other sources are free to provide + .exit addresses after the resolution occurs. Fixes bug 3940; + bugfix on 0.2.2.1-alpha. - When building Tor on Windows with -DUNICODE (not default), ensure that error messages, filenames, and DNS server names are always NUL-terminated when we convert them to a single-byte encoding. @@ -15,8 +33,18 @@ Changes in version 0.2.3.17-alpha - 2012-06-?? bug 6094; bugfix on 0.2.3.16-alpha. o Minor bugfixes: + - Disable writing on marked-for-close connections when they are + blocked on bandwidth, to prevent busy-looping in Libevent. Fixes + bug 5263; bugfix on 0.0.2pre13, where we first added a special + case for flushing marked connections. - Detect SSL handshake even when the initial attempt to write the server hello fails. Fixes bug 4592; bugfix on 0.2.0.13-alpha. + - Fix a (harmless) integer overflow in cell statistics reported by + some fast relays. Fixes bug 5849; bugfix on 0.2.2.1-alpha. + - Make sure circuitbuild.c checks LearnCircuitBuildTimeout in all the + right places and never depends on the consensus parameters or + computes adaptive timeouts when it is disabled. Fixes bug 5049; + bugfix on 0.2.2.14-alpha. - Make Tor build correctly again with -DUNICODE -D_UNICODE defined. Fixes bug 6097; bugfix on 0.2.2.16-alpha. - Fix an edge case where TestingTorNetwork is set but the authorities @@ -26,6 +54,8 @@ Changes in version 0.2.3.17-alpha - 2012-06-?? - Correct the manpage's descriptions for the default values of DirReqStatistics and ExtraInfoStatistics. Fixes bug 2865; bugfix on 0.2.3.1-alpha. + - Fix compilation warning with clang 3.1. Fixes bug 6141; bugfix on + 0.2.3.11-alpha. o Minor features: - Rate-limit the "Weighted bandwidth is 0.000000" message, and add @@ -34,6 +64,11 @@ Changes in version 0.2.3.17-alpha - 2012-06-?? - Check CircuitBuildTimeout and LearnCircuitBuildTimeout in options_validate(); warn if LearnCircuitBuildTimeout is disabled and CircuitBuildTimeout is set unreasonably low. Resolves ticket 5452. + - Warn the user when HTTPProxy, but no other proxy type, is + configured. This can cause surprising behavior: it doesn't send + all of Tor's traffic over the HTTPProxy -- it sends unencrypted + directory traffic only. Resolves ticket 4663. + - Update to the June 6 2012 Maxmind GeoLite Country database. Changes in version 0.2.2.37 - 2012-06-06 diff --git a/changes/bug3940_redux b/changes/bug3940_redux deleted file mode 100644 index 7733740..0000000 --- a/changes/bug3940_redux +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Change the AllowDotExit rules so they should actually work. - We now enforce AllowDotExit only immediately after receiving - an address via SOCKS or DNSPort: other sources are free to provide - .exit addresses after the resolution occurs. diff --git a/changes/bug4663 b/changes/bug4663 deleted file mode 100644 index f720ff5..0000000 --- a/changes/bug4663 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features: - - Warn the user when HTTPProxy, but no other proxy type, is - configured. This can cause surprising behavior: it doesn't send - all of Tor's traffic over the HTTPProxy--it sends unencrypted - directory traffic only. Resolves ticket 4663. diff --git a/changes/bug4744 b/changes/bug4744 deleted file mode 100644 index 1563cd1..0000000 --- a/changes/bug4744 +++ /dev/null @@ -1,4 +0,0 @@ - o Major features: - - Update cipher cipher list to match Firefox 8 and later. Fix for - issue 4744. - diff --git a/changes/bug5049 b/changes/bug5049 deleted file mode 100644 index 677fd42..0000000 --- a/changes/bug5049 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Make sure circuitbuild.c checks LearnCircuitBuildTimeout in all the - right places and never depends on the consensus parameters or computes - adaptive timeouts when it is disabled. diff --git a/changes/bug5210 b/changes/bug5210 deleted file mode 100644 index b07e7f1..0000000 --- a/changes/bug5210 +++ /dev/null @@ -1,2 +0,0 @@ - o Security fixes: - - Enable gcc and ld hardening by default. Fixes bug 5210. diff --git a/changes/bug5263 b/changes/bug5263 deleted file mode 100644 index 25793f1..0000000 --- a/changes/bug5263 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Disable writing on marked-for-close connections when they are - blocked on bandwidth, to prevent busy-looping in Libevent. Fixes - bug 5263; bugfix on 0.0.2pre13, where we first added a special - case for flushing marked connections. diff --git a/changes/bug5849 b/changes/bug5849 deleted file mode 100644 index b6738a6..0000000 --- a/changes/bug5849 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Fix a (harmless) integer overflow in cell statistics reported by - some fast relays. Fixes bug 5849; bugfix on 0.2.2.1-alpha. diff --git a/changes/bug6141 b/changes/bug6141 deleted file mode 100644 index b95475c..0000000 --- a/changes/bug6141 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Fix compilation warning with clang 3.1. Fixes bug 6141; bugfix on - 0.2.3.11-alpha. - diff --git a/changes/geoip-june2012 b/changes/geoip-june2012 deleted file mode 100644 index f73bf35..0000000 --- a/changes/geoip-june2012 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the June 6 2012 Maxmind GeoLite Country database. - diff --git a/changes/prop198 b/changes/prop198 deleted file mode 100644 index fd66686..0000000 --- a/changes/prop198 +++ /dev/null @@ -1,12 +0,0 @@ - o Removed features: - - - Remove support for clients claiming to support any standard - ciphersuites that we can actually provide. (As of modern - OpenSSL versions, it's not necessary to fake any standard - ciphersuite, and doing so prevents us from using better - ciphersuites in the future, since servers can't know whether an - advertised ciphersuite is really supported or not.) Some - hosts--notably, ones with very old versions of OpenSSL or where - OpenSSL has been built with ECC disabled-- will stand out - because of this change; TBB users should not be affected. - This implements the client side of proposal 198.

1 0

[metrics-web/master] Add Tor Cloud bridges graph and .csv export.
by karsten＠torproject.org 14 Jun '12

14 Jun '12

commit 3c63bb7dd8d75e7fa9a8805980117936bf93583f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jun 14 09:00:47 2012 +0200 Add Tor Cloud bridges graph and .csv export. --- etc/web.xml | 4 ++ rserve/csv.R | 12 +++++++ rserve/graphs.R | 33 ++++++++++++++++++++ src/org/torproject/ernie/web/GraphDataServlet.java | 1 + src/org/torproject/ernie/web/RObjectGenerator.java | 2 + web/WEB-INF/network.jsp | 32 +++++++++++++++++++ 6 files changed, 84 insertions(+), 0 deletions(-) diff --git a/etc/web.xml b/etc/web.xml index a5bd7be..24f3ba2 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -163,6 +163,10 @@ </servlet-mapping> <servlet-mapping> <servlet-name>GraphImage</servlet-name> + <url-pattern>/cloudbridges.png</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>GraphImage</servlet-name> <url-pattern>/relaycountries.png</url-pattern> </servlet-mapping> <servlet-mapping> diff --git a/rserve/csv.R b/rserve/csv.R index 596d305..6d76bf7 100644 --- a/rserve/csv.R +++ b/rserve/csv.R @@ -15,6 +15,18 @@ export_networksize <- function(path) { write.csv(networksize, path, quote = FALSE, row.names = FALSE) } +export_cloudbridges <- function(path) { + drv <- dbDriver("PostgreSQL") + con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) + q <- paste("SELECT date, avg_running_ec2 AS cloudbridges", + "FROM bridge_network_size ORDER BY date") + rs <- dbSendQuery(con, q) + cloudbridges <- fetch(rs, n = -1) + dbDisconnect(con) + dbUnloadDriver(drv) + write.csv(cloudbridges, path, quote = FALSE, row.names = FALSE) +} + export_relaycountries <- function(path) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) diff --git a/rserve/graphs.R b/rserve/graphs.R index 61c12f7..f5575c3 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -324,6 +324,39 @@ plot_networksize <- function(start, end, path, dpi) { ggsave(filename = path, width = 8, height = 5, dpi = as.numeric(dpi)) } +plot_cloudbridges <- function(start, end, path, dpi) { + drv <- dbDriver("PostgreSQL") + con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) + q <- paste("SELECT date, avg_running_ec2 ", + "FROM bridge_network_size WHERE date >= '", start, + "' AND date <= '", end, "'", sep = "") + rs <- dbSendQuery(con, q) + bridges <- fetch(rs, n = -1) + dbDisconnect(con) + dbUnloadDriver(drv) + dates <- seq(from = as.Date(start, "%Y-%m-%d"), + to = as.Date(end, "%Y-%m-%d"), by="1 day") + missing <- setdiff(dates, bridges$date) + if (length(missing) > 0) + bridges <- rbind(bridges, + data.frame(date = as.Date(missing, origin = "1970-01-01"), + avg_running_ec2 = NA)) + date_breaks <- date_breaks( + as.numeric(max(as.Date(bridges$date, "%Y-%m-%d")) - + min(as.Date(bridges$date, "%Y-%m-%d")))) + ggplot(bridges, aes(x = as.Date(date, "%Y-%m-%d"), + y = avg_running_ec2)) + + geom_line(size = 1, colour = "green3") + + scale_x_date(name = paste("\nThe Tor Project - ", + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + + scale_y_continuous(name = "", limits = c(0, + max(bridges$avg_running_ec2, na.rm = TRUE))) + + opts(title = "Number of Tor Cloud bridges\n") + ggsave(filename = path, width = 8, height = 5, dpi = as.numeric(dpi)) +} + plot_relaycountries <- function(start, end, country, path, dpi) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) diff --git a/src/org/torproject/ernie/web/GraphDataServlet.java b/src/org/torproject/ernie/web/GraphDataServlet.java index b335994..209aefe 100644 --- a/src/org/torproject/ernie/web/GraphDataServlet.java +++ b/src/org/torproject/ernie/web/GraphDataServlet.java @@ -53,6 +53,7 @@ public class GraphDataServlet extends HttpServlet { this.availableGraphDataFiles = new TreeMap<String, String>(); this.availableGraphDataFiles.put("relays", "networksize"); this.availableGraphDataFiles.put("bridges", "networksize"); + this.availableGraphDataFiles.put("cloudbridges", "cloudbridges"); this.availableGraphDataFiles.put("relays-by-country", "relaycountries"); this.availableGraphDataFiles.put("relays-by-flags", "relayflags"); diff --git a/src/org/torproject/ernie/web/RObjectGenerator.java b/src/org/torproject/ernie/web/RObjectGenerator.java index 8350de9..993bc59 100644 --- a/src/org/torproject/ernie/web/RObjectGenerator.java +++ b/src/org/torproject/ernie/web/RObjectGenerator.java @@ -57,6 +57,7 @@ public class RObjectGenerator implements ServletContextListener { this.availableCsvFiles.add("bridge-users"); this.availableCsvFiles.add("bwhist-flags"); this.availableCsvFiles.add("connbidirect"); + this.availableCsvFiles.add("cloudbridges"); this.availableCsvFiles.add("direct-users"); this.availableCsvFiles.add("dirreq-stats"); this.availableCsvFiles.add("dirbytes"); @@ -80,6 +81,7 @@ public class RObjectGenerator implements ServletContextListener { this.availableGraphs = new HashMap<String, String>(); this.availableGraphs.put("networksize", "start,end,filename,dpi"); + this.availableGraphs.put("cloudbridges", "start,end,filename,dpi"); this.availableGraphs.put("relaycountries", "start,end,country,filename,dpi"); this.availableGraphs.put("relayflags", "start,end,flag,granularity," diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index 73205e0..fa7732f 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -197,6 +197,38 @@ platform.</p> <p><a href="csv/platforms.csv">CSV</a> file containing all data.</p> <br> +<a name="cloudbridges"></a> +<h3><a href="#cloudbridges" class="anchor">Tor Cloud bridges</a></h3> +<br> +<p>The following graph shows the average daily number of +<a href="http://cloud.torproject.org/">Tor Cloud</a> bridges in the +network.</p> +<img src="cloudbridges.png${cloudbridges_url}" + width="576" height="360" alt="Tor Cloud bridges graph"> +<form action="network.html#cloudbridges"> + <div class="formrow"> + <input type="hidden" name="graph" value="cloudbridges"> + <p> + <label>Start date (yyyy-mm-dd):</label> + <input type="text" name="start" size="10" + value="<c:choose><c:when test="${fn:length(cloudbridges_start) == 0}">${default_start_date}</c:when><c:otherwise>${cloudbridges_start[0]}</c:otherwise></c:choose>"> + <label>End date (yyyy-mm-dd):</label> + <input type="text" name="end" size="10" + value="<c:choose><c:when test="${fn:length(cloudbridges_end) == 0}">${default_end_date}</c:when><c:otherwise>${cloudbridges_end[0]}</c:otherwise></c:choose>"> + </p><p> + Resolution: <select name="dpi"> + <option value="72"<c:if test="${cloudbridges_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> + <option value="150"<c:if test="${cloudbridges_dpi[0] eq '150'}"> selected</c:if>>Print low - 1200x750</option> + <option value="300"<c:if test="${cloudbridges_dpi[0] eq '300'}"> selected</c:if>>Print high - 2400x1500</option> + </select> + </p><p> + <input class="submit" type="submit" value="Update graph"> + </p> + </div> +</form> +<p><a href="csv/cloudbridges.csv">CSV</a> file containing all data.</p> +<br> + <a name="bandwidth"></a> <h3><a href="#bandwidth" class="anchor">Total relay bandwidth in the network</a></h3>

1 0

[ooni-probe/master] Add sphinx makefile
by art＠torproject.org 13 Jun '12

13 Jun '12

commit ae20bf5b1d961983ae680c4a99feb494ae5f4245 Author: Arturo Filastò <art(a)baculo.org> Date: Thu Jun 14 01:33:00 2012 +0200 Add sphinx makefile --- docs/Makefile | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 153 insertions(+), 0 deletions(-) diff --git a/docs/Makefile b/docs/Makefile new file mode 100644 index 0000000..9ee92b1 --- /dev/null +++ b/docs/Makefile @@ -0,0 +1,153 @@ +# Makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS = +SPHINXBUILD = sphinx-build +PAPER = +BUILDDIR = build + +# Internal variables. +PAPEROPT_a4 = -D latex_paper_size=a4 +PAPEROPT_letter = -D latex_paper_size=letter +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source +# the i18n builder cannot share the environment and doctrees with the others +I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source + +.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext + +help: + @echo "Please use \`make <target>' where <target> is one of" + @echo " html to make standalone HTML files" + @echo " dirhtml to make HTML files named index.html in directories" + @echo " singlehtml to make a single large HTML file" + @echo " pickle to make pickle files" + @echo " json to make JSON files" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " qthelp to make HTML files and a qthelp project" + @echo " devhelp to make HTML files and a Devhelp project" + @echo " epub to make an epub" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " latexpdf to make LaTeX files and run them through pdflatex" + @echo " text to make text files" + @echo " man to make manual pages" + @echo " texinfo to make Texinfo files" + @echo " info to make Texinfo files and run them through makeinfo" + @echo " gettext to make PO message catalogs" + @echo " changes to make an overview of all changed/added/deprecated items" + @echo " linkcheck to check all external links for integrity" + @echo " doctest to run all doctests embedded in the documentation (if enabled)" + +clean: + -rm -rf $(BUILDDIR)/* + +html: + $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." + +dirhtml: + $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." + +singlehtml: + $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml + @echo + @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." + +pickle: + $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle + @echo + @echo "Build finished; now you can process the pickle files." + +json: + $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json + @echo + @echo "Build finished; now you can process the JSON files." + +htmlhelp: + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp + @echo + @echo "Build finished; now you can run HTML Help Workshop with the" \ + ".hhp project file in $(BUILDDIR)/htmlhelp." + +qthelp: + $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp + @echo + @echo "Build finished; now you can run "qcollectiongenerator" with the" \ + ".qhcp project file in $(BUILDDIR)/qthelp, like this:" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/OONI.qhcp" + @echo "To view the help file:" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/OONI.qhc" + +devhelp: + $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp + @echo + @echo "Build finished." + @echo "To view the help file:" + @echo "# mkdir -p $$HOME/.local/share/devhelp/OONI" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/OONI" + @echo "# devhelp" + +epub: + $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub + @echo + @echo "Build finished. The epub file is in $(BUILDDIR)/epub." + +latex: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." + @echo "Run \`make' in that directory to run these through (pdf)latex" \ + "(use \`make latexpdf' here to do that automatically)." + +latexpdf: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo "Running LaTeX files through pdflatex..." + $(MAKE) -C $(BUILDDIR)/latex all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." + +text: + $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text + @echo + @echo "Build finished. The text files are in $(BUILDDIR)/text." + +man: + $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man + @echo + @echo "Build finished. The manual pages are in $(BUILDDIR)/man." + +texinfo: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo + @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." + @echo "Run \`make' in that directory to run these through makeinfo" \ + "(use \`make info' here to do that automatically)." + +info: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo "Running Texinfo files through makeinfo..." + make -C $(BUILDDIR)/texinfo info + @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." + +gettext: + $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale + @echo + @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." + +changes: + $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes + @echo + @echo "The overview file is in $(BUILDDIR)/changes." + +linkcheck: + $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck + @echo + @echo "Link check complete; look for any errors in the above output " \ + "or in $(BUILDDIR)/linkcheck/output.txt." + +doctest: + $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest + @echo "Testing of doctests in the sources finished, look at the " \ + "results in $(BUILDDIR)/doctest/output.txt."

1 0

[ooni-probe/master] Add basic documentation structure in nginx
by art＠torproject.org 13 Jun '12

13 Jun '12

commit 6433713569cec8be8b286479eb32e22bf31579b1 Author: Arturo Filastò <art(a)baculo.org> Date: Thu Jun 14 01:28:06 2012 +0200 Add basic documentation structure in nginx --- docs/source/conf.py | 242 +++++++++++++++++++++++++++++++++++++++++ docs/source/index.rst | 21 ++++ docs/source/tutorial.rst | 12 ++ docs/source/writing_tests.rst | 7 + 4 files changed, 282 insertions(+), 0 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py new file mode 100644 index 0000000..49b96d4 --- /dev/null +++ b/docs/source/conf.py @@ -0,0 +1,242 @@ +# -*- coding: utf-8 -*- +# +# OONI documentation build configuration file, created by +# sphinx-quickstart on Sat Jun 2 19:54:47 2012. +# +# This file is execfile()d with the current directory set to its containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +import sys, os + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +#sys.path.insert(0, os.path.abspath('.')) + +# -- General configuration ----------------------------------------------------- + +# If your documentation needs a minimal Sphinx version, state it here. +#needs_sphinx = '1.0' + +# Add any Sphinx extension module names here, as strings. They can be extensions +# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +extensions = ['sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.viewcode'] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix of source filenames. +source_suffix = '.rst' + +# The encoding of source files. +#source_encoding = 'utf-8-sig' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'OONI' +copyright = u'2012, The Tor Project' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +version = '0.0.1' +# The full version, including alpha/beta/rc tags. +release = '0.0.1' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +#today = '' +# Else, today_fmt is used as the format for a strftime call. +#today_fmt = '%B %d, %Y' + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +exclude_patterns = [] + +# The reST default role (used for this markup: `text`) to use for all documents. +#default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +#add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +#add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +#show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# A list of ignored prefixes for module index sorting. +#modindex_common_prefix = [] + + +# -- Options for HTML output --------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +html_theme = 'default' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +#html_theme_options = {} + +# Add any paths that contain custom themes here, relative to this directory. +#html_theme_path = [] + +# The name for this set of Sphinx documents. If None, it defaults to +# "<project> v<release> documentation". +#html_title = None + +# A shorter title for the navigation bar. Default is the same as html_title. +#html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +#html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +#html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +#html_last_updated_fmt = '%b %d, %Y' + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +#html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +#html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +#html_additional_pages = {} + +# If false, no module index is generated. +#html_domain_indices = True + +# If false, no index is generated. +#html_use_index = True + +# If true, the index is split into individual pages for each letter. +#html_split_index = False + +# If true, links to the reST sources are added to the pages. +#html_show_sourcelink = True + +# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. +#html_show_sphinx = True + +# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. +#html_show_copyright = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a <link> tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +#html_use_opensearch = '' + +# This is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = None + +# Output file base name for HTML help builder. +htmlhelp_basename = 'OONIdoc' + + +# -- Options for LaTeX output -------------------------------------------------- + +latex_elements = { +# The paper size ('letterpaper' or 'a4paper'). +#'papersize': 'letterpaper', + +# The font size ('10pt', '11pt' or '12pt'). +#'pointsize': '10pt', + +# Additional stuff for the LaTeX preamble. +#'preamble': '', +} + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, author, documentclass [howto/manual]). +latex_documents = [ + ('index', 'OONI.tex', u'OONI Documentation', + u'The Tor Project', 'manual'), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +#latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +#latex_use_parts = False + +# If true, show page references after internal links. +#latex_show_pagerefs = False + +# If true, show URL addresses after external links. +#latex_show_urls = False + +# Documents to append as an appendix to all manuals. +#latex_appendices = [] + +# If false, no module index is generated. +#latex_domain_indices = True + + +# -- Options for manual page output -------------------------------------------- + +# One entry per manual page. List of tuples +# (source start file, name, description, authors, manual section). +man_pages = [ + ('index', 'ooni', u'OONI Documentation', + [u'The Tor Project'], 1) +] + +# If true, show URL addresses after external links. +#man_show_urls = False + + +# -- Options for Texinfo output ------------------------------------------------ + +# Grouping the document tree into Texinfo files. List of tuples +# (source start file, target name, title, author, +# dir menu entry, description, category) +texinfo_documents = [ + ('index', 'OONI', u'OONI Documentation', + u'The Tor Project', 'OONI', 'One line description of project.', + 'Miscellaneous'), +] + +# Documents to append as an appendix to all manuals. +#texinfo_appendices = [] + +# If false, no module index is generated. +#texinfo_domain_indices = True + +# How to display URL addresses: 'footnote', 'no', or 'inline'. +#texinfo_show_urls = 'footnote' diff --git a/docs/source/index.rst b/docs/source/index.rst new file mode 100644 index 0000000..f1c5d14 --- /dev/null +++ b/docs/source/index.rst @@ -0,0 +1,21 @@ +.. OONI documentation master file. + +Welcome to OONI's documentation! +================================ + +Contents: + +.. toctree:: + :maxdepth: 2 + + intro + tutorial + writing_tests + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` + diff --git a/docs/source/intro.rst b/docs/source/intro.rst new file mode 100644 index 0000000..e69de29 diff --git a/docs/source/tutorial.rst b/docs/source/tutorial.rst new file mode 100644 index 0000000..b13b687 --- /dev/null +++ b/docs/source/tutorial.rst @@ -0,0 +1,12 @@ +======== +Tutorial +======== + +Writing a TCP port scanner +-------------------------- + +Our goal is to write an OONI test that takes as input a list of ip:port +combinations and attempts to detect which ones are reachable and open and +which ones are not. + + diff --git a/docs/source/writing_tests.rst b/docs/source/writing_tests.rst new file mode 100644 index 0000000..8823a78 --- /dev/null +++ b/docs/source/writing_tests.rst @@ -0,0 +1,7 @@ +.. OONI documentation master file. + +================== +Writing OONI tests +================== + +

1 0

[ooni-probe/master] Fix bug inside of resume functionality
by art＠torproject.org 13 Jun '12

13 Jun '12

commit 84bf20fac3ba1f5f77223142e1552a8efdc15b8e Author: Arturo Filastò <art(a)baculo.org> Date: Thu Jun 14 01:23:58 2012 +0200 Fix bug inside of resume functionality --- ooni/ooniprobe.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py index a997041..662956a 100755 --- a/ooni/ooniprobe.py +++ b/ooni/ooniprobe.py @@ -63,11 +63,14 @@ def runTest(test, options, global_options): report = reports.Report(test, global_options['output']) log.start(global_options['log'], 1) + resume = 0 + if 'resume' in options: + resume = options['resume'] wgen = work.WorkGenerator(test_class(options, global_options, report, reactor=reactor), dict(options), - start=options['resume']) + start=resume) for x in wgen: worker.push(x)

1 0

[ooni-probe/master] Add scapy protocol and example for it
by art＠torproject.org 13 Jun '12

13 Jun '12

commit 654be17e244713320f6d218f447de1a62546c6b3 Author: Arturo Filastò <art(a)baculo.org> Date: Thu Jun 14 01:24:36 2012 +0200 Add scapy protocol and example for it * Add example of writing a tcp connect scanner --- ooni/plugins/examplescapy.py | 49 +++++++++++++++++++++++++++++++++ ooni/plugins/tcpconnect.py | 62 ++++++++++++++++++++++++++++++++++++++++++ ooni/protocols/scapy.py | 49 +++++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+), 0 deletions(-) diff --git a/ooni/plugins/examplescapy.py b/ooni/plugins/examplescapy.py new file mode 100644 index 0000000..aa6d81b --- /dev/null +++ b/ooni/plugins/examplescapy.py @@ -0,0 +1,49 @@ +import random +from zope.interface import implements +from twisted.python import usage +from twisted.plugin import IPlugin +from twisted.internet import protocol, defer +from ooni.plugoo.tests import ITest, OONITest +from ooni.plugoo.assets import Asset +from ooni import log +from ooni.protocols.scapy import ScapyTest + +from ooni.lib.txscapy import txsr, txsend + +class scapyArgs(usage.Options): + optParameters = [] + +class ExampleScapyTest(ScapyTest): + """ + An example of writing a scapy Test + """ + implements(IPlugin, ITest) + + shortName = "example_scapy" + description = "An example of a scapy test" + requirements = None + options = scapyArgs + blocking = False + + receive = True + pcapfile = 'example_scapy.pcap' + def initialize(self, reactor=None): + if not self.reactor: + from twisted.internet import reactor + self.reactor = reactor + + self.request = {} + self.response = {} + + def build_packets(self): + """ + Override this method to build scapy packets. + """ + from scapy.all import IP, TCP + return IP()/TCP() + + def load_assets(self): + return {} + +examplescapy = ExampleScapyTest(None, None, None) + diff --git a/ooni/plugins/tcpconnect.py b/ooni/plugins/tcpconnect.py new file mode 100644 index 0000000..75f32c1 --- /dev/null +++ b/ooni/plugins/tcpconnect.py @@ -0,0 +1,62 @@ +""" +This is a self genrated test created by scaffolding.py. +you will need to fill it up with all your necessities. +Safe hacking :). +""" +from zope.interface import implements +from twisted.python import usage +from twisted.plugin import IPlugin +from twisted.internet import reactor +from twisted.internet.protocol import Factory, Protocol +from twisted.internet.endpoints import TCP4ClientEndpoint + +from ooni.plugoo.tests import ITest, OONITest +from ooni.plugoo.assets import Asset +from ooni import log + +class tcpconnectArgs(usage.Options): + optParameters = [['blabla', 'a', None, 'Asset file'], + ['resume', 'r', 0, 'Resume at this index']] + +class tcpconnectTest(OONITest): + implements(IPlugin, ITest) + + shortName = "tcpconnect" + description = "tcpconnect" + requirements = None + options = tcpconnectArgs + blocking = False + + def experiment(self, args): + host, port = args['blabla'].split(':') + class DummyFactory(Factory): + def buildProtocol(self, addr): + return Protocol() + + def gotProtocol(p): + p.transport.loseConnection() + log.msg("Got a connection!") + log.msg(str(p)) + return {'result': True, 'target': [host, port]} + + def gotError(err): + log.msg("Had error :(") + log.msg(err) + return {'result': False, 'target': [host, port]} + + # What you return here gets handed as input to control + point = TCP4ClientEndpoint(reactor, host, int(port)) + d = point.connect(DummyFactory()) + d.addCallback(gotProtocol) + d.addErrback(gotError) + return d + + def load_assets(self): + if self.local_options: + return {'blabla': Asset(self.local_options['blabla'])} + else: + return {} + +# We need to instantiate it otherwise getPlugins does not detect it +# XXX Find a way to load plugins without instantiating them. +tcpconnect = tcpconnectTest(None, None, None) diff --git a/ooni/protocols/__init__.py b/ooni/protocols/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ooni/protocols/scapy.py b/ooni/protocols/scapy.py new file mode 100644 index 0000000..ba2ae66 --- /dev/null +++ b/ooni/protocols/scapy.py @@ -0,0 +1,49 @@ +import random +from zope.interface import implements +from twisted.python import usage +from twisted.plugin import IPlugin +from twisted.internet import protocol, defer +from ooni.plugoo.tests import ITest, OONITest +from ooni.plugoo.assets import Asset +from ooni import log + +from ooni.lib.txscapy import txsr, txsend + +class ScapyTest(OONITest): + """ + A utility class for writing scapy driven OONI tests. + """ + + receive = True + pcapfile = 'scapytest.pcap' + def initialize(self, reactor=None): + + if not self.reactor: + from twisted.internet import reactor + self.reactor = reactor + + self.request = {} + self.response = {} + + def experiment(self, args): + log.msg("Running experiment") + if self.receive: + d = txsr(self.build_packets(), pcapfile=self.pcapfile) + else: + d = txsend(self.build_packets()) + def finished(data): + return data + + d.addCallback(finished) + return d + + def build_packets(self): + """ + Override this method to build scapy packets. + """ + from scapy.all import IP, TCP + return IP()/TCP() + + def load_assets(self): + return {} +

1 0

[ooni-probe/master] Fix bug in http protocol
by art＠torproject.org 13 Jun '12

13 Jun '12

commit c2f406d52a3d62716c75fba0ffe8a6b96babb8e3 Author: Arturo Filastò <art(a)baculo.org> Date: Wed Jun 13 23:19:38 2012 +0200 Fix bug in http protocol --- ooni/protocols/http.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/ooni/protocols/http.py b/ooni/protocols/http.py index 068ec0d..a2081bd 100644 --- a/ooni/protocols/http.py +++ b/ooni/protocols/http.py @@ -5,7 +5,6 @@ from twisted.plugin import IPlugin from twisted.internet import protocol, defer from ooni.plugoo.tests import ITest, OONITest from ooni.plugoo.assets import Asset -from ooni.protocols.useragents import useragents from ooni import log useragents = [("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.1.6) Gecko/20070725 Firefox/2.0.0.6", "Firefox 2.0, Windows XP"),

1 0