- tor-commits - lists.torproject.org

[metrics-tasks/master] Initial commit of graph-hsdir-set-instability
by karsten＠torproject.org 25 May '11

25 May '11

commit 68b0110f4829e858b163cc050b2fc0db149b866a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue May 24 17:56:19 2011 -0700 Initial commit of graph-hsdir-set-instability --- task-2649/graph-hsdir-set-instability | 9 +++++++++ task-2649/graph-hsdir-set-instability.gnuplot | 11 +++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/task-2649/graph-hsdir-set-instability b/task-2649/graph-hsdir-set-instability new file mode 100755 index 0000000..013d287 --- /dev/null +++ b/task-2649/graph-hsdir-set-instability @@ -0,0 +1,9 @@ +#!/bin/sh -e + +# This script must be run as ./graph-hsdir-set-instability . + +gnuplot >out/hsdir-set-instability-graph.ps <<EOF +set terminal postscript color solid +load "graph-hsdir-set-instability.gnuplot" +EOF + diff --git a/task-2649/graph-hsdir-set-instability.gnuplot b/task-2649/graph-hsdir-set-instability.gnuplot new file mode 100644 index 0000000..532fd53 --- /dev/null +++ b/task-2649/graph-hsdir-set-instability.gnuplot @@ -0,0 +1,11 @@ + +set xdata time +set timefmt "%Y-%m-%d-%H-%M-%S" +set xrange ["2011-01-01-00-00-00":] +set yrange [0:1] + +plot "out/hsdir-set-instability" using 1:($3/$2) with lines title "1 hr",\ + "out/hsdir-set-instability" using 1:($4/$2) with lines title "2 hr",\ + "out/hsdir-set-instability" using 1:($5/$2) with lines title "3 hr",\ + "out/hsdir-set-instability" using 1:($6/$2) with lines title "4 hr" +

1 0

[torspec/master] Correct description of HiddenServiceOptions in control-spec.
by nickm＠torproject.org 24 May '11

24 May '11

commit 21b54d39e5290dac1bbfb00f9569fdbc23582063 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 24 11:11:32 2011 -0400 Correct description of HiddenServiceOptions in control-spec. Two of the options it mentioned no longer exist; two more have been added. Fixes bug 3268. --- control-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 1d5c341..79c3aeb 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -218,7 +218,7 @@ different keywords. These cannot be fetched directly. Currently there is only one such option: clients should use the "HiddenServiceOptions" virtual keyword to get all HiddenServiceDir, HiddenServicePort, - HiddenServiceNodes, and HiddenServiceExcludeNodes option settings. + HiddenServiceVersion, and HiddenserviceAuthorizeClient option settings. 3.4. SETEVENTS

1 0

[metrics-tasks/master] Add #3277 code.
by karsten＠torproject.org 24 May '11

24 May '11

commit 0a10a39ca7f7f2b3e306ad6de7a1776a6bd50589 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 24 15:30:11 2011 +0200 Add #3277 code. --- task-3277/.gitignore | 5 ++++ task-3277/EvaluateHsDirs.java | 52 +++++++++++++++++++++++++++++++++++++++++ task-3277/README | 22 +++++++++++++++++ task-3277/hsdir-sessions.R | 21 ++++++++++++++++ 4 files changed, 100 insertions(+), 0 deletions(-) diff --git a/task-3277/.gitignore b/task-3277/.gitignore new file mode 100644 index 0000000..5103210 --- /dev/null +++ b/task-3277/.gitignore @@ -0,0 +1,5 @@ +*.csv +*.class +Rplots.pdf +*.png + diff --git a/task-3277/EvaluateHsDirs.java b/task-3277/EvaluateHsDirs.java new file mode 100644 index 0000000..4e6f1a4 --- /dev/null +++ b/task-3277/EvaluateHsDirs.java @@ -0,0 +1,52 @@ +import java.io.*; +import java.text.*; +import java.util.*; +public class EvaluateHsDirs { + public static void main(String[] args) throws Exception { + BufferedWriter bw = new BufferedWriter(new FileWriter( + "hsdir-sessions.csv")); + bw.write("fingerprint,firstseen,lastseen,duration\n"); + BufferedReader br = new BufferedReader(new FileReader("hsdir.csv")); + String line = br.readLine(), firstValidAfter = null, + lastValidAfter = null, lastButOneValidAfter = null; + Map<String, String> last = new HashMap<String, String>(); + Map<String, String> current = new HashMap<String, String>(); + SimpleDateFormat formatter = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + formatter.setTimeZone(TimeZone.getTimeZone("UTC")); + while ((line = br.readLine()) != null) { + String[] parts = line.split(","); + String validAfter = parts[0]; + if (firstValidAfter == null) { + firstValidAfter = validAfter; + lastValidAfter = validAfter; + } + if (!line.startsWith("20") || !lastValidAfter.equals(validAfter)) { + for (Map.Entry<String, String> e : last.entrySet()) { + if (!current.containsKey(e.getKey()) && + !e.getValue().equals(firstValidAfter)) { + long duration = + (formatter.parse(lastButOneValidAfter).getTime() + - formatter.parse(e.getValue()).getTime()) / 1000L; + bw.write(e.getKey() + "," + e.getValue() + "," + + lastButOneValidAfter + "," + duration + "\n"); + } + } + if (!line.startsWith("20")) { + break; + } + last = current; + current = new HashMap<String, String>(); + lastButOneValidAfter = lastValidAfter; + } else if (last.containsKey(parts[1])) { + current.put(parts[1], last.remove(parts[1])); + } else { + current.put(parts[1], validAfter); + } + lastValidAfter = validAfter; + } + br.close(); + bw.close(); + } +} + diff --git a/task-3277/README b/task-3277/README new file mode 100644 index 0000000..6e71abb --- /dev/null +++ b/task-3277/README @@ -0,0 +1,22 @@ +Analyze how long after earning the HSDir flag relays go away + +First, extract status entries with the HSDir flag set from the metrics +database: + + tordir=> \o hsdir.csv + tordir=> SELECT validafter, fingerprint FROM statusentry + WHERE validafter >= '2010-05-01' AND validafter < '2011-05-01' + AND ishsdir IS TRUE ORDER BY validafter, fingerprint; + tordir=> \o + +Next, calculate continuous sessions of a relay having the HSDir flag. For +each such session, extract the fingerprint and the first and last time it +was listed in the network status with the HSDir flag. Also calculate the +session duration in seconds: + + $ javac EvaluateHsDirs.java && java EvaluateHsDirs + +Plot an ECDF of the session length: + + $ R --slave -f hsdir-sessions.R + diff --git a/task-3277/hsdir-sessions.R b/task-3277/hsdir-sessions.R new file mode 100644 index 0000000..4b28131 --- /dev/null +++ b/task-3277/hsdir-sessions.R @@ -0,0 +1,21 @@ +library(ggplot2) +data <- read.csv("hsdir-sessions.csv", stringsAsFactors = FALSE) + +## Histogram; not that useful +#ggplot(data, aes(x = duration / 3600)) + +#geom_histogram(aes(y = ..density..), binwidth = 1) + +#scale_x_continuous(limits = c(0, 72)) + +#scale_y_continuous(formatter = "percent") + +data <- sort(data$duration) +data <- data.frame(x = data / (60 * 60), + y = (length(data):1) / length(data)) +ggplot(data, aes(x = x, y = y)) + +geom_line() + +scale_y_continuous("Cumulative fraction of continuous HSDir sessions\n", + formatter = "percent", limits = c(0, 1)) + +scale_x_continuous(paste("\nHSDir session time between the relay earning", + "the HSDir flag and going away in hours"), + limits = c(0, 3 * 24), breaks = seq(0, 3 * 24, 24)) +ggsave(filename = "hsdir-sessions.png", width = 8, height = 5, dpi = 72) +

1 0

[metrics-tasks/master] Add code for task 3276.
by karsten＠torproject.org 24 May '11

24 May '11

commit 1147c7170f4d44ee5f0ed6c785e655537356945c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 24 09:33:51 2011 +0200 Add code for task 3276. --- task-3276/.gitignore | 4 +++ task-3276/ExtractOnionKeyLifetimes.java | 37 +++++++++++++++++++++++++++++ task-3276/ParseServerDescriptors.java | 39 +++++++++++++++++++++++++++++++ task-3276/README | 25 +++++++++++++++++++ task-3276/onion-key-lifetimes.R | 15 ++++++++++++ 5 files changed, 120 insertions(+), 0 deletions(-) diff --git a/task-3276/.gitignore b/task-3276/.gitignore new file mode 100644 index 0000000..c7cc80b --- /dev/null +++ b/task-3276/.gitignore @@ -0,0 +1,4 @@ +*.csv +Rplots.pdf +*.png + diff --git a/task-3276/ExtractOnionKeyLifetimes.java b/task-3276/ExtractOnionKeyLifetimes.java new file mode 100644 index 0000000..4a210b1 --- /dev/null +++ b/task-3276/ExtractOnionKeyLifetimes.java @@ -0,0 +1,37 @@ +import java.io.*; +import java.text.*; +import java.util.*; +public class ExtractOnionKeyLifetimes { + public static void main(String[] args) throws Exception { + BufferedReader br = new BufferedReader(new FileReader( + "sorted-2011-05.csv")); + String line, lastFingerprint = null, firstPublished = null, + lastPublished = null, lastOnionKey = null; + SimpleDateFormat formatter = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + formatter.setTimeZone(TimeZone.getTimeZone("UTC")); + while ((line = br.readLine()) != null) { + String[] parts = line.split(","); + String fingerprint = parts[0]; + String published = parts[1]; + String onionKey = parts[2]; + if (lastFingerprint == null || + !lastFingerprint.equals(fingerprint) || + !lastOnionKey.equals(onionKey)) { + if (firstPublished != null && + !firstPublished.equals(lastPublished)) { + long interval = formatter.parse(lastPublished).getTime() + - formatter.parse(firstPublished).getTime(); + System.out.println(lastFingerprint + "," + firstPublished + "," + + lastPublished + "," + (interval / 1000L)); + } + firstPublished = published; + } + lastFingerprint = fingerprint; + lastPublished = published; + lastOnionKey = onionKey; + } + br.close(); + } +} + diff --git a/task-3276/ParseServerDescriptors.java b/task-3276/ParseServerDescriptors.java new file mode 100644 index 0000000..2810d53 --- /dev/null +++ b/task-3276/ParseServerDescriptors.java @@ -0,0 +1,39 @@ +import java.io.*; +import java.util.*; +public class ParseServerDescriptors { + public static void main(String[] args) throws Exception { + Stack<File> files = new Stack<File>(); + files.add(new File(args[0])); + while (!files.isEmpty()) { + File file = files.pop(); + if (file.isDirectory()) { + for (File f : file.listFiles()) { + files.add(f); + } + } else { + BufferedReader br = new BufferedReader(new FileReader(file)); + String line, published = null, fingerprint = null; + boolean readOnionKey = false; + StringBuilder onionKey = new StringBuilder(); + while ((line = br.readLine()) != null) { + if (readOnionKey && !line.startsWith("-----")) { + onionKey.append(line); + } else if (line.startsWith("published ")) { + published = line.substring("published ".length()); + } else if (line.startsWith("opt fingerprint")) { + fingerprint = line.substring("opt fingerprint ".length()). + replaceAll(" ", ""); + } else if (line.equals("onion-key")) { + readOnionKey = true; + } else if (line.equals("-----END RSA PUBLIC KEY-----")) { + readOnionKey = false; + } + } + br.close(); + System.out.println(fingerprint + "," + published + "," + + onionKey.toString()); + } + } + } +} + diff --git a/task-3276/README b/task-3276/README new file mode 100644 index 0000000..8725044 --- /dev/null +++ b/task-3276/README @@ -0,0 +1,25 @@ +Find out onion key lifetime from server descriptors: + +First, parse fingerprints, publication times, and onion keys from server +descriptors to make subsequent analyses faster: + + $ javac ParseServerDescriptors.java + $ java ParseServerDescriptors server-descriptor/2011/05 \ + > parsed-2011-05.csv + +Sort the output by fingerprint, then by publication time: + + $ sort parsed-2011-05.csv > sorted-2011-05.csv + +Extract first and last publication times of onion keys that we saw at +least twice. Also include the fingerprint and calculate the number of +seconds between the two timestamps: + + $ javac ExtractOnionKeyLifetimes.java + $ java ExtractOnionKeyLifetimes.java > onion-key-lifetimes.csv + +Plot an ECDF and print out the onion keys that were in use for at least 10 +days: + + $ R --slave -f onion-key-lifetimes.R + diff --git a/task-3276/onion-key-lifetimes.R b/task-3276/onion-key-lifetimes.R new file mode 100644 index 0000000..182706c --- /dev/null +++ b/task-3276/onion-key-lifetimes.R @@ -0,0 +1,15 @@ +library(ggplot2) +data <- read.csv("onion-key-lifetimes.csv", + col.names = c("fingerprint", "start", "end", "length"), + stringsAsFactors = FALSE) +print(data[data$length >= 10 * 24 * 60 * 60, ]) +data <- sort(data$length) +data <- data.frame(x = data / (24 * 60 * 60), y = 1:length(data)) +ggplot(data, aes(x = x, y = y)) + +geom_line() + +scale_y_continuous("Cumulative number of onion keys\n") + +scale_x_continuous(paste("\nTime between first and last publication of", + "the same onion key in May 2011 in days")) +ggsave(filename = "onion-key-lifetimes.png", width = 8, height = 5, + dpi = 72) +

1 0

r24784: {website} those are -beta, not -alpha (thanks, nickm) (website/trunk/include)
by Erinn Clark 24 May '11

24 May '11

Author: erinn Date: 2011-05-24 03:20:22 +0000 (Tue, 24 May 2011) New Revision: 24784 Modified: website/trunk/include/versions.wmi Log: those are -beta, not -alpha (thanks, nickm) Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-05-24 03:10:46 UTC (rev 24783) +++ website/trunk/include/versions.wmi 2011-05-24 03:20:22 UTC (rev 24784) @@ -2,24 +2,24 @@ <define-tag version-alpha whitespace=delete>0.2.2.27-beta</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.27-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.2.27-beta</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.27-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.27-beta</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.27-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.27-beta-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.27-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.27-beta</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.27-alpha</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.27-beta</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.27-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.27-beta</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.27-alpha</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.27-beta</define-tag> <define-tag version-torbrowserbundle whitespace=delete>1.3.24</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> @@ -34,14 +34,14 @@ <define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.9</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.9</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.27-alpha</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.27-beta</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.10, zlib-1.2.3, openssl-0.9.8p</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> <define-tag version-torbrowserbundleosx whitespace=delete>1.0.17</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.27-alpha</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.27-beta</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>

1 0

r24783: {website} 0.2.2.27-beta packages (website/trunk/include)
by Erinn Clark 24 May '11

24 May '11

Author: erinn Date: 2011-05-24 03:10:46 +0000 (Tue, 24 May 2011) New Revision: 24783 Modified: website/trunk/include/versions.wmi Log: 0.2.2.27-beta packages Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-05-24 00:55:39 UTC (rev 24782) +++ website/trunk/include/versions.wmi 2011-05-24 03:10:46 UTC (rev 24783) @@ -1,25 +1,25 @@ <define-tag version-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-alpha whitespace=delete>0.2.2.26-beta</define-tag> +<define-tag version-alpha whitespace=delete>0.2.2.27-beta</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.25-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.2.27-alpha</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.25-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.27-alpha</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.25-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.27-alpha-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.25-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.27-alpha</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.25-alpha</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.27-alpha</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.25-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.27-alpha</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.24-alpha</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.27-alpha</define-tag> <define-tag version-torbrowserbundle whitespace=delete>1.3.24</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> @@ -32,21 +32,23 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.8</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.8</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.25-alpha</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.9</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.9</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.27-alpha</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.10, zlib-1.2.3, openssl-0.9.8p</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.16</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.25-alpha</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>1.0.17</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.27-alpha</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> +<define-tag version-torbrowserbundleff4 whitespace=delete>2.2.27-1</define-tag> + <define-tag version-vidalia-stable whitespace=delete>0.2.12</define-tag> <define-tag version-androidbundle-tor whitespace=delete>0.2.2.25-alpha</define-tag>

1 0

[obfsproxy/master] Added SOCKS4{,a} unit tests
by nickm＠torproject.org 24 May '11

24 May '11

commit f88678b9432e120e434d1d87f9b26cf0ae8bcc02 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue May 24 00:37:08 2011 +0200 Added SOCKS4{,a} unit tests --- src/test/unittest_socks.c | 216 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 208 insertions(+), 8 deletions(-) diff --git a/src/test/unittest_socks.c b/src/test/unittest_socks.c index 9e971d8..ca2ab09 100644 --- a/src/test/unittest_socks.c +++ b/src/test/unittest_socks.c @@ -14,7 +14,7 @@ #include "../protocols/obfs2.h" /** - This unit test tests the negotiation phase of the SOCKS5 protocol. + This function tests the negotiation phase of the SOCKS5 protocol. It sends broken 'Method Negotiation Packets' and it verifies that the SOCKS server detected the errors. It also sends some correct packets and it expects the server to like them. @@ -34,7 +34,6 @@ test_socks_socks5_send_negotiation(void *data) /* First test: Only one method: NOAUTH. SOCKS proxy should like this. */ - uchar req1[2]; req1[0] = 1; req1[1] = 0; @@ -127,7 +126,7 @@ test_socks_socks5_send_negotiation(void *data) } /** - This unit test tests the 'Client Request' phase of the SOCKS5 + This function tests the 'Client Request' phase of the SOCKS5 protocol. It sends broken 'Client Request' packets and it verifies that the SOCKS server detected the errors. It also sends some correct @@ -136,7 +135,6 @@ test_socks_socks5_send_negotiation(void *data) static void test_socks_socks5_request(void *data) { - struct evbuffer *dest = NULL; struct evbuffer *source = NULL; dest = evbuffer_new(); @@ -236,7 +234,7 @@ test_socks_socks5_request(void *data) evbuffer_add(source, req5, 24); tt_int_op(1, ==, socks5_handle_request(source,&pr1)); - tt_assert(strcmp(pr1.addr, "www.test.example") == 0); + tt_str_op(pr1.addr, ==, "www.test.example"); tt_int_op(pr1.port, ==, 80); /* Sixth test: @@ -280,7 +278,7 @@ test_socks_socks5_request(void *data) } /** - This unit test tests the 'Server reply' phase of the SOCKS5 + This function tests the 'Server reply' phase of the SOCKS5 protocol. We ask the server to send us 'Server reply' packets to different requests and with different status codes, and check if the server @@ -301,8 +299,7 @@ test_socks_socks5_request_reply(void *data) /* First test: We ask the server to send us a reply on an IPv4 request with - succesful status. - */ + succesful status. */ tt_int_op(1, ==, socks5_send_reply(reply_dest, state, SOCKS5_REP_SUCCESS)); @@ -373,6 +370,207 @@ test_socks_socks5_request_reply(void *data) evbuffer_free(reply_dest); } +/** + This function tests the 'Server reply' phase of the SOCKS4 + *and* SOCKS4a protocol. + It sends broken client request packets and it verifies that the + SOCKS server detected the errors. It also sends some correct + packets and it expects the server to like them. +*/ +static void +test_socks_socks4_request(void *data) +{ + struct evbuffer *dest = NULL; + struct evbuffer *source = NULL; + dest = evbuffer_new(); + source = evbuffer_new(); + + const uint32_t addr = htonl(0x7f000001); /* 127.0.0.1 */ + const uint16_t port = htons(80); /* 80 */ + + socks_state_t *state; + state = socks_state_new(); + tt_assert(state); + + /* First test: + Correct SOCKS4 req packet with nothing in the optional field. */ + struct parsereq pr1; + state->parsereq = pr1; + uchar req1[8]; + req1[0] = 1; + memcpy(req1+1,&port,2); + memcpy(req1+3,&addr,4); + req1[7] = '\x00'; + + evbuffer_add(source,req1,8); + + tt_int_op(1, ==, socks4_read_request(source,state)); + tt_str_op(state->parsereq.addr, ==, "127.0.0.1"); + tt_int_op(state->parsereq.port, ==, 80); + + /* emptying source buffer before next test */ + size_t buffer_len = evbuffer_get_length(source); + tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + + /* Second test: + Broken SOCKS4 req packet with incomplete optional field */ + char req2[10]; + req2[0] = 1; + memcpy(req2+1,&port,2); + memcpy(req2+3,&addr,4); + strcpy(req2+7,"KO"); + + evbuffer_add(source,req2,9); + + tt_int_op(0, ==, socks4_read_request(source,state)); + + /* emptying source buffer before next test */ + buffer_len = evbuffer_get_length(source); + tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + + /* Third test: + Correct SOCKS4 req packet with optional field. */ + char req3[16]; + req3[0] = 1; + memcpy(req3+1,&port,2); + memcpy(req3+3,&addr,4); + strcpy(req3+7,"iamalive"); + + evbuffer_add(source,req3,16); + + tt_int_op(1, ==, socks4_read_request(source,state)); + tt_str_op(state->parsereq.addr, ==, "127.0.0.1"); + tt_int_op(state->parsereq.port, ==, 80); + + /* emptying source buffer before next test */ + buffer_len = evbuffer_get_length(source); + tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + + /* Fourth test: + Correct SOCKS4a req packet with optional field. */ + const uint32_t addr_4a = htonl(0x00000042); /* 127.0.0.1 */ + char req4[33]; + req4[0] = 1; + memcpy(req4+1,&port,2); + memcpy(req4+3,&addr_4a,4); + strcpy(req4+7,"iamalive"); + strcpy(req4+16, "www.test.example"); + + evbuffer_add(source,req4,33); + + tt_int_op(1, ==, socks4_read_request(source,state)); + tt_str_op(state->parsereq.addr, ==, "www.test.example"); + tt_int_op(state->parsereq.port, ==, 80); + + /* emptying source buffer before next test */ + buffer_len = evbuffer_get_length(source); + tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + + /* Fifth test: + Broken SOCKS4a req packet with incomplete optional field. */ + char req5[33]; + req5[0] = 1; + memcpy(req5+1,&port,2); + memcpy(req5+3,&addr_4a,4); + strcpy(req5+7,"iamalive"); + strcpy(req5+16, "www.test.example"); + + evbuffer_add(source,req5,28); + + tt_int_op(0, ==, socks4_read_request(source,state)); + + /* emptying source buffer before next test */ + buffer_len = evbuffer_get_length(source); + tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + + /* Sixth test: + Broken SOCKS4a req packet with a HUGE domain name. */ + #define HUGE 256 + + char req6[283]; + req6[0] = 1; + memcpy(req6+1,&port,2); + memcpy(req6+3,&addr_4a,4); + strcpy(req6+7,"iamalive"); + memset(req6+16,'2', HUGE); + req6[16+HUGE] = '\x00'; + + evbuffer_add(source,req6,16+HUGE+1); + + tt_int_op(-1, ==, socks4_read_request(source,state)); + #undef HUGE + + end: + if (state) + socks_state_free(state); + + if (source) + evbuffer_free(source); + if (dest) + evbuffer_free(dest); +} + +static void +test_socks_socks4_request_reply(void *data) +{ + struct evbuffer *reply_dest = NULL; + reply_dest = evbuffer_new(); + + socks_state_t *state; + state = socks_state_new(); + tt_assert(state); + + state->parsereq.af = AF_INET; + strcpy(state->parsereq.addr, "127.0.0.1"); + state->parsereq.port = 7357; + + /* First test: + We ask the server to send us a reply on an IPv4 request with + succesful status. */ + tt_int_op(1, ==, socks4_send_reply(reply_dest, + state, SOCKS5_REP_SUCCESS)); + + uchar rep1[255]; + evbuffer_remove(reply_dest,rep1,255); /* yes, this is dirty */ + + tt_assert(rep1[0] == '\x00'); + tt_assert(rep1[1] == SOCKS4_SUCCESS); + /* check port */ + tt_int_op(0, ==, memcmp(rep1+2,"\x1c\xbd",2)); + /* check address */ + tt_int_op(0, ==, memcmp(rep1+2+2,"\x7f\x00\x00\x01", 4)); + + /* emptying reply_dest buffer before next test */ + size_t buffer_len = evbuffer_get_length(reply_dest); + tt_int_op(0, ==, evbuffer_drain(reply_dest, buffer_len)); + + /* Second test : + We ask the server to send us a reply on an FQDN request with + failure status. + */ + const char *fqdn = "www.test.example"; + state->parsereq.af = AF_UNSPEC; + strcpy(state->parsereq.addr, fqdn); + + tt_int_op(-1, ==, socks4_send_reply(reply_dest, + state, SOCKS5_REP_FAIL)); + + uchar rep2[255]; + evbuffer_remove(reply_dest,rep2,255); + + tt_assert(rep2[1] == SOCKS4_FAILED); + /* check port */ + tt_int_op(0, ==, memcmp(rep1+2,"\x1c\xbd",2)); + /* check address */ + /* tt_str_op(rep1+2+2, ==, "www.test.example"); */ + + end: + if (state) + socks_state_free(state); + + if (reply_dest) + evbuffer_free(reply_dest); +} #define T(name, flags) \ { #name, test_socks_##name, (flags), NULL, NULL } @@ -381,5 +579,7 @@ struct testcase_t socks_tests[] = { T(socks5_send_negotiation, 0), T(socks5_request, 0), T(socks5_request_reply, 0), + T(socks4_request, 0), + T(socks4_request_reply, 0), END_OF_TESTCASES };

1 0

[obfsproxy/master] Added IPv6 SOCKS5 unit tests
by nickm＠torproject.org 24 May '11

24 May '11

commit aefb1ef5ecf0cd522aafc91ac93834dfa05ff70e Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon May 23 17:41:53 2011 +0200 Added IPv6 SOCKS5 unit tests --- src/test/unittest_socks.c | 141 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 106 insertions(+), 35 deletions(-) diff --git a/src/test/unittest_socks.c b/src/test/unittest_socks.c index 017e624..9e971d8 100644 --- a/src/test/unittest_socks.c +++ b/src/test/unittest_socks.c @@ -13,8 +13,14 @@ #include "../util.h" #include "../protocols/obfs2.h" +/** + This unit test tests the negotiation phase of the SOCKS5 protocol. + It sends broken 'Method Negotiation Packets' and it verifies that + the SOCKS server detected the errors. It also sends some correct + packets and it expects the server to like them. +*/ static void -test_socks_send_negotiation(void *data) +test_socks_socks5_send_negotiation(void *data) { struct evbuffer *dest = NULL; struct evbuffer *source = NULL; @@ -120,6 +126,13 @@ test_socks_send_negotiation(void *data) evbuffer_free(dest); } +/** + This unit test tests the 'Client Request' phase of the SOCKS5 + protocol. + It sends broken 'Client Request' packets and it verifies that + the SOCKS server detected the errors. It also sends some correct + packets and it expects the server to like them. +*/ static void test_socks_socks5_request(void *data) { @@ -133,7 +146,8 @@ test_socks_socks5_request(void *data) state = socks_state_new(); tt_assert(state); - const uint32_t addr = htonl(0x7f000001); /* 127.0.0.1 */ + const uint32_t addr_ipv4 = htonl(0x7f000001); /* 127.0.0.1 */ + const uint8_t addr_ipv6[16] = {0,13,0,1,0,5,0,14,0,10,0,5,0,14,0,0}; /* d:1:5:e:a:5:e:0 */ const uint16_t port = htons(80); /* 80 */ /* First test: @@ -143,7 +157,7 @@ test_socks_socks5_request(void *data) req1[0] = 1; req1[1] = 0; req1[2] = 1; - memcpy(req1+3,&addr,4); + memcpy(req1+3,&addr_ipv4,4); evbuffer_add(source, "\x05", 1); evbuffer_add(source, req1, 7); @@ -160,7 +174,7 @@ test_socks_socks5_request(void *data) req2[1] = 0; req2[2] = 3; req2[3] = 15; - memcpy(req1+4,&addr,3); + memcpy(req1+4,&addr_ipv4,3); evbuffer_add(source, "\x05", 1); evbuffer_add(source, req2, 7); @@ -171,12 +185,12 @@ test_socks_socks5_request(void *data) tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); /* Third test: - Correct IPV4 req packet. */ + Correct IPv4 req packet. */ uchar req3[9]; req3[0] = 1; req3[1] = 0; req3[2] = 1; - memcpy(req3+3,&addr,4); + memcpy(req3+3,&addr_ipv4,4); memcpy(req3+7,&port,2); evbuffer_add(source, "\x05", 1); @@ -190,46 +204,65 @@ test_socks_socks5_request(void *data) tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); /* Fourth test: - Correct FQDN req packet. */ - const char fqdn[17] = "www.test.example"; + Correct IPv6 req packet. */ uchar req4[24]; req4[0] = 5; req4[1] = 1; req4[2] = 0; - req4[3] = 3; - req4[4] = strlen(fqdn); - strcpy((char *)req4+5,fqdn); - memcpy(req4+5+strlen(fqdn),&port,2); + req4[3] = SOCKS5_ATYP_IPV6; + memcpy(req4+4,&addr_ipv6,16); + memcpy(req4+20,&port,2); - evbuffer_add(source, req4, 24); + evbuffer_add(source,req4,22); tt_int_op(1, ==, socks5_handle_request(source,&pr1)); - tt_assert(strcmp(pr1.addr, "www.test.example") == 0); + tt_str_op(pr1.addr, ==, "d:1:5:e:a:5:e:0"); tt_int_op(pr1.port, ==, 80); - /* Third test: - Small request packet */ - uchar req5[3]; + /* emptying source buffer before next test */ + buffer_len = evbuffer_get_length(source); + tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); + + /* Fifth test: + Correct FQDN req packet. */ + const char fqdn[17] = "www.test.example"; + uchar req5[24]; req5[0] = 5; req5[1] = 1; req5[2] = 0; + req5[3] = 3; + req5[4] = strlen(fqdn); + strcpy((char *)req5+5,fqdn); + memcpy(req5+5+strlen(fqdn),&port,2); + + evbuffer_add(source, req5, 24); + tt_int_op(1, ==, socks5_handle_request(source,&pr1)); + tt_assert(strcmp(pr1.addr, "www.test.example") == 0); + tt_int_op(pr1.port, ==, 80); - evbuffer_add(source,req5,3); + /* Sixth test: + Small request packet */ + uchar req6[3]; + req6[0] = 5; + req6[1] = 1; + req6[2] = 0; + + evbuffer_add(source,req6,3); tt_int_op(0, ==, socks5_handle_request(source,&pr1)); /* emptying source buffer before next test */ buffer_len = evbuffer_get_length(source); tt_int_op(0, ==, evbuffer_drain(source, buffer_len)); - /* Fourth test: + /* Seventh test: Wrong Reserved field */ - uchar req6[5]; - req6[0] = 5; - req6[1] = 1; - req6[2] = 1; - req6[3] = 42; - req6[4] = 42; - - evbuffer_add(source,req6,5); + uchar req7[5]; + req7[0] = 5; + req7[1] = 1; + req7[2] = 1; + req7[3] = 42; + req7[4] = 42; + + evbuffer_add(source,req7,5); tt_int_op(-1, ==, socks5_handle_request(source,&pr1)); /* emptying source buffer before next test */ @@ -246,6 +279,12 @@ test_socks_socks5_request(void *data) evbuffer_free(dest); } +/** + This unit test tests the 'Server reply' phase of the SOCKS5 + protocol. + We ask the server to send us 'Server reply' packets to different + requests and with different status codes, and check if the server + composed the packets well. */ static void test_socks_socks5_request_reply(void *data) { @@ -260,6 +299,10 @@ test_socks_socks5_request_reply(void *data) strcpy(state->parsereq.addr, "127.0.0.1"); state->parsereq.port = 7357; + /* First test: + We ask the server to send us a reply on an IPv4 request with + succesful status. + */ tt_int_op(1, ==, socks5_send_reply(reply_dest, state, SOCKS5_REP_SUCCESS)); @@ -276,23 +319,51 @@ test_socks_socks5_request_reply(void *data) size_t buffer_len = evbuffer_get_length(reply_dest); tt_int_op(0, ==, evbuffer_drain(reply_dest, buffer_len)); + /* Second test: + We ask the server to send us a reply on an IPv6 request with + succesful status. + */ + state->parsereq.af = AF_INET6; + strcpy(state->parsereq.addr, "d:1:5:e:a:5:e:0"); + + tt_int_op(1, ==, socks5_send_reply(reply_dest, + state, SOCKS5_REP_SUCCESS)); + + uchar rep2[255]; + evbuffer_remove(reply_dest,rep2,255); + + tt_assert(rep2[3] = SOCKS5_ATYP_IPV6); + /* Test returned address against inet_pton(d:1:5:e:a:5:e:0) */ + tt_int_op(0, ==, memcmp(rep2+4, + "\x00\x0d\x00\x01\x00\x05\x00\x0e\x00" + "\x0a\x00\x05\x00\x0e\x00\x00", + 16)); + tt_int_op(0, ==, memcmp(rep2+4+16, "\x1c\xbd", 2)); + + /* emptying reply_dest buffer before next test */ + buffer_len = evbuffer_get_length(reply_dest); + tt_int_op(0, ==, evbuffer_drain(reply_dest, buffer_len)); + + /* Third test : + We ask the server to send us a reply on an FQDN request with + failure status. + */ const char *fqdn = "www.test.example"; state->parsereq.af = AF_UNSPEC; strcpy(state->parsereq.addr, fqdn); - state->parsereq.port = 7357; tt_int_op(-1, ==, socks5_send_reply(reply_dest, state, SOCKS5_REP_FAIL)); - uchar rep2[255]; - evbuffer_remove(reply_dest,rep2,255); + uchar rep3[255]; + evbuffer_remove(reply_dest,rep3,255); - tt_assert(rep2[3] == SOCKS5_ATYP_FQDN); - tt_assert(rep2[4] == strlen(fqdn)); + tt_assert(rep3[3] == SOCKS5_ATYP_FQDN); + tt_assert(rep3[4] == strlen(fqdn)); /* check fqdn */ - tt_int_op(0, ==, memcmp(rep2+5,fqdn,strlen(fqdn))); + tt_int_op(0, ==, memcmp(rep3+5,fqdn,strlen(fqdn))); /* check port */ - tt_int_op(0, ==, memcmp(rep2+5+strlen(fqdn),"\x1c\xbd",2)); + tt_int_op(0, ==, memcmp(rep3+5+strlen(fqdn),"\x1c\xbd",2)); end: if (state) @@ -307,7 +378,7 @@ test_socks_socks5_request_reply(void *data) { #name, test_socks_##name, (flags), NULL, NULL } struct testcase_t socks_tests[] = { - T(send_negotiation, 0), + T(socks5_send_negotiation, 0), T(socks5_request, 0), T(socks5_request_reply, 0), END_OF_TESTCASES

1 0

[obfsproxy/master] I decided against the stupid return game in socks{4, 5}_send_reply(). It had no use.
by nickm＠torproject.org 24 May '11

24 May '11

commit 0e37d9f8dabb35fff81ccb08466a2fb6f7e6588e Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue May 24 01:21:33 2011 +0200 I decided against the stupid return game in socks{4,5}_send_reply(). It had no use. --- src/socks.c | 12 ++---------- src/test/unittest_socks.c | 4 ++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/socks.c b/src/socks.c index 5a97b83..6144e26 100644 --- a/src/socks.c +++ b/src/socks.c @@ -214,11 +214,7 @@ socks5_send_reply(struct evbuffer *reply_dest, socks_state_t *state, state->state = ST_SENT_REPLY; /* SOCKS phase is now done. */ - if (status == SOCKS5_REP_SUCCESS) { - return 1; - } else { - return -1; - } + return 1; } /** @@ -386,11 +382,7 @@ socks4_send_reply(struct evbuffer *dest, socks_state_t *state, int status) memcpy(msg+4, &in.s_addr, 4); evbuffer_add(dest, msg, 8); - /* ASN: Do we actually like this return tactic? Check out why I do it. */ - if (status == SOCKS5_REP_SUCCESS) - return 1; - else - return -1; + return 1; } /** diff --git a/src/test/unittest_socks.c b/src/test/unittest_socks.c index 510ede5..cc68528 100644 --- a/src/test/unittest_socks.c +++ b/src/test/unittest_socks.c @@ -347,7 +347,7 @@ test_socks_socks5_request_reply(void *data) state->parsereq.af = AF_UNSPEC; strcpy(state->parsereq.addr, fqdn); - tt_int_op(-1, ==, socks5_send_reply(reply_dest, + tt_int_op(1, ==, socks5_send_reply(reply_dest, state, SOCKS5_REP_FAIL)); uchar rep3[255]; @@ -557,7 +557,7 @@ test_socks_socks4_request_reply(void *data) state->parsereq.af = AF_UNSPEC; strcpy(state->parsereq.addr, fqdn); - tt_int_op(-1, ==, socks4_send_reply(reply_dest, + tt_int_op(1, ==, socks4_send_reply(reply_dest, state, SOCKS5_REP_FAIL)); uchar rep2[255];

1 0

[obfsproxy/master] * Fixed a small bug in socks5_send_reply() found by the unit tests.
by nickm＠torproject.org 24 May '11

24 May '11

commit d9c15cebf1ace2bf4e14022f9711bfee275aca05 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue May 24 00:43:54 2011 +0200 * Fixed a small bug in socks5_send_reply() found by the unit tests. * de-staticed the socks4_* functions, so that they can be unit tested. * Changed the way socks4_send_reply() returns, to something I'm not sure I like or find useful; but that's how socks5_send_reply() was. --- src/socks.c | 15 +++++++++++---- src/socks.h | 5 ++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/socks.c b/src/socks.c index a1f794a..5a97b83 100644 --- a/src/socks.c +++ b/src/socks.c @@ -202,7 +202,7 @@ socks5_send_reply(struct evbuffer *reply_dest, socks_state_t *state, } else { addrlen = (state->parsereq.af == AF_INET) ? 4 : 16; p[3] = (state->parsereq.af == AF_INET) ? SOCKS5_ATYP_IPV4 : SOCKS5_ATYP_IPV6; - evutil_inet_pton(AF_INET, state->parsereq.addr, addr); + evutil_inet_pton(state->parsereq.af, state->parsereq.addr, addr); } port = htons(state->parsereq.port); @@ -293,7 +293,8 @@ socks5_do_negotiation(struct evbuffer *dest, unsigned int neg_was_success) return 1; } -static int +/* rename to socks4_handle_request or something. */ +int socks4_read_request(struct evbuffer *source, socks_state_t *state) { /* Format is: @@ -366,7 +367,7 @@ socks4_read_request(struct evbuffer *source, socks_state_t *state) return 1; } -static int +int socks4_send_reply(struct evbuffer *dest, socks_state_t *state, int status) { uint16_t portnum; @@ -381,9 +382,15 @@ socks4_send_reply(struct evbuffer *dest, socks_state_t *state, int status) /* convert to socks4 status */ msg[1] = (status == SOCKS5_REP_SUCCESS) ? SOCKS4_SUCCESS : SOCKS4_FAILED; memcpy(msg+2, &portnum, 2); + /* ASN: What should we do here in the case of an FQDN request? */ memcpy(msg+4, &in.s_addr, 4); evbuffer_add(dest, msg, 8); - return 1; + + /* ASN: Do we actually like this return tactic? Check out why I do it. */ + if (status == SOCKS5_REP_SUCCESS) + return 1; + else + return -1; } /** diff --git a/src/socks.h b/src/socks.h index 36a5a32..37c94cc 100644 --- a/src/socks.h +++ b/src/socks.h @@ -84,9 +84,12 @@ int socks5_handle_negotiation(struct evbuffer *source, struct evbuffer *dest, socks_state_t *state); int socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq); - int socks5_send_reply(struct evbuffer *reply_dest, socks_state_t *state, int status); + +int socks4_read_request(struct evbuffer *source, socks_state_t *state); +int socks4_send_reply(struct evbuffer *dest, + socks_state_t *state, int status); #endif #endif

1 0