- tor-commits - lists.torproject.org

[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

[obfsproxy/master] Revives the unittests.
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 869aad578c26365a56890cc2ec5afb765a6048ca Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun May 29 04:05:48 2011 +0200 Revives the unittests. --- src/test/unittest_obfs2.c | 158 ++++++++++++++++++++++---------------------- src/test/unittest_socks.c | 2 +- 2 files changed, 80 insertions(+), 80 deletions(-) diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index 052c909..c411cbe 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -29,22 +29,22 @@ test_proto_setup(void *data) struct protocol_t *client_proto = NULL; struct protocol_t *server_proto = NULL; - tt_assert(set_up_protocol(OBFS2_PROTOCOL) >= 0); + protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); + char *options_client[] = {"obfs2", "--shared-secret=hahaha", "socks", "127.0.0.1:1800"}; + int n_options_client = 4; protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; - proto_params_serv->shared_secret = "hahaha"; - proto_params_serv->shared_secret_len = 7; - - protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; - proto_params_client->shared_secret = "hahaha"; - proto_params_client->shared_secret_len = 7; + char *options_server[] = {"obfs2", "--shared-secret=hahaha", "--dest=127.0.0.1:1500", + "server", "127.0.0.1:1800"}; + int n_options_server = 5; + + tt_assert(set_up_protocol(n_options_client, options_client, + proto_params_client) >= 0); + tt_assert(set_up_protocol(n_options_server, options_server, + proto_params_serv) >= 0); - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(proto_params_serv); + server_proto = proto_new(proto_params_client); tt_assert(client_proto); tt_assert(server_proto); @@ -70,22 +70,22 @@ test_proto_handshake(void *data) struct protocol_t *client_proto = NULL; struct protocol_t *server_proto = NULL; - tt_assert(set_up_protocol(OBFS2_PROTOCOL) >= 0); + protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); + char *options_client[] = {"obfs2", "--shared-secret=hahaha", "socks", "127.0.0.1:1800"}; + int n_options_client = 4; protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; - proto_params_serv->shared_secret = "hahaha"; - proto_params_serv->shared_secret_len = 7; - - protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; - proto_params_client->shared_secret = "hahaha"; - proto_params_client->shared_secret_len = 7; + char *options_server[] = {"obfs2", "--shared-secret=hahaha", "--dest=127.0.0.1:1500", + "server", "127.0.0.1:1800"}; + int n_options_server = 5; - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + tt_assert(set_up_protocol(n_options_client, options_client, + proto_params_client) >= 0); + tt_assert(set_up_protocol(n_options_server, options_server, + proto_params_serv) >= 0); + + client_proto = proto_new(proto_params_client); + server_proto = proto_new(proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -142,22 +142,22 @@ test_proto_transfer(void *data) struct protocol_t *client_proto = NULL; struct protocol_t *server_proto = NULL; - tt_assert(set_up_protocol(OBFS2_PROTOCOL) >= 0); + protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); + char *options_client[] = {"obfs2", "--shared-secret=hahaha", "socks", "127.0.0.1:1800"}; + int n_options_client = 4; protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; - proto_params_serv->shared_secret = "hahaha"; - proto_params_serv->shared_secret_len = 7; - - protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; - proto_params_client->shared_secret = "hahaha"; - proto_params_client->shared_secret_len = 7; + char *options_server[] = {"obfs2", "--shared-secret=hahaha", "--dest=127.0.0.1:1500", + "server", "127.0.0.1:1800"}; + int n_options_server = 5; + + tt_assert(set_up_protocol(n_options_client, options_client, + proto_params_client) >= 0); + tt_assert(set_up_protocol(n_options_server, options_server, + proto_params_serv) >= 0); - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(proto_params_client); + server_proto = proto_new(proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -238,22 +238,22 @@ test_proto_splitted_handshake(void *data) struct protocol_t *client_proto = NULL; struct protocol_t *server_proto = NULL; - tt_assert(set_up_protocol(OBFS2_PROTOCOL) >= 0); + protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); + char *options_client[] = {"obfs2", "--shared-secret=hahaha", "socks", "127.0.0.1:1800"}; + int n_options_client = 4; protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; - proto_params_serv->shared_secret = "hahaha"; - proto_params_serv->shared_secret_len = 7; - - protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; - proto_params_client->shared_secret = "hahaha"; - proto_params_client->shared_secret_len = 7; - - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + char *options_server[] = {"obfs2", "--shared-secret=hahaha", "--dest=127.0.0.1:1500", + "server", "127.0.0.1:1800"}; + int n_options_server = 5; + + tt_assert(set_up_protocol(n_options_client, options_client, + proto_params_client) >= 0); + tt_assert(set_up_protocol(n_options_server, options_server, + proto_params_serv) >= 0); + + client_proto = proto_new(proto_params_client); + server_proto = proto_new(proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -391,22 +391,22 @@ test_proto_wrong_handshake_magic(void *data) struct protocol_t *client_proto = NULL; struct protocol_t *server_proto = NULL; - tt_assert(set_up_protocol(OBFS2_PROTOCOL) >= 0); + protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); + char *options_client[] = {"obfs2", "--shared-secret=hahaha", "socks", "127.0.0.1:1800"}; + int n_options_client = 4; protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; - proto_params_serv->shared_secret = "hahaha"; - proto_params_serv->shared_secret_len = 7; - - protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; - proto_params_client->shared_secret = "hahaha"; - proto_params_client->shared_secret_len = 7; + char *options_server[] = {"obfs2", "--shared-secret=hahaha", "--dest=127.0.0.1:1500", + "server", "127.0.0.1:1800"}; + int n_options_server = 5; + + tt_assert(set_up_protocol(n_options_client, options_client, + proto_params_client) >= 0); + tt_assert(set_up_protocol(n_options_server, options_server, + proto_params_serv) >= 0); - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(proto_params_client); + server_proto = proto_new(proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -470,23 +470,23 @@ test_proto_wrong_handshake_plength(void *data) struct protocol_t *client_proto = NULL; struct protocol_t *server_proto = NULL; - tt_assert(set_up_protocol(OBFS2_PROTOCOL) >= 0); - protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; - proto_params_serv->shared_secret = "hahaha"; - proto_params_serv->shared_secret_len = 7; - protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); - tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; - proto_params_client->shared_secret = "hahaha"; - proto_params_client->shared_secret_len = 7; + char *options_client[] = {"obfs2", "--shared-secret=hahaha", "socks", "127.0.0.1:1800"}; + int n_options_client = 4; + + protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); + char *options_server[] = {"obfs2", "--shared-secret=hahaha", "--dest=127.0.0.1:1500", + "server", "127.0.0.1:1800"}; + int n_options_server = 5; + tt_assert(set_up_protocol(n_options_client, options_client, + proto_params_client) >= 0); + tt_assert(set_up_protocol(n_options_server, options_server, + proto_params_serv) >= 0); - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(proto_params_client); + server_proto = proto_new(proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); diff --git a/src/test/unittest_socks.c b/src/test/unittest_socks.c index d7706ee..086d887 100644 --- a/src/test/unittest_socks.c +++ b/src/test/unittest_socks.c @@ -594,7 +594,7 @@ test_socks_socks4_request_reply(void *data) tt_assert(rep2[1] == SOCKS4_FAILED); /* check port */ - tt_int_op(0, ==, memcmp(rep1+2,"\x1c\xbd",2)); + tt_int_op(0, ==, memcmp(rep2+2,"\x1c\xbd",2)); /* check address */ /* tt_str_op(rep1+2+2, ==, "www.test.example"); */

1 0

[obfsproxy/master] Define the supported protocols in protocol.[ch] instead of main.c.
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 5bfb2da574fbc02c11c6bd09c00baef4fe3017b3 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun May 29 04:49:56 2011 +0200 Define the supported protocols in protocol.[ch] instead of main.c. --- src/main.c | 7 ++++--- src/protocol.c | 3 +++ src/protocol.h | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main.c b/src/main.c index 8f03df1..68ea424 100644 --- a/src/main.c +++ b/src/main.c @@ -24,8 +24,9 @@ static void usage(void) __attribute__((noreturn)); #define SEPERATOR "+" #define MAXPROTOCOLS 20 -const char *supported_protocols[] = { "obfs2", "dummy" }; -const int n_supported_protocols = 2; +/* protocol.c */ +extern char *supported_protocols[]; +extern int n_supported_protocols; static void usage(void) @@ -35,7 +36,7 @@ usage(void) "Usage: obfsproxy protocol_name [protocol_args] protocol_options %s protocol_name ...\n" "Available protocols:", SEPERATOR); - /* cheapie */ + /* this is awful. */ for (i=0;i<n_supported_protocols;i++) fprintf(stderr," [%s]", supported_protocols[i]); fprintf(stderr,"\n"); diff --git a/src/protocol.c b/src/protocol.c index ce96f86..b86bb5f 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -9,6 +9,9 @@ #include "protocols/obfs2.h" #include "protocols/dummy.h" +char *supported_protocols[] = { "obfs2", "dummy" }; +int n_supported_protocols = 2; + /** This function initializes <protocol>. It's called once in the runtime of the program for each proto. diff --git a/src/protocol.h b/src/protocol.h index 646bf7c..0f45f22 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -3,12 +3,12 @@ #ifndef PROTOCOL_H #define PROTOCOL_H -#define DUMMY_PROTOCOL 0 -#define OBFS2_PROTOCOL 1 - struct evbuffer; struct listener_t; +#define DUMMY_PROTOCOL 1 +#define OBFS2_PROTOCOL 2 + /** This struct defines parameters of the protocol per-listener basis.

1 0

[obfsproxy/master] Fixed some memory leaks and did some style changes.
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 1c94e6df95fd8808bca3722fdcc9eba25d3bb0fb Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun May 29 23:28:53 2011 +0200 Fixed some memory leaks and did some style changes. --- src/main.c | 29 ++++++++++++++++++----------- src/network.c | 12 +----------- src/protocol.c | 26 +++++++++++++++----------- src/protocol.h | 2 ++ src/protocols/obfs2.c | 1 + 5 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/main.c b/src/main.c index 68ea424..dffe210 100644 --- a/src/main.c +++ b/src/main.c @@ -19,11 +19,13 @@ #define __attribute__(x) #endif -static void usage(void) __attribute__((noreturn)); - +/* The character that seperates multiple listeners in the cli */ #define SEPERATOR "+" +/* Totally arbitrary. */ #define MAXPROTOCOLS 20 +static void usage(void) __attribute__((noreturn)); + /* protocol.c */ extern char *supported_protocols[]; extern int n_supported_protocols; @@ -85,6 +87,8 @@ is_supported_protocol(const char *name) { return 0; } +#define STUPID_BEAUTIFIER "===========================\n" + int main(int argc, const char **argv) { @@ -215,10 +219,11 @@ main(int argc, const char **argv) listener_t *temp_listener; int n_listeners=0; for (h=0;h<actual_protocols;h++) { + if (n_protocols > 1) { - printf("===========================\n" - "Spawning listener %d!\n" - "===========================\n", h+1); + dbg((STUPID_BEAUTIFIER + "Spawning listener %d!\n" + STUPID_BEAUTIFIER, h+1)); } temp_listener = listener_new(base, n_options_array[h], protocol_options[h]); @@ -232,18 +237,18 @@ main(int argc, const char **argv) continue; } - printf("Succesfully created listener.\n"); + dbg(("Succesfully created listener.\n")); listeners[n_listeners] = temp_listener; n_listeners++; } if (n_protocols > 1) { - printf("\n===========================\n" - "From the original %d protocols only %d were parsed from main.c. " - "In the end only %d survived.\n\nStarting up...\n" - "===========================\n", - n_protocols, actual_protocols,n_listeners); + dbg((STUPID_BEAUTIFIER + "From the original %d protocols only %d were parsed from main.c. " + "In the end only %d survived.\n\nStarting up...\n" + STUPID_BEAUTIFIER, + n_protocols, actual_protocols,n_listeners)); } /* run the event loop if at least a listener was created. */ @@ -258,3 +263,5 @@ main(int argc, const char **argv) return 0; } + +#undef STUPID_BEAUTIFIER diff --git a/src/network.c b/src/network.c index 1c4b853..3b3c2bf 100644 --- a/src/network.c +++ b/src/network.c @@ -71,23 +71,13 @@ listener_new(struct event_base *base, return lsn; } -static void -protocol_params_free(protocol_params_t *params) -{ - assert(params); - - if (params->shared_secret) - free(params->shared_secret); - free(params); -} - void listener_free(listener_t *lsn) { if (lsn->listener) evconnlistener_free(lsn->listener); if (lsn->proto_params) - protocol_params_free(lsn->proto_params); + proto_params_free(lsn->proto_params); memset(lsn, 0xb0, sizeof(listener_t)); free(lsn); } diff --git a/src/protocol.c b/src/protocol.c index b86bb5f..1c93150 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -43,20 +43,12 @@ proto_new(protocol_params_t *params) { if (!proto) return NULL; - proto->vtable = calloc(1, sizeof(struct protocol_vtable)); - if (!proto->vtable) - return NULL; - - if (params->proto == OBFS2_PROTOCOL) { + if (params->proto == OBFS2_PROTOCOL) proto->state = obfs2_new(proto, params); - } else if (params->proto == DUMMY_PROTOCOL) { + else if (params->proto == DUMMY_PROTOCOL) proto->state = dummy_new(proto, NULL); - } - if (proto->state) - return proto; - else - return NULL; + return proto->state ? proto : NULL; } int @@ -93,4 +85,16 @@ proto_destroy(struct protocol_t *proto) { if (proto->vtable->destroy) proto->vtable->destroy(proto->state); + + free(proto); +} + +void +proto_params_free(protocol_params_t *params) +{ + assert(params); + + if (params->shared_secret) + free(params->shared_secret); + free(params); } diff --git a/src/protocol.h b/src/protocol.h index 0f45f22..0a7c452 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -52,6 +52,8 @@ 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); +void proto_params_free(protocol_params_t *params); + typedef struct protocol_vtable { /* Initialization function: Fills in the protocol vtable. */ diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index 41a97aa..115337e 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -136,6 +136,7 @@ obfs2_init(int n_options, char **options, } return 1; + err: usage(); return -1;

1 0

[obfsproxy/master] Code quality improvements.
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 4bfd04672ac0c3bc04ac89edf7856421e343bfe4 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Jun 5 23:52:31 2011 +0200 Code quality improvements. * Fixed a small bug. * Updated documentation in protocol.c. --- src/main.c | 3 +++ src/protocol.c | 44 +++++++++++++++++++++++++++++++++----------- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/src/main.c b/src/main.c index 7b67988..cb70c44 100644 --- a/src/main.c +++ b/src/main.c @@ -162,6 +162,9 @@ main(int argc, const char **argv) /* This is the number of options of this protocol. */ n_options = end-start+1; + if (start >= end) + usage(); + /* First option should be protocol_name. See if we support it. */ if (!is_supported_protocol(argv[start])) { printf("We don't support crappy protocols, son.\n"); diff --git a/src/protocol.c b/src/protocol.c index 1c93150..57c0c23 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -9,33 +9,37 @@ #include "protocols/obfs2.h" #include "protocols/dummy.h" +/** + All supported protocols should be put in this array. + It's used by main.c. +*/ char *supported_protocols[] = { "obfs2", "dummy" }; int n_supported_protocols = 2; /** - This function initializes <protocol>. - It's called once in the runtime of the program for each proto. + This function figures out which protocol we want to set up, and + gives 'n_options', 'options' and 'params' to the appropriate + protocol-specific initalization function. + This function is called once for every listener through the runtime + of obfsproxy. */ int 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")) + if (!strcmp(*options,"dummy")) return dummy_init(n_options, options, params); - else if (!strcmp(*name,"obfs2")) + else if (!strcmp(*options,"obfs2")) return obfs2_init(n_options, options, params); else return -1; } /** - This function creates a protocol object. It's called once - for every connection. It creates a new protocol_t structure - and fills it's vtable etc. - Return the protocol_t if successful, NULL otherwise. + This function creates a protocol object. + It's called once per connection. + It creates a new protocol_t structure and fills it's vtable etc. + Return a 'protocol_t' if successful, NULL otherwise. */ struct protocol_t * proto_new(protocol_params_t *params) { @@ -51,6 +55,10 @@ proto_new(protocol_params_t *params) { return proto->state ? proto : NULL; } +/** + This function does the protocol handshake. + Not all protocols have a handshake. +*/ int proto_handshake(struct protocol_t *proto, void *buf) { assert(proto); @@ -60,6 +68,9 @@ proto_handshake(struct protocol_t *proto, void *buf) { return 0; } +/** + This function is responsible for sending protocol data. +*/ int proto_send(struct protocol_t *proto, void *source, void *dest) { assert(proto); @@ -69,6 +80,9 @@ proto_send(struct protocol_t *proto, void *source, void *dest) { return -1; } +/** + This function is responsible for receiving protocol data. +*/ int proto_recv(struct protocol_t *proto, void *source, void *dest) { assert(proto); @@ -78,6 +92,10 @@ proto_recv(struct protocol_t *proto, void *source, void *dest) { return -1; } +/** + This function destroys 'proto'. + It's called everytime we close a connection. +*/ void proto_destroy(struct protocol_t *proto) { assert(proto); @@ -89,6 +107,10 @@ proto_destroy(struct protocol_t *proto) { free(proto); } +/** + This function destroys 'params'. + It's called everytime we free a listener. +*/ void proto_params_free(protocol_params_t *params) {

1 0

[obfsproxy/master] We no longer strdup argv strings; we are now using the argv addresses themselves.
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 30f8a9e03b2e2e63a55ff8dec6c7d4e2a5885411 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 7 00:54:26 2011 +0200 We no longer strdup argv strings; we are now using the argv addresses themselves. --- src/main.c | 31 ++++++++++++------------------- 1 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/main.c b/src/main.c index 237de94..f7d3d35 100644 --- a/src/main.c +++ b/src/main.c @@ -68,18 +68,13 @@ handle_signal_cb(evutil_socket_t fd, short what, void *arg) Returns 1 on success, -1 on fail. */ -static int +static void populate_options(char **options_string, const char **argv, int n_options) { - int x,g; - for (g=0;g<=n_options-1;g++) { - options_string[g] = strdup(argv[g]); - if (!options_string[x]) { - return -1; - } - } - return 1; + int g; + for (g=0;g<=n_options-1;g++) + options_string[g] = (char*) argv[g]; } /** @@ -209,9 +204,8 @@ main(int argc, const char **argv) n_options_array[actual_protocols-1] = n_options; /* Finally! Let's fill protocol_options. */ - if (populate_options(protocol_options[actual_protocols-1], - &argv[start], n_options) < 0) - return 1; + populate_options(protocol_options[actual_protocols-1], + &argv[start], n_options); } /* Excellent. Now we should have protocol_options populated with all @@ -232,9 +226,10 @@ main(int argc, const char **argv) /* Handle signals */ signal(SIGPIPE, SIG_IGN); - sigevent = evsignal_new(base, SIGINT, handle_signal_cb, (void*) base); + sigevent = evsignal_new(base, SIGINT, + handle_signal_cb, (void*) base); if (event_add(sigevent,NULL)) { - printf("Oh come on! We can't even add events for signals! Exiting.\n"); + printf("We can't even add events for signals! Exiting.\n"); return 1; } @@ -251,12 +246,10 @@ main(int argc, const char **argv) STUPID_BEAUTIFIER, h+1)); } - temp_listener = listener_new(base, n_options_array[h], protocol_options[h]); + temp_listener = listener_new(base, n_options_array[h], + protocol_options[h]); - /** Now that we created the listener, free the space allocated for - this protocol's options. */ - for (i=0;i<n_options_array[h];i++) - free(protocol_options[h][i]); + /** Free the space allocated for this protocol's options. */ free(protocol_options[h]); if (!temp_listener) {

1 0