- tor-commits - lists.torproject.org

[flashproxy/master] Add a required --relay option to the facilitator.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit 1b1687e87fe6ce17ad1509bac7eaf479c7247628 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 10 03:15:25 2011 -0700 Add a required --relay option to the facilitator. --- facilitator.py | 40 +++++++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 5 deletions(-) diff --git a/facilitator.py b/facilitator.py index 5c33ea2..be7543a 100755 --- a/facilitator.py +++ b/facilitator.py @@ -15,6 +15,7 @@ import urlparse DEFAULT_ADDRESS = "0.0.0.0" DEFAULT_PORT = 9002 +DEFAULT_RELAY_PORT = 9001 DEFAULT_LOG_FILENAME = "facilitator.log" LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" @@ -22,17 +23,26 @@ LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" class options(object): log_filename = DEFAULT_LOG_FILENAME log_file = sys.stdout + relay_spec = None daemonize = True + @staticmethod + def set_relay_spec(spec): + af, host, port = parse_addr_spec(spec, defport = DEFAULT_RELAY_PORT) + # Resolve to get an IP address. + addrs = socket.getaddrinfo(host, port, af) + options.relay_spec = format_addr(addrs[0][4]) + def usage(f = sys.stdout): print >> f, """\ -Usage: %(progname)s <OPTIONS> [HOST] [PORT] +Usage: %(progname)s -r RELAY <OPTIONS> [HOST] [PORT] Flash bridge facilitator: Register client addresses with HTTP POST requests and serve them out again with HTTP GET. Listen on HOST and PORT, by default %(addr)s %(port)d. -d, --debug don't daemonize, log to stdout. -h, --help show this help. - -l, --log FILENAME write log to FILENAME (default \"%(log)s\").\ + -l, --log FILENAME write log to FILENAME (default \"%(log)s\"). + -r, --relay RELAY send RELAY (host:port) to proxies as the relay to use.\ """ % { "progname": sys.argv[0], "addr": DEFAULT_ADDRESS, @@ -200,7 +210,9 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): reg = REGS.fetch() if reg: - log(u"proxy %s gets %s (now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) + log(u"proxy %s gets %s, relay %s (now %d)" % + (format_addr(self.client_address), unicode(reg), + options.relay_spec, len(REGS))) self.send_client(reg) else: log(u"proxy %s gets none" % format_addr(self.client_address)) @@ -272,11 +284,16 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): self.send_response(200) self.send_header("Content-Type", "x-www-form-urlencoded") self.end_headers() - self.request.send(urllib.urlencode({"client": client_str})) + + data = {} + data["client"] = client_str + data["relay"] = options.relay_spec + self.request.send(urllib.urlencode(data)) REGS = RegSet() -opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:", ["debug", "help", "log="]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:r:", + ["debug", "help", "log=", "relay="]) for o, a in opts: if o == "-d" or o == "--debug": options.daemonize = False @@ -286,12 +303,25 @@ for o, a in opts: sys.exit() elif o == "-l" or o == "--log": options.log_filename = a + elif o == "-r" or o == "--relay": + try: + options.set_relay_spec(a) + except socket.gaierror, e: + print >> sys.stderr, u"Can't resolve relay %s: %s" % (repr(a), str(e)) + sys.exit(1) if options.log_filename: options.log_file = open(options.log_filename, "a") else: options.log_file = sys.stdout +if not options.relay_spec: + print >> sys.stderr, """\ +The -r option is required. Give it the relay that will be sent to proxies. + -r HOST[:PORT]\ +""" + sys.exit(1) + if len(args) == 0: address = (DEFAULT_ADDRESS, DEFAULT_PORT) elif len(args) == 1:

1 0

[flashproxy/master] Check whether s_c and s_r exist before checking for connectedness.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit 0f17fa91026c6d42e866700ddb85c3094934654f Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 10 03:05:46 2011 -0700 Check whether s_c and s_r exist before checking for connectedness. --- swfcat.as | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/swfcat.as b/swfcat.as index 8c91ae8..2afde01 100644 --- a/swfcat.as +++ b/swfcat.as @@ -429,19 +429,19 @@ class ProxyPair extends EventDispatcher s_r.addEventListener(Event.CONNECT, relay_connected); s_r.addEventListener(Event.CLOSE, function (e:Event):void { log("Relay: closed."); - if (s_c.connected) + if (s_c && s_c.connected) s_c.close(); dispatchEvent(new Event(Event.COMPLETE)); }); s_r.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { log("Relay: I/O error: " + e.text + "."); - if (s_c.connected) + if (s_c && s_c.connected) s_c.close(); dispatchEvent(new Event(Event.COMPLETE)); }); s_r.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { log("Relay: security error: " + e.text + "."); - if (s_c.connected) + if (s_c && s_c.connected) s_c.close(); dispatchEvent(new Event(Event.COMPLETE)); }); @@ -460,19 +460,19 @@ class ProxyPair extends EventDispatcher s_c.addEventListener(Event.CONNECT, client_connected); s_c.addEventListener(Event.CLOSE, function (e:Event):void { log("Client: closed."); - if (s_r.connected) + if (s_r && s_r.connected) s_r.close(); dispatchEvent(new Event(Event.COMPLETE)); }); s_c.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { log("Client: I/O error: " + e.text + "."); - if (s_r.connected) + if (s_r && s_r.connected) s_r.close(); dispatchEvent(new Event(Event.COMPLETE)); }); s_c.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { log("Client: security error: " + e.text + "."); - if (s_r.connected) + if (s_r && s_r.connected) s_r.close(); dispatchEvent(new Event(Event.COMPLETE)); });

1 0

[flashproxy/master] Let swfcat get the relay from the facilitator.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit c48df422a4eb497d5cc65a77f4d987f3d4999cbf Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 10 03:15:59 2011 -0700 Let swfcat get the relay from the facilitator. --- README | 9 +++++---- design.txt | 6 +++--- swfcat.as | 27 ++++++++++++++------------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/README b/README index 4e58907..b4b1d0e 100644 --- a/README +++ b/README @@ -81,8 +81,8 @@ changing pool of addresses. == Design notes -The Tor relay address is hardcoded in swfcat.as. It could be any relay, -with the caveat that the server also has to serve a crossdomain policy. +Any Tor relay can be used, as long as it also serves a crossdomain +policy. The Tor client needs to be able to listen for an incoming connection, which generally means not being behind NAT. @@ -94,11 +94,12 @@ Clients register with the facilitator by sending an HTTP message: The Flash proxy also gets a client address over HTTP: GET / HTTP/1.0\r\n \r\n -The server sends back an address specification in an HTTP respose. +The server sends back address specifications of a client and a relay in +an HTTP respose. HTTP/1.0 200 OK\r\n Server: BaseHTTP/0.3 Python/2.5.2\r\n \r\n - client=1.2.3.4%3A9000 + client=1.2.3.4%3A9000&relay=9.9.9.9:9001 == ActionScript programming diff --git a/design.txt b/design.txt index abc53a4..27be8ab 100644 --- a/design.txt +++ b/design.txt @@ -128,8 +128,8 @@ Design of Flash proxies 7. Behavior of the Flash proxy The Flash proxy polls the facilitator for client registrations. When - it receives a registration, it opens one connection to a Tor relay, - one to the given client, and begin proxying data between them. + it receives a registration, it opens one connection to the given Tor + relay, one to the given client, and begin proxying data between them. The proxy asks the facilitator for a registration with an HTTP GET request: @@ -139,7 +139,7 @@ Design of Flash proxies The response code is 200 and the body looks like this: - client=[<address>:<port>] + client=[<address>:<port>]&relay=<address>:<port> If <address>:<port> is missing, it means that there are no client registrations for this proxy. diff --git a/swfcat.as b/swfcat.as index 34983ce..8c91ae8 100644 --- a/swfcat.as +++ b/swfcat.as @@ -18,12 +18,6 @@ package public class swfcat extends Sprite { - /* David's relay (nickname 3VXRyxz67OeRoqHn) that also serves a - crossdomain policy. */ - private const DEFAULT_RELAY_ADDR:Object = { - host: "173.255.221.44", - port: 9001 - }; private const DEFAULT_FACILITATOR_ADDR:Object = { host: "tor-facilitator.bamsoftware.com", port: 9002 @@ -43,7 +37,6 @@ package private var output_text:TextField; private var fac_addr:Object; - private var relay_addr:Object; /* Number of proxy pairs currently connected (up to MAX_NUM_PROXY_PAIRS). */ @@ -158,11 +151,6 @@ package puts("Error: Facilitator spec must be in the form \"host:port\"."); return; } - relay_addr = get_param_addr("relay", DEFAULT_RELAY_ADDR); - if (!relay_addr) { - puts("Error: Relay spec must be in the form \"host:port\"."); - return; - } main(); } @@ -213,6 +201,8 @@ package var loader:URLLoader; var client_spec:String; var client_addr:Object; + var relay_spec:String; + var relay_addr:Object; var proxy_pair:Object; setTimeout(main, FACILITATOR_POLL_INTERVAL); @@ -226,13 +216,24 @@ package puts("Error: missing \"client\" in response."); return; } - puts("Facilitator: got \"" + client_spec + "\"."); + relay_spec = loader.data.relay; + if (!relay_spec) { + puts("Error: missing \"relay\" in response."); + return; + } + puts("Facilitator: got client:\"" + client_spec + "\" " + + "relay:\"" + relay_spec + "\"."); client_addr = parse_addr_spec(client_spec); if (!client_addr) { puts("Error: Client spec must be in the form \"host:port\"."); return; } + relay_addr = parse_addr_spec(relay_spec); + if (!client_addr) { + puts("Error: Relay spec must be in the form \"host:port\"."); + return; + } num_proxy_pairs++; total_proxy_pairs++;

1 0

r24818: {translation} updated info about bridgedb and wrote about how to validate (translation/trunk/documentation)
by Runa Sandvik 10 Jun '11

10 Jun '11

Author: runa Date: 2011-06-10 09:52:32 +0000 (Fri, 10 Jun 2011) New Revision: 24818 Modified: translation/trunk/documentation/howto.txt Log: updated info about bridgedb and wrote about how to validate translations Modified: translation/trunk/documentation/howto.txt =================================================================== --- translation/trunk/documentation/howto.txt 2011-06-09 18:12:20 UTC (rev 24817) +++ translation/trunk/documentation/howto.txt 2011-06-10 09:52:32 UTC (rev 24818) @@ -148,7 +148,8 @@ By default, this command will check if the modification time of your local files is more recent than that on the Transifex server - and will not overwrite newer files. Use --help for more + and will not overwrite newer files. You can also use '-f -a' to + force the fetching of all translations. Use --help for more information. All projects: @@ -161,15 +162,35 @@ To pull new translations from the server, cd to the 'po' directory and run 'tx pull'. Remember to commit the changes to - SVN. + SVN or Git. - 2. Adding New Translation Resources to Transifex + 2. Validating the input + Transifex does not validate (that is, look for malicious + characters in translated strings) the translations. It is + important that you do this for your project before you include + new/updated translations. + + The script validate.py in translation/trunk/tools compares the + English strings against the translated strings, and emit a + warning whenever a translated string is using more symbols than + the English string. And then it's up to whoever is running this script + to review the warnings and figure out if there is anything to be + concerned about. + + Below is an example on how you can run the script (the line + assumes you are inside the po directory of whatever project you + wish to validate translations for): + + $ for i in */*.po ; do python /path/to/validate.py -i $i -l validate.py ; done + + 3. Adding New Translation Resources to Transifex + To add new translation resources to Transifex, open up 'po/.tx/config' and create entries for the new resources. Use an existing entry as a template. Remember to commit the file. - 3. Pushing Files to the Transifex Server + 4. Pushing Files to the Transifex Server To push new/updated source files or translations to the Transifex server, cd to the 'po' directory and run 'tx push' with either @@ -192,6 +213,13 @@ BridgeDB: + The translation template (and some translations) can be found here: + https://gitweb.torproject.org/bridgedb.git + + NOTE: We do not yet have a Transifex config file for BridgeDB, which + means that we cannot pull new and updated translations from the + server. See #2891 for more information. + 1. Updating the Translations After pulling new translations from Transifex and checking them into

1 0

[tor/master] Move errant doc/nodefamily_routerset into 0.2.3.1-alpha ChangeLog. Fix bug 3373
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit 74239f61d24feb7dc8c77c9f3e2ef1a8c2c46039 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 10 01:04:12 2011 -0400 Move errant doc/nodefamily_routerset into 0.2.3.1-alpha ChangeLog. Fix bug 3373 --- ChangeLog | 3 +++ doc/nodefamily_routerset | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e3b312..226d4eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -326,6 +326,9 @@ Changes in version 0.2.3.1-alpha - 2011-05-05 bidirectional use of connections to disk every 24 hours. - Add a GeoIP file digest to the extra-info descriptor. Implements enhancement 1883. + - The NodeFamily option -- which let you declare that you want to + consider nodes to be part of a family whether they list themselves + that way or not -- now allows IP address ranges and country codes. - Add a new 'Heartbeat' log message type to periodically log a message describing Tor's status at level Notice. This feature is meant for operators who log at notice, and want to make sure that their Tor diff --git a/doc/nodefamily_routerset b/doc/nodefamily_routerset deleted file mode 100644 index 0af62e1..0000000 --- a/doc/nodefamily_routerset +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features - - The NodeFamily option -- which let you declare that you want to - consider nodes to be part of a family whether they list themselves - that way or not -- now allows IP address ranges and country codes.

1 0

[tor/master] Upgrade to the latest version of tinytest
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 676608f9a69d7dd9c70a581109fa4eecc53a5d9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 9 17:30:09 2011 -0400 Upgrade to the latest version of tinytest --- src/test/test.h | 3 ++- src/test/test_addr.c | 4 +++- src/test/test_dir.c | 2 +- src/test/tinytest.c | 17 ++++++++++------- src/test/tinytest_demo.c | 14 +++++++------- src/test/tinytest_macros.h | 39 ++++++++++++++++++++++++++++----------- 6 files changed, 51 insertions(+), 28 deletions(-) diff --git a/src/test/test.h b/src/test/test.h index f7ae46c..a053a7a 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -45,7 +45,8 @@ _print = tor_malloc(printlen); \ base16_encode(_print, printlen, _value, \ (len)); }, \ - { tor_free(_print); } \ + { tor_free(_print); }, \ + TT_EXIT_TEST_FUNCTION \ ); #define test_memeq(expr1, expr2, len) test_mem_op((expr1), ==, (expr2), len) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 6db4ee2..7629d95 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -74,7 +74,9 @@ test_addr_basic(void) cp += 2; \ if (i != 15) *cp++ = ':'; \ } \ - }, { tor_free(_print); } \ + }, \ + { tor_free(_print); }, \ + TT_EXIT_TEST_FUNCTION \ ); \ STMT_END diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 4bbf768..04ca29a 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -298,7 +298,7 @@ test_dir_versions(void) #define tt_versionstatus_op(vs1, op, vs2) \ tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t, \ - (_val1 op _val2),"%d") + (_val1 op _val2),"%d",TT_EXIT_TEST_FUNCTION) #define test_v_i_o(val, ver, lst) \ tt_versionstatus_op(val, ==, tor_version_is_obsolete(ver, lst)) diff --git a/src/test/tinytest.c b/src/test/tinytest.c index 11ffc2f..8caa4f5 100644 --- a/src/test/tinytest.c +++ b/src/test/tinytest.c @@ -28,7 +28,11 @@ #include <string.h> #include <assert.h> -#ifdef WIN32 +#ifdef TINYTEST_LOCAL +#include "tinytest_local.h" +#endif + +#ifdef _WIN32 #include <windows.h> #else #include <sys/types.h> @@ -40,9 +44,6 @@ #define __attribute__(x) #endif -#ifdef TINYTEST_LOCAL -#include "tinytest_local.h" -#endif #include "tinytest.h" #include "tinytest_macros.h" @@ -64,7 +65,7 @@ const char *cur_test_prefix = NULL; /**< prefix of the current test group */ /** Name of the current test, if we haven't logged is yet. Used for --quiet */ const char *cur_test_name = NULL; -#ifdef WIN32 +#ifdef _WIN32 /** Pointer to argv[0] for win32. */ static const char *commandname = NULL; #endif @@ -103,7 +104,7 @@ static enum outcome _testcase_run_forked(const struct testgroup_t *group, const struct testcase_t *testcase) { -#ifdef WIN32 +#ifdef _WIN32 /* Fork? On Win32? How primitive! We'll do what the smart kids do: we'll invoke our own exe (whose name we recall from the command line) with a command line that tells it to run just the test we @@ -174,6 +175,7 @@ _testcase_run_forked(const struct testgroup_t *group, exit(1); } exit(0); + return FAIL; /* unreachable */ } else { /* parent */ int status, r; @@ -239,6 +241,7 @@ testcase_run_one(const struct testgroup_t *group, if (opt_forked) { exit(outcome==OK ? 0 : (outcome==SKIP?MAGIC_EXITCODE : 1)); + return 1; /* unreachable */ } else { return (int)outcome; } @@ -287,7 +290,7 @@ tinytest_main(int c, const char **v, struct testgroup_t *groups) { int i, j, n=0; -#ifdef WIN32 +#ifdef _WIN32 commandname = v[0]; #endif for (i=1; i<c; ++i) { diff --git a/src/test/tinytest_demo.c b/src/test/tinytest_demo.c index bd33cc3..8838459 100644 --- a/src/test/tinytest_demo.c +++ b/src/test/tinytest_demo.c @@ -1,4 +1,4 @@ -/* tinytest_demo.c -- Copyright 2009 Nick Mathewson +/* tinytest_demo.c -- Copyright 2009-2010 Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -53,7 +53,7 @@ test_strcmp(void *data) } /* Pretty often, calling tt_abort_msg to indicate failure is more - heavy-weight than you want. Instead, just say: */ + heavy-weight than you want. Instead, just say: */ tt_assert(strcmp("testcase", "testcase") == 0); /* Occasionally, you don't want to stop the current testcase just @@ -91,7 +91,7 @@ test_strcmp(void *data) /* First you declare a type to hold the environment info, and functions to set it up and tear it down. */ struct data_buffer { - /* We're just going to have couple of character buffer. Using + /* We're just going to have couple of character buffer. Using setup/teardown functions is probably overkill for this case. You could also do file descriptors, complicated handles, temporary @@ -164,7 +164,7 @@ test_memcpy(void *ptr) /* ============================================================ */ -/* Now we need to make sure that our tests get invoked. First, you take +/* Now we need to make sure that our tests get invoked. First, you take a bunch of related tests and put them into an array of struct testcase_t. */ @@ -189,15 +189,15 @@ struct testgroup_t groups[] = { /* Every group has a 'prefix', and an array of tests. That's it. */ { "demo/", demo_tests }, - END_OF_GROUPS + END_OF_GROUPS }; int main(int c, const char **v) { - /* Finally, just call tinytest_main(). It lets you specify verbose - or quiet output with --verbose and --quiet. You can list + /* Finally, just call tinytest_main(). It lets you specify verbose + or quiet output with --verbose and --quiet. You can list specific tests: tinytest-demo demo/memcpy diff --git a/src/test/tinytest_macros.h b/src/test/tinytest_macros.h index a7fa64a..032393c 100644 --- a/src/test/tinytest_macros.h +++ b/src/test/tinytest_macros.h @@ -90,10 +90,10 @@ TT_STMT_BEGIN \ if (!(b)) { \ _tinytest_set_test_failed(); \ - TT_GRIPE((msg)); \ + TT_GRIPE(("%s",msg)); \ fail; \ } else { \ - TT_BLATHER((msg)); \ + TT_BLATHER(("%s",msg)); \ } \ TT_STMT_END @@ -111,7 +111,7 @@ #define tt_assert(b) tt_assert_msg((b), "assert("#b")") #define tt_assert_test_fmt_type(a,b,str_test,type,test,printf_type,printf_fmt, \ - setup_block,cleanup_block) \ + setup_block,cleanup_block,die_on_fail) \ TT_STMT_BEGIN \ type _val1 = (type)(a); \ type _val2 = (type)(b); \ @@ -135,33 +135,50 @@ cleanup_block; \ if (!_tt_status) { \ _tinytest_set_test_failed(); \ - TT_EXIT_TEST_FUNCTION; \ + die_on_fail ; \ } \ } \ TT_STMT_END -#define tt_assert_test_type(a,b,str_test,type,test,fmt) \ +#define tt_assert_test_type(a,b,str_test,type,test,fmt,die_on_fail) \ tt_assert_test_fmt_type(a,b,str_test,type,test,type,fmt, \ - {_print=_value;},{}) + {_print=_value;},{},die_on_fail) /* Helper: assert that a op b, when cast to type. Format the values with * printf format fmt on failure. */ #define tt_assert_op_type(a,op,b,type,fmt) \ - tt_assert_test_type(a,b,#a" "#op" "#b,type,(_val1 op _val2),fmt) + tt_assert_test_type(a,b,#a" "#op" "#b,type,(_val1 op _val2),fmt, \ + TT_EXIT_TEST_FUNCTION) #define tt_int_op(a,op,b) \ - tt_assert_test_type(a,b,#a" "#op" "#b,long,(_val1 op _val2),"%ld") + tt_assert_test_type(a,b,#a" "#op" "#b,long,(_val1 op _val2), \ + "%ld",TT_EXIT_TEST_FUNCTION) #define tt_uint_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,unsigned long, \ - (_val1 op _val2),"%lu") + (_val1 op _val2),"%lu",TT_EXIT_TEST_FUNCTION) #define tt_ptr_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,void*, \ - (_val1 op _val2),"%p") + (_val1 op _val2),"%p",TT_EXIT_TEST_FUNCTION) #define tt_str_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,const char *, \ - (strcmp(_val1,_val2) op 0),"<%s>") + (strcmp(_val1,_val2) op 0),"<%s>",TT_EXIT_TEST_FUNCTION) + +#define tt_want_int_op(a,op,b) \ + tt_assert_test_type(a,b,#a" "#op" "#b,long,(_val1 op _val2),"%ld",(void)0) + +#define tt_want_uint_op(a,op,b) \ + tt_assert_test_type(a,b,#a" "#op" "#b,unsigned long, \ + (_val1 op _val2),"%lu",(void)0) + +#define tt_want_ptr_op(a,op,b) \ + tt_assert_test_type(a,b,#a" "#op" "#b,void*, \ + (_val1 op _val2),"%p",(void)0) + +#define tt_want_str_op(a,op,b) \ + tt_assert_test_type(a,b,#a" "#op" "#b,const char *, \ + (strcmp(_val1,_val2) op 0),"<%s>",(void)0) #endif

1 0

[obfsproxy/master] Documentation updates.
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 835464e0d6bd025faa74ff429610e970bec25933 Author: George Kadianakis <desnacked(a)gmail.com> Date: Thu Jun 9 17:27:56 2011 +0200 Documentation updates. * Tweaked tor-obfs-howto.txt for the new cli. * Fixed a comment in main.c --- doc/tor-obfs-howto.txt | 6 +++--- src/main.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/tor-obfs-howto.txt b/doc/tor-obfs-howto.txt index 36ad7a3..ed8ba72 100644 --- a/doc/tor-obfs-howto.txt +++ b/doc/tor-obfs-howto.txt @@ -50,11 +50,11 @@ Our port setup will be like this: This command will setup an obfsproxy socks client listening to the obfs2 protocol on localhost:1050: -./obfsproxy socks obfs2 127.0.0.1:1050 +./obfsproxy obfs2 socks 127.0.0.1:1050 This command will setup an obfsproxy server listening to the -obfs2 protocol on localhost:5001: -./obfsproxy server obfs2 127.0.0.1:1051 127.0.0.1:5001 +obfs2 protocol on localhost:1051: +./obfsproxy obfs2 --dest 127.0.0.1:5001 server 127.0.0.1:1051 Setting up Tor: diff --git a/src/main.c b/src/main.c index e7680d5..8617bb3 100644 --- a/src/main.c +++ b/src/main.c @@ -112,8 +112,8 @@ main(int argc, const char **argv) /* This is an integer! It contains the number of protocols that we managed to recognize, by their protocol name. Of course it's not the *actual* actual_protocols since some of them could have wrong - options or arguments, but this will be resolved by - set_up_protocol() and listener_new(). */ + options or arguments, but this will be resolved per-protocol by + set_up_protocol(). */ int actual_protocols=0; int start;

1 0

[obfsproxy/master] Detached option parsing from {dummy, obfs2}_init().
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit fb76953a54809479a9527213623526d1fdf0b763 Author: George Kadianakis <desnacked(a)gmail.com> Date: Thu Jun 9 19:13:33 2011 +0200 Detached option parsing from {dummy,obfs2}_init(). It's cleaner and it's easier to test. --- src/protocols/dummy.c | 47 +++++++++++++++++++++++++++------------------ src/protocols/obfs2.c | 50 +++++++++++++++++++++++++++++------------------- 2 files changed, 58 insertions(+), 39 deletions(-) diff --git a/src/protocols/dummy.c b/src/protocols/dummy.c index 5f6b8eb..71b3313 100644 --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@ -19,9 +19,10 @@ static int dummy_send(void *nothing, static enum recv_ret dummy_recv(void *nothing, struct evbuffer *source, struct evbuffer *dest); static void usage(void); +static int parse_and_set_options(int n_options, char **options, + struct protocol_params_t *params); static protocol_vtable *vtable=NULL; - /** This function sets up the protocol and populates 'listner' according to 'options'. @@ -33,12 +34,35 @@ int dummy_init(int n_options, char **options, struct protocol_params_t *params) { + if (parse_and_set_options(n_options,options,params) < 0) { + usage(); + return -1; + } + + /* XXX memleak. */ + vtable = calloc(1, sizeof(protocol_vtable)); + if (!vtable) + return -1; + + vtable->destroy = NULL; + vtable->create = dummy_new; + vtable->handshake = NULL; + vtable->send = dummy_send; + vtable->recv = dummy_recv; + + return 1; +} + +static int +parse_and_set_options(int n_options, char **options, + struct protocol_params_t *params) +{ struct sockaddr_storage ss_listen; int sl_listen; const char* defport; if (n_options != 3) - goto err; + return -1; assert(!strcmp(options[0],"dummy")); params->proto = DUMMY_PROTOCOL; @@ -53,12 +77,12 @@ dummy_init(int n_options, char **options, defport = "11253"; /* 2bf5 */ params->mode = LSN_SIMPLE_SERVER; } else - goto err; + return -1; if (resolve_address_port(options[2], 1, 1, &ss_listen, &sl_listen, defport) < 0) { printf("addr\n"); - goto err; + return -1; } assert(sl_listen <= sizeof(struct sockaddr_storage)); struct sockaddr *sa_listen=NULL; @@ -66,22 +90,7 @@ dummy_init(int n_options, char **options, memcpy(&params->on_address, sa_listen, sl_listen); params->on_address_len = sl_listen; - /* XXX memleak. */ - vtable = calloc(1, sizeof(protocol_vtable)); - if (!vtable) - return -1; - - vtable->destroy = NULL; - vtable->create = dummy_new; - vtable->handshake = NULL; - vtable->send = dummy_send; - vtable->recv = dummy_recv; - return 1; - - err: - usage(); - return -1; } static void diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index d886594..2cb1089 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -34,6 +34,8 @@ static int obfs2_state_set_shared_secret(void *s, size_t secretlen); static int set_up_vtable(void); static void usage(void); +static int parse_and_set_options(int n_options, char **options, + struct protocol_params_t *params); static protocol_vtable *vtable=NULL; @@ -49,6 +51,26 @@ int obfs2_init(int n_options, char **options, struct protocol_params_t *params) { + if (parse_and_set_options(n_options,options,params) < 0) { + usage(); + return -1; + } + + if (set_up_vtable() < 0) + return -1; + + if (initialize_crypto() < 0) { + fprintf(stderr, "Can't initialize crypto; failing\n"); + return -1; + } + + return 1; +} + +static int +parse_and_set_options(int n_options, char **options, + struct protocol_params_t *params) +{ struct sockaddr_storage ss_listen; int sl_listen; int got_dest=0; @@ -57,7 +79,7 @@ obfs2_init(int n_options, char **options, if ((n_options < 3) || (n_options > 5)) { printf("wrong options number: %d\n", n_options); - goto err; + return -1; } assert(!strcmp(*options,"obfs2")); @@ -68,13 +90,13 @@ obfs2_init(int n_options, char **options, while (!strncmp(*options,"--",2)) { if (!strncmp(*options,"--dest=",7)) { if (got_dest) - goto err; + return -1; struct sockaddr_storage ss_target; struct sockaddr *sa_target=NULL; int sl_target=0; if (resolve_address_port(*options+7, 1, 0, &ss_target, &sl_target, NULL) < 0) - goto err; + return -1; assert(sl_target <= sizeof(struct sockaddr_storage)); sa_target = (struct sockaddr *)&ss_target; memcpy(&params->target_address, sa_target, sl_target); @@ -82,14 +104,14 @@ obfs2_init(int n_options, char **options, got_dest=1; } else if (!strncmp(*options,"--shared-secret=",16)) { if (got_ss) - goto err; + return -1; /* this is freed in protocol_params_free() */ params->shared_secret = strdup(*options+16); params->shared_secret_len = strlen(*options+16); got_ss=1; } else { printf("Unknown argument.\n"); - goto err; + return -1; } options++; } @@ -105,7 +127,7 @@ obfs2_init(int n_options, char **options, params->mode = LSN_SIMPLE_SERVER; } else { printf("only client/socks/server modes supported.\n"); - goto err; + return -1; } options++; @@ -113,7 +135,7 @@ obfs2_init(int n_options, char **options, if (resolve_address_port(*options, 1, 1, &ss_listen, &sl_listen, defport) < 0) - goto err; + return -1; assert(sl_listen <= sizeof(struct sockaddr_storage)); struct sockaddr *sa_listen=NULL; sa_listen = (struct sockaddr *)&ss_listen; @@ -123,27 +145,15 @@ obfs2_init(int n_options, char **options, /* Validate option selection. */ if (got_dest && (params->mode == LSN_SOCKS_CLIENT)) { printf("You can't be on socks mode and have --dest.\n"); - goto err; + return -1; } if (!got_dest && (params->mode != LSN_SOCKS_CLIENT)) { printf("client/server mode needs --dest.\n"); - goto err; - } - - if (set_up_vtable() < 0) - return -1; - - if (initialize_crypto() < 0) { - fprintf(stderr, "Can't initialize crypto; failing\n"); return -1; } return 1; - - err: - usage(); - return -1; } /**

1 0

[obfsproxy/master] Added unit tests for parse_and_set_options() of obfs2.
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit b03e4e200a2f990829152bfce5684f3c5d84b935 Author: George Kadianakis <desnacked(a)gmail.com> Date: Thu Jun 9 19:36:30 2011 +0200 Added unit tests for parse_and_set_options() of obfs2. --- src/protocols/obfs2.c | 7 +-- src/protocols/obfs2.h | 3 + src/test/unittest_obfs2.c | 109 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 109 insertions(+), 10 deletions(-) diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index 2cb1089..edfc365 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -34,9 +34,6 @@ static int obfs2_state_set_shared_secret(void *s, size_t secretlen); static int set_up_vtable(void); static void usage(void); -static int parse_and_set_options(int n_options, char **options, - struct protocol_params_t *params); - static protocol_vtable *vtable=NULL; @@ -67,7 +64,7 @@ obfs2_init(int n_options, char **options, return 1; } -static int +int parse_and_set_options(int n_options, char **options, struct protocol_params_t *params) { @@ -94,7 +91,7 @@ parse_and_set_options(int n_options, char **options, struct sockaddr_storage ss_target; struct sockaddr *sa_target=NULL; int sl_target=0; - if (resolve_address_port(*options+7, 1, 0, + if (resolve_address_port(*options+7, 1, 0, &ss_target, &sl_target, NULL) < 0) return -1; assert(sl_target <= sizeof(struct sockaddr_storage)); diff --git a/src/protocols/obfs2.h b/src/protocols/obfs2.h index 7747330..d206bc8 100644 --- a/src/protocols/obfs2.h +++ b/src/protocols/obfs2.h @@ -21,6 +21,9 @@ struct listener_t; int obfs2_init(int n_options, char **options, struct protocol_params_t *params); void *obfs2_new(struct protocol_t *proto_struct, struct protocol_params_t *params); +int parse_and_set_options(int n_options, char **options, + struct protocol_params_t *params); + #ifdef CRYPT_PROTOCOL_PRIVATE diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index 45d1278..1348c7d 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -23,6 +23,84 @@ #include "../protocols/obfs2.h" #include "../network.h" +static void +test_proto_option_parsing(void *data) +{ + protocol_params_t *proto_params = calloc(1, sizeof(protocol_params_t)); + char *options[] = {"obfs2", "--shared-secret=a", "socks", "127.0.0.1:0"}; + int n_options = 4; + + tt_assert(set_up_protocol(n_options, options, + proto_params) == 1); + + /** two --dest. */ + char *options2[] = {"obfs2", "--dest=127.0.0.1:5555", "--dest=a", + "server", "127.0.0.1:5552"}; + n_options = 5; + + tt_assert(set_up_protocol(n_options, options2, + proto_params) == -1); + + /** unknown arg */ + char *options3[] = {"obfs2", "--gabura=a", + "server", "127.0.0.1:5552"}; + n_options = 4; + + tt_assert(set_up_protocol(n_options, options3, + proto_params) == -1); + + /** too many args */ + char *options4[] = {"obfs2", "1", "2", "3", "4", "5" }; + n_options = 6; + + tt_assert(set_up_protocol(n_options, options4, + proto_params) == -1); + + /** wrong mode */ + char *options5[] = {"obfs2", "--dest=1:1", + "gladiator", "127.0.0.1:5552"}; + n_options = 4; + + tt_assert(set_up_protocol(n_options, options5, + proto_params) == -1); + + /** stupid listen addr. */ + char *options6[] = {"obfs2", "--dest=1:1", + "server", "127.0.0.1:a"}; + n_options = 4; + + tt_assert(set_up_protocol(n_options, options6, + proto_params) == -1); + + /** stupid dest addr. */ + char *options7[] = {"obfs2", "--dest=1:b", + "server", "127.0.0.1:1"}; + n_options = 4; + + tt_assert(set_up_protocol(n_options, options7, + proto_params) == -1); + + /** socks with dest. */ + char *options8[] = {"obfs2", "--dest=1:2", + "socks", "127.0.0.1:1"}; + n_options = 4; + + tt_assert(set_up_protocol(n_options, options8, + proto_params) == -1); + + /** socks with dest. */ + char *options9[] = {"obfs2", "--shared-secret=a", + "server", "127.0.0.1:1"}; + n_options = 4; + + tt_assert(set_up_protocol(n_options, options9, + proto_params) == -1); + + end: + if (proto_params) + free(proto_params); +} + /* Make sure we can successfully set up a protocol state */ static void test_proto_setup(void *data) @@ -57,7 +135,6 @@ test_proto_setup(void *data) proto_destroy(client_proto); if (server_proto->state) proto_destroy(server_proto); - } static void @@ -126,6 +203,11 @@ test_proto_handshake(void *data) if (server_proto->state) proto_destroy(server_proto); + if (proto_params_client) + free(proto_params_client); + if (proto_params_serv) + free(proto_params_serv); + if (output_buffer) evbuffer_free(output_buffer); if (dummy_buffer) @@ -215,6 +297,11 @@ test_proto_transfer(void *data) if (server_proto->state) proto_destroy(server_proto); + if (proto_params_client) + free(proto_params_client); + if (proto_params_serv) + free(proto_params_serv); + if (output_buffer) evbuffer_free(output_buffer); if (dummy_buffer) @@ -378,6 +465,11 @@ test_proto_splitted_handshake(void *data) if (server_state) proto_destroy(server_proto); + if (proto_params_client) + free(proto_params_client); + if (proto_params_serv) + free(proto_params_serv); + if (output_buffer) evbuffer_free(output_buffer); if (dummy_buffer) @@ -459,6 +551,11 @@ test_proto_wrong_handshake_magic(void *data) if (server_state) proto_destroy(server_proto); + if (proto_params_client) + free(proto_params_client); + if (proto_params_serv) + free(proto_params_serv); + if (output_buffer) evbuffer_free(output_buffer); if (dummy_buffer) @@ -539,25 +636,27 @@ test_proto_wrong_handshake_plength(void *data) if (server_state) proto_destroy(server_proto); + if (proto_params_client) + free(proto_params_client); + if (proto_params_serv) + free(proto_params_serv); + if (output_buffer) evbuffer_free(output_buffer); if (dummy_buffer) evbuffer_free(dummy_buffer); } - #define T(name, flags) \ { #name, test_proto_##name, (flags), NULL, NULL } struct testcase_t protocol_tests[] = { + T(option_parsing,0), T(setup, 0), T(handshake, 0), T(transfer, 0), T(splitted_handshake, 0), T(wrong_handshake_magic, 0), -#if 0 - T(wrong_handshake_padding, 0), -#endif T(wrong_handshake_plength, 0), END_OF_TESTCASES };

1 0

[obfsproxy/master] Implements the protocol side of the new CLI.
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 67a106ad3bbafe83f1917d8060a1c78bf6d43ff6 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun May 29 04:04:32 2011 +0200 Implements the protocol side of the new CLI. --- src/network.c | 60 ++++++---------------- src/network.h | 14 +++-- src/protocol.c | 29 ++++++----- src/protocol.h | 37 ++++++++------ src/protocols/dummy.c | 70 ++++++++++++++++++++++++- src/protocols/dummy.h | 5 +- src/protocols/obfs2.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++--- src/protocols/obfs2.h | 5 +- src/socks.h | 1 - 9 files changed, 262 insertions(+), 94 deletions(-) diff --git a/src/network.c b/src/network.c index cfdd398..1c4b853 100644 --- a/src/network.c +++ b/src/network.c @@ -16,20 +16,11 @@ #include <stdlib.h> #include <string.h> -#include <event2/buffer.h> -#include <event2/bufferevent.h> -#include <event2/listener.h> -#include <event2/event.h> - #include <errno.h> #include <event2/util.h> struct listener_t { struct evconnlistener *listener; - struct sockaddr_storage target_address; - int target_address_len; - int mode; - int proto; /* Protocol that this listener can speak. */ protocol_params_t *proto_params; }; @@ -49,46 +40,29 @@ static void output_event_cb(struct bufferevent *bev, short what, void *arg); listener_t * listener_new(struct event_base *base, - int mode, int protocol, - const struct sockaddr *on_address, int on_address_len, - const struct sockaddr *target_address, int target_address_len, - const char *shared_secret, size_t shared_secret_len) + int n_options, char **options) { const unsigned flags = LEV_OPT_CLOSE_ON_FREE|LEV_OPT_CLOSE_ON_EXEC|LEV_OPT_REUSEABLE; - listener_t *lsn = calloc(1, sizeof(listener_t)); - assert(mode == LSN_SIMPLE_CLIENT || mode == LSN_SIMPLE_SERVER || - mode == LSN_SOCKS_CLIENT); - - if (set_up_protocol(protocol)<0) { - printf("This is just terrible. We can't even set up a protocol! Exiting.\n"); - exit(1); - } - - lsn->proto = protocol; - lsn->mode = mode; + listener_t *lsn = calloc(1, sizeof(listener_t)); + if (!lsn) + return NULL; protocol_params_t *proto_params = calloc(1, sizeof(protocol_params_t)); - proto_params->is_initiator = mode != LSN_SIMPLE_SERVER; - proto_params->shared_secret = shared_secret; - proto_params->shared_secret_len = shared_secret_len; - lsn->proto_params = proto_params; - - if (target_address) { - assert(target_address_len <= sizeof(struct sockaddr_storage)); - memcpy(&lsn->target_address, target_address, target_address_len); - lsn->target_address_len = target_address_len; - } else { - assert(lsn->mode == LSN_SOCKS_CLIENT); + + if (set_up_protocol(n_options,options,lsn->proto_params)<0) { + listener_free(lsn); + return NULL; } lsn->listener = evconnlistener_new_bind(base, simple_listener_cb, lsn, flags, -1, - on_address, - on_address_len); + &lsn->proto_params->on_address, + lsn->proto_params->on_address_len); + if (!lsn->listener) { listener_free(lsn); return NULL; @@ -101,8 +75,9 @@ static void protocol_params_free(protocol_params_t *params) { assert(params); + if (params->shared_secret) - free(&params->shared_secret); + free(params->shared_secret); free(params); } @@ -129,10 +104,9 @@ simple_listener_cb(struct evconnlistener *evcl, dbg(("Got a connection\n")); - conn->mode = lsn->mode; + conn->mode = lsn->proto_params->mode; - conn->proto = proto_new(lsn->proto, - lsn->proto_params); + conn->proto = proto_new(lsn->proto_params); if (!conn->proto) { printf("Creation of protocol object failed! Closing connection.\n"); goto err; @@ -194,8 +168,8 @@ simple_listener_cb(struct evconnlistener *evcl, if (conn->mode == LSN_SIMPLE_SERVER || conn->mode == LSN_SIMPLE_CLIENT) { /* Launch the connect attempt. */ if (bufferevent_socket_connect(conn->output, - (struct sockaddr *) &lsn->target_address, - lsn->target_address_len)<0) + (struct sockaddr*)&lsn->proto_params->target_address, + lsn->proto_params->target_address_len)<0) goto err; bufferevent_enable(conn->output, EV_READ|EV_WRITE); diff --git a/src/network.h b/src/network.h index 619e45f..5537680 100644 --- a/src/network.h +++ b/src/network.h @@ -10,6 +10,12 @@ #include <stdlib.h> +#include <event2/buffer.h> +#include <event2/bufferevent.h> +#include <event2/listener.h> +#include <event2/event.h> + + typedef struct listener_t *listener; struct sockaddr; @@ -23,12 +29,8 @@ struct socks_state_t; typedef struct listener_t listener_t; struct addrinfo; -listener_t *listener_new( - struct event_base *base, - int mode, int protocol, - const struct sockaddr *on_address, int on_address_len, - const struct sockaddr *target_address, int target_address_len, - const char *shared_secret, size_t shared_secret_len); +listener_t *listener_new(struct event_base *base, + int n_options, char **options); void listener_free(listener_t *listener); #ifdef NETWORK_PRIVATE diff --git a/src/protocol.c b/src/protocol.c index 8fff6a3..ce96f86 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -1,6 +1,7 @@ #include <stdlib.h> #include <stdio.h> #include <assert.h> +#include <string.h> #include "protocol.h" #include "network.h" @@ -13,15 +14,18 @@ It's called once in the runtime of the program for each proto. */ int -set_up_protocol(int protocol) { - if (protocol == OBFS2_PROTOCOL) - obfs2_init(); - else if (protocol == DUMMY_PROTOCOL) - dummy_init(); +set_up_protocol(int n_options, char **options, + struct protocol_params_t *params) +{ + char **name = options; + while (!strncmp(*name,"--",2)) + name++; + if (!strcmp(*name,"dummy")) + return dummy_init(n_options, options, params); + else if (!strcmp(*name,"obfs2")) + return obfs2_init(n_options, options, params); else return -1; - - return 1; } /** @@ -31,7 +35,7 @@ set_up_protocol(int protocol) { Return the protocol_t if successful, NULL otherwise. */ struct protocol_t * -proto_new(int protocol, protocol_params_t *params) { +proto_new(protocol_params_t *params) { struct protocol_t *proto = calloc(1, sizeof(struct protocol_t)); if (!proto) return NULL; @@ -40,11 +44,9 @@ proto_new(int protocol, protocol_params_t *params) { if (!proto->vtable) return NULL; - if (protocol == OBFS2_PROTOCOL) { - proto->proto = protocol; + if (params->proto == OBFS2_PROTOCOL) { proto->state = obfs2_new(proto, params); - } else if (protocol == DUMMY_PROTOCOL) { - proto->proto = protocol; + } else if (params->proto == DUMMY_PROTOCOL) { proto->state = dummy_new(proto, NULL); } @@ -81,7 +83,8 @@ proto_recv(struct protocol_t *proto, void *source, void *dest) { return -1; } -void proto_destroy(struct protocol_t *proto) { +void +proto_destroy(struct protocol_t *proto) { assert(proto); assert(proto->state); diff --git a/src/protocol.h b/src/protocol.h index e4c3e0f..646bf7c 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,3 +1,5 @@ +#include <event2/buffer.h> + #ifndef PROTOCOL_H #define PROTOCOL_H @@ -5,6 +7,7 @@ #define OBFS2_PROTOCOL 1 struct evbuffer; +struct listener_t; /** This struct defines parameters of the protocol per-listener basis. @@ -15,15 +18,17 @@ struct evbuffer; */ typedef struct protocol_params_t { int is_initiator; - - const char *shared_secret; + struct sockaddr_storage target_address; + int target_address_len; + struct sockaddr on_address; + int on_address_len; + int mode; + int proto; /* Protocol that this listener can speak. */ + char *shared_secret; size_t shared_secret_len; } protocol_params_t; struct protocol_t { - /* protocol */ - int proto; - /* protocol vtable */ struct protocol_vtable *vtable; @@ -39,17 +44,25 @@ struct protocol_t { */ void *state; }; +int set_up_protocol(int n_options, char **options, + struct protocol_params_t *params); +struct protocol_t *proto_new(struct protocol_params_t *params); +void proto_destroy(struct protocol_t *proto); +int proto_handshake(struct protocol_t *proto, void *buf); +int proto_send(struct protocol_t *proto, void *source, void *dest); +int proto_recv(struct protocol_t *proto, void *source, void *dest); typedef struct protocol_vtable { /* Initialization function: Fills in the protocol vtable. */ - int (*init)(struct protocol_t *self); + int (*init)(int n_options, char **options, + struct protocol_params_t *params); /* Destructor: Destroys the protocol state. */ void (*destroy)(void *state); /* Constructor: Creates a protocol object. */ - void *(*create)(struct protocol_t *proto_struct, - protocol_params_t *parameters); + void *(*create)(struct protocol_t *proto_params, + struct protocol_params_t *parameters); /* does handshake. Not all protocols have a handshake. */ int (*handshake)(void *state, @@ -67,12 +80,4 @@ typedef struct protocol_vtable { } protocol_vtable; -int set_up_protocol(int protocol); -struct protocol_t *proto_new(int protocol, - protocol_params_t *params); -void proto_destroy(struct protocol_t *proto); -int proto_handshake(struct protocol_t *proto, void *buf); -int proto_send(struct protocol_t *proto, void *source, void *dest); -int proto_recv(struct protocol_t *proto, void *source, void *dest); - #endif diff --git a/src/protocols/dummy.c b/src/protocols/dummy.c index 482c927..2a24b56 100644 --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@ -9,6 +9,7 @@ #include <event2/buffer.h> #include "dummy.h" +#include "../network.h" #include "../util.h" #include "../protocol.h" @@ -17,11 +18,55 @@ static int dummy_send(void *nothing, struct evbuffer *source, struct evbuffer *dest); static int dummy_recv(void *nothing, struct evbuffer *source, struct evbuffer *dest); +static void usage(void); static protocol_vtable *vtable=NULL; +/** + This function sets up the protocol and populates 'listner' + according to 'options'. + + 'options' is an array like this: + {"dummy","socks","127.0.0.1:6666"} +*/ int -dummy_init(void) { +dummy_init(int n_options, char **options, + struct protocol_params_t *params) +{ + struct sockaddr_storage ss_listen; + int sl_listen; + const char* defport; + + if (n_options != 3) + goto err; + + assert(!strcmp(options[0],"dummy")); + params->proto = DUMMY_PROTOCOL; + + if (!strcmp(options[1], "client")) { + defport = "48988"; /* bf5c */ + params->mode = LSN_SIMPLE_CLIENT; + } else if (!strcmp(options[1], "socks")) { + defport = "23548"; /* 5bf5 */ + params->mode = LSN_SOCKS_CLIENT; + } else if (!strcmp(options[1], "server")) { + defport = "11253"; /* 2bf5 */ + params->mode = LSN_SIMPLE_SERVER; + } else + goto err; + + if (resolve_address_port(options[2], 1, 1, + &ss_listen, &sl_listen, defport) < 0) { + printf("addr\n"); + goto err; + } + assert(sl_listen <= sizeof(struct sockaddr_storage)); + struct sockaddr *sa_listen=NULL; + sa_listen = (struct sockaddr *)&ss_listen; + memcpy(&params->on_address, sa_listen, sl_listen); + params->on_address_len = sl_listen; + + /* XXX memleak. */ vtable = calloc(1, sizeof(protocol_vtable)); if (!vtable) return -1; @@ -33,11 +78,30 @@ dummy_init(void) { vtable->recv = dummy_recv; return 1; + + err: + usage(); + return -1; } +static void +usage(void) +{ + printf("Great... You can't even form a dummy protocol line:\n" + "dummy syntax:\n" + "\tdummy dummy_opts\n" + "\t'dummy_opts':\n" + "\t\tmode ~ server|client|socks\n" + "\t\tlisten address ~ host:port\n" + "Example:\n" + "\tobfsproxy dummy socks 127.0.0.1:5000\n"); +} + + + void * -dummy_new(struct protocol_t *proto_struct, - protocol_params_t *params) +dummy_new(struct protocol_t *proto_struct, + struct protocol_params_t *params) { proto_struct->vtable = vtable; diff --git a/src/protocols/dummy.h b/src/protocols/dummy.h index 1ee0e02..a00248f 100644 --- a/src/protocols/dummy.h +++ b/src/protocols/dummy.h @@ -5,7 +5,8 @@ struct protocol_t; struct evbuffer; struct protocol_params_t; -int dummy_init(void); -void *dummy_new(struct protocol_t *proto_struct, struct protocol_params_t *params); +int dummy_init(int n_options, char **options, struct protocol_params_t *lsn); +void *dummy_new(struct protocol_t *proto_struct, + struct protocol_params_t *params); #endif diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index a8f9155..41a97aa 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -17,6 +17,7 @@ #include "obfs2_crypt.h" #include "obfs2.h" +#include "../network.h" #include "../util.h" #include "../protocol.h" @@ -30,6 +31,9 @@ static void *obfs2_state_new(protocol_params_t *params); static int obfs2_state_set_shared_secret(void *s, const char *secret, size_t secretlen); +static int set_up_vtable(void); +static void usage(void); + static protocol_vtable *vtable=NULL; @@ -38,22 +42,136 @@ static protocol_vtable *vtable=NULL; Returns 0 on success, -1 on fail. */ int -obfs2_init(void) { +obfs2_init(int n_options, char **options, + struct protocol_params_t *params) +{ + struct sockaddr_storage ss_listen; + int sl_listen; + int got_dest=0; + int got_ss=0; + const char* defport; + + if ((n_options < 3) || (n_options > 5)) { + printf("wrong options number: %d\n", n_options); + goto err; + } + + assert(!strcmp(*options,"obfs2")); + params->proto = OBFS2_PROTOCOL; + options++; + + /* Now parse the optional arguments */ + while (!strncmp(*options,"--",2)) { + if (!strncmp(*options,"--dest=",7)) { + if (got_dest) + goto err; + struct sockaddr_storage ss_target; + struct sockaddr *sa_target=NULL; + int sl_target=0; + if (resolve_address_port(*options+7, 1, 0, + &ss_target, &sl_target, NULL) < 0) + goto err; + assert(sl_target <= sizeof(struct sockaddr_storage)); + sa_target = (struct sockaddr *)&ss_target; + memcpy(&params->target_address, sa_target, sl_target); + params->target_address_len = sl_target; + got_dest=1; + } else if (!strncmp(*options,"--shared-secret=",16)) { + if (got_ss) + goto err; + /* this is freed in protocol_params_free() */ + params->shared_secret = strdup(*options+16); + params->shared_secret_len = strlen(*options+16); + got_ss=1; + } else { + printf("Unknown argument.\n"); + goto err; + } + options++; + } + + if (!strcmp(*options, "client")) { + defport = "48988"; /* bf5c */ + params->mode = LSN_SIMPLE_CLIENT; + } else if (!strcmp(*options, "socks")) { + defport = "23548"; /* 5bf5 */ + params->mode = LSN_SOCKS_CLIENT; + } else if (!strcmp(*options, "server")) { + defport = "11253"; /* 2bf5 */ + params->mode = LSN_SIMPLE_SERVER; + } else { + printf("only client/socks/server modes supported.\n"); + goto err; + } + options++; + + params->is_initiator = (params->mode != LSN_SIMPLE_SERVER); + + if (resolve_address_port(*options, 1, 1, + &ss_listen, &sl_listen, defport) < 0) + goto err; + assert(sl_listen <= sizeof(struct sockaddr_storage)); + struct sockaddr *sa_listen=NULL; + sa_listen = (struct sockaddr *)&ss_listen; + memcpy(&params->on_address, sa_listen, sl_listen); + params->on_address_len = sl_listen; + + /* Validate option selection. */ + if (got_dest && (params->mode == LSN_SOCKS_CLIENT)) { + printf("You can't be on socks mode and have --dest.\n"); + goto err; + } + + if (!got_dest && (params->mode != LSN_SOCKS_CLIENT)) { + printf("client/server mode needs --dest.\n"); + goto err; + } + + if (!set_up_vtable()) + return -1; + + if (initialize_crypto() < 0) { + fprintf(stderr, "Can't initialize crypto; failing\n"); + return -1; + } + + return 1; + err: + usage(); + return -1; +} + +static void +usage(void) +{ + printf("You failed at creating an understandable command.\n" + "obfs2 syntax:\n" + "\tobfs2 [obfs2_args] obfs2_opts\n" + "\t'obfs2_opts':\n" + "\t\tmode ~ server|client|socks\n" + "\t\tlisten address ~ host:port\n" + "\t'obfs2_args':\n" + "\t\tDestination Address ~ --dest=host:port\n" + "\t\tShared Secret ~ --shared-secret=<secret>\n" + "\tExample:\n" + "\tobfsproxy --dest=127.0.0.1:666 --shared-secret=himitsu " + "\tobfs2 server 127.0.0.1:1026\n"); +} + +static int +set_up_vtable(void) +{ + /* XXX memleak. */ vtable = calloc(1, sizeof(protocol_vtable)); if (!vtable) - return -1; + return 0; vtable->destroy = obfs2_state_free; vtable->create = obfs2_new; vtable->handshake = obfs2_send_initial_message; vtable->send = obfs2_send; vtable->recv = obfs2_recv; - - if (initialize_crypto() < 0) { - fprintf(stderr, "Can't initialize crypto; failing\n"); - return -1; - } - + return 1; } @@ -205,6 +323,7 @@ obfs2_state_set_shared_secret(void *s, const char *secret, uchar buf[SHARED_SECRET_LENGTH]; obfs2_state_t *state = s; + /* ASN we must say in spec that we hash command line shared secret. */ digest_t *c = digest_new(); digest_update(c, (uchar*)secret, secretlen); digest_getdigest(c, buf, sizeof(buf)); diff --git a/src/protocols/obfs2.h b/src/protocols/obfs2.h index 0d70144..7747330 100644 --- a/src/protocols/obfs2.h +++ b/src/protocols/obfs2.h @@ -14,11 +14,12 @@ typedef struct obfs2_state_t obfs2_state_t; struct evbuffer; struct protocol_t; struct protocol_params_t; +struct listener_t; #define SHARED_SECRET_LENGTH SHA256_LENGTH -int obfs2_init(void); -void *obfs2_new(struct protocol_t *proto_struct, +int obfs2_init(int n_options, char **options, struct protocol_params_t *params); +void *obfs2_new(struct protocol_t *proto_struct, struct protocol_params_t *params); diff --git a/src/socks.h b/src/socks.h index 7b35cb5..20fd610 100644 --- a/src/socks.h +++ b/src/socks.h @@ -102,7 +102,6 @@ int socks5_send_reply(struct evbuffer *reply_dest, socks_state_t *state, int status); enum req_status socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq); - int socks4_read_request(struct evbuffer *source, socks_state_t *state); int socks4_send_reply(struct evbuffer *dest, socks_state_t *state, int status);

1 0