December 2013 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug10409_023' into maint-0.2.4
by nickm＠torproject.org 17 Dec '13

17 Dec '13

commit 3d5154550c92766347631e4d15fae825a0f165dd Merge: 59f50c8 d8cfa2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 17 13:15:45 2013 -0500 Merge remote-tracking branch 'public/bug10409_023' into maint-0.2.4 changes/bug10409 | 3 +++ src/or/dirvote.c | 3 ++- src/or/microdesc.c | 3 +-- src/or/routerparse.c | 13 ++++++++++--- src/or/routerparse.h | 2 +- src/test/test_microdesc.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 62 insertions(+), 7 deletions(-) diff --cc src/or/routerparse.c index 890d596,52f57ec..3aa4bdf --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@@ -4288,8 -4404,9 +4294,9 @@@ microdescs_parse_from_string(const cha tor_assert(cp); md->bodylen = start_of_next_microdesc - cp; + md->saved_location = where; if (copy_body) - md->body = tor_strndup(cp, md->bodylen); + md->body = tor_memdup_nulterm(cp, md->bodylen); else md->body = (char*)cp; md->off = cp - start;

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug10409_023' into maint-0.2.4
by nickm＠torproject.org 17 Dec '13

17 Dec '13

commit 3d5154550c92766347631e4d15fae825a0f165dd Merge: 59f50c8 d8cfa2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 17 13:15:45 2013 -0500 Merge remote-tracking branch 'public/bug10409_023' into maint-0.2.4 changes/bug10409 | 3 +++ src/or/dirvote.c | 3 ++- src/or/microdesc.c | 3 +-- src/or/routerparse.c | 13 ++++++++++--- src/or/routerparse.h | 2 +- src/test/test_microdesc.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 62 insertions(+), 7 deletions(-) diff --cc src/or/routerparse.c index 890d596,52f57ec..3aa4bdf --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@@ -4288,8 -4404,9 +4294,9 @@@ microdescs_parse_from_string(const cha tor_assert(cp); md->bodylen = start_of_next_microdesc - cp; + md->saved_location = where; if (copy_body) - md->body = tor_strndup(cp, md->bodylen); + md->body = tor_memdup_nulterm(cp, md->bodylen); else md->body = (char*)cp; md->off = cp - start;

1 0

[tor/maint-0.2.4] Avoid free()ing from an mmap on corrupted microdesc cache
by nickm＠torproject.org 17 Dec '13

17 Dec '13

commit d8cfa2ef4e6d57f6dd4a33e5b3cfb1a2a12fc4be Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 13:00:15 2013 -0500 Avoid free()ing from an mmap on corrupted microdesc cache The 'body' field of a microdesc_t holds a strdup()'d value if the microdesc's saved_location field is SAVED_IN_JOURNAL or SAVED_NOWHERE, and holds a pointer to the middle of an mmap if the microdesc is SAVED_IN_CACHE. But we weren't setting that field until a while after we parsed the microdescriptor, which left an interval where microdesc_free() would try to free() the middle of the mmap(). This patch also includes a regression test. This is a fix for #10409; bugfix on 0.2.2.6-alpha. --- changes/bug10409 | 3 +++ src/or/dirvote.c | 3 ++- src/or/microdesc.c | 3 +-- src/or/routerparse.c | 13 ++++++++++--- src/or/routerparse.h | 2 +- src/test/test_microdesc.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 62 insertions(+), 7 deletions(-) diff --git a/changes/bug10409 b/changes/bug10409 new file mode 100644 index 0000000..5ef5ae2 --- /dev/null +++ b/changes/bug10409 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Avoid a crash bug when starting with a corrupted microdescriptor + cache file. Fix for bug 10406; bugfix on 0.2.2.6-alpha. diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 144859a..ab2225c 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3538,7 +3538,8 @@ dirvote_create_microdescriptor(const routerinfo_t *ri) { smartlist_t *lst = microdescs_parse_from_string(output, - output+strlen(output), 0, 1); + output+strlen(output), 0, + SAVED_NOWHERE); if (smartlist_len(lst) != 1) { log_warn(LD_DIR, "We generated a microdescriptor we couldn't parse."); SMARTLIST_FOREACH(lst, microdesc_t *, md, microdesc_free(md)); diff --git a/src/or/microdesc.c b/src/or/microdesc.c index b4d22c1..6f9134c 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -149,11 +149,10 @@ microdescs_add_to_cache(microdesc_cache_t *cache, { smartlist_t *descriptors, *added; const int allow_annotations = (where != SAVED_NOWHERE); - const int copy_body = (where != SAVED_IN_CACHE); descriptors = microdescs_parse_from_string(s, eos, allow_annotations, - copy_body); + where); if (listed_at > 0) { SMARTLIST_FOREACH(descriptors, microdesc_t *, md, md->last_listed = listed_at); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 299d07d..52f57ec 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4355,12 +4355,17 @@ find_start_of_next_microdesc(const char *s, const char *eos) /** Parse as many microdescriptors as are found from the string starting at * s and ending at eos. If allow_annotations is set, read any - * annotations we recognize and ignore ones we don't. If copy_body is - * true, then strdup the bodies of the microdescriptors. Return all newly + * annotations we recognize and ignore ones we don't. + * + * If saved_location isn't SAVED_IN_CACHE, make a local copy of each + * descriptor in the body field of each microdesc_t. + * + * Return all newly * parsed microdescriptors in a newly allocated smartlist_t. */ smartlist_t * microdescs_parse_from_string(const char *s, const char *eos, - int allow_annotations, int copy_body) + int allow_annotations, + saved_location_t where) { smartlist_t *tokens; smartlist_t *result; @@ -4369,6 +4374,7 @@ microdescs_parse_from_string(const char *s, const char *eos, const char *start = s; const char *start_of_next_microdesc; int flags = allow_annotations ? TS_ANNOTATIONS_OK : 0; + const int copy_body = (where != SAVED_IN_CACHE); directory_token_t *tok; @@ -4398,6 +4404,7 @@ microdescs_parse_from_string(const char *s, const char *eos, tor_assert(cp); md->bodylen = start_of_next_microdesc - cp; + md->saved_location = where; if (copy_body) md->body = tor_strndup(cp, md->bodylen); else diff --git a/src/or/routerparse.h b/src/or/routerparse.h index c6382a7..e357f18 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -64,7 +64,7 @@ ns_detached_signatures_t *networkstatus_parse_detached_signatures( smartlist_t *microdescs_parse_from_string(const char *s, const char *eos, int allow_annotations, - int copy_body); + saved_location_t where); authority_cert_t *authority_cert_parse_from_string(const char *s, const char **end_of_string); diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 89c578f..828e334 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -226,8 +226,53 @@ test_md_cache(void *data) tor_free(fn); } +static const char truncated_md[] = + "@last-listed 2013-08-08 19:02:59\n" + "onion-key\n" + "-----BEGIN RSA PUBLIC KEY-----\n" + "MIGJAoGBAM91vLFNaM+gGhnRIdz2Cm/Kl7Xz0cOobIdVzhS3cKUJfk867hCuTipS\n" + "NveLBzNopvgXKruAAzEj3cACxk6Q8lv5UWOGCD1UolkgsWSE62RBjap44g+oc9J1\n" + "RI9968xOTZw0VaBQg9giEILNXl0djoikQ+5tQRUvLDDa67gpa5Q1AgMBAAE=\n" + "-----END RSA PUBLIC KEY-----\n" + "family @\n"; + +static void +test_md_cache_broken(void *data) +{ + or_options_t *options; + char *fn=NULL; + microdesc_cache_t *mc = NULL; + + (void)data; + + options = get_options_mutable(); + tt_assert(options); + options->DataDirectory = tor_strdup(get_fname("md_datadir_test2")); + +#ifdef _WIN32 + tt_int_op(0, ==, mkdir(options->DataDirectory)); +#else + tt_int_op(0, ==, mkdir(options->DataDirectory, 0700)); +#endif + + tor_asprintf(&fn, "%s"PATH_SEPARATOR"cached-microdescs", + options->DataDirectory); + + write_str_to_file(fn, truncated_md, 1); + + mc = get_microdesc_cache(); + tt_assert(mc); + + done: + if (options) + tor_free(options->DataDirectory); + tor_free(fn); + microdesc_free_all(); +} + struct testcase_t microdesc_tests[] = { { "cache", test_md_cache, TT_FORK, NULL, NULL }, + { "broken_cache", test_md_cache_broken, TT_FORK, NULL, NULL }, END_OF_TESTCASES };

1 0

r26481: {website} some of these were pre-501(c)(3), some weren't, so remove th (website/trunk/about/en)
by Roger Dingledine 17 Dec '13

17 Dec '13

Author: arma Date: 2013-12-17 18:09:40 +0000 (Tue, 17 Dec 2013) New Revision: 26481 Modified: website/trunk/about/en/sponsors.wml Log: some of these were pre-501(c)(3), some weren't, so remove the distinction Modified: website/trunk/about/en/sponsors.wml =================================================================== --- website/trunk/about/en/sponsors.wml 2013-12-16 17:25:57 UTC (rev 26480) +++ website/trunk/about/en/sponsors.wml 2013-12-17 18:09:40 UTC (rev 26481) @@ -40,8 +40,7 @@ <h3>Past sponsors</h3> We greatly appreciate the support provided by our past sponsors - in keeping the pre-501(c)(3) Tor Project progressing through our - ambitious goals: + in keeping the Tor Project progressing through our ambitious goals: <ul> <li><a href="http://nsf.gov/">National Science Foundation</a> via Drexel University (2009-2011)</li> <li><a href="https://www.accessnow.org/">Access Now</a> (2012)</li>

1 0

[tor-design-2012/master] Add a Git revision header and update .gitignore
by sjm217＠torproject.org 17 Dec '13

17 Dec '13

commit 2ea9fe0a0e6133e52ac19a86c4304b6a97b5890c Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Mon Dec 16 18:29:24 2013 +0000 Add a Git revision header and update .gitignore --- .gitignore | 3 +- Makefile | 7 ++-- tor-design-2012.tex | 12 +++++++ vc | 24 ++++++++++++++ vc-git.awk | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 132 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f1ba132..2047e1d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ *~ +*.swp /tor-design-2012.aux /tor-design-2012.bbl /tor-design-2012.blg /tor-design-2012.log /tor-design-2012.pdf - +/vc._include_.tex diff --git a/Makefile b/Makefile index efbc840..c484403 100644 --- a/Makefile +++ b/Makefile @@ -9,14 +9,17 @@ cell-struct.pdf: cell-struct.fig interaction.pdf: interaction.fig fig2dev -L pdf $< $@ -tor-design-2012.ps: cell-struct.eps interaction.eps tor-design-2012.bib tor-design-2012.tex usenix.sty latex8.bst +vc._include_.tex: vc tor-design-2012.bib tor-design-2012.tex + ./vc -m && mv vc.tex $@ + +tor-design-2012.ps: cell-struct.eps interaction.eps tor-design-2012.bib tor-design-2012.tex usenix.sty latex8.bst vc._include_.tex latex tor-design-2012.tex bibtex tor-design-2012 latex tor-design-2012.tex latex tor-design-2012.tex dvips -o $@ tor-design-2012.dvi -tor-design-2012.pdf: cell-struct.pdf interaction.pdf tor-design-2012.bib tor-design-2012.tex usenix.sty latex8.bst +tor-design-2012.pdf: cell-struct.pdf interaction.pdf tor-design-2012.bib tor-design-2012.tex usenix.sty latex8.bst vc._include_.tex pdflatex tor-design-2012.tex bibtex tor-design-2012 pdflatex tor-design-2012.tex diff --git a/tor-design-2012.tex b/tor-design-2012.tex index 1766883..1efb544 100644 --- a/tor-design-2012.tex +++ b/tor-design-2012.tex @@ -8,7 +8,10 @@ \usepackage{graphics} \usepackage{prettyref} \usepackage{amsmath} +\usepackage{fancyhdr} +\usepackage{color} \usepackage{epsfig} +\input{vc._include_.tex} \pagestyle{empty} @@ -44,6 +47,15 @@ % Cut down on whitespace above and below figures displayed in middle of page \setlength{\intextsep}{3mm} +\pagestyle{fancy} +\fancyhf{} +\setlength{\headheight}{12pt} +\setlength{\voffset}{-0.2in} +\setlength{\headsep}{25pt} + +\fancyhead[C]{\sc revision \VCRevisionMod~(\VCDateISO~\VCTime)} +\fancyfoot[C]{\thepage} + \begin{document} %% Use dvipdfm instead. --DH diff --git a/vc b/vc new file mode 100755 index 0000000..807689d --- /dev/null +++ b/vc @@ -0,0 +1,24 @@ +#!/bin/sh +# This is file 'vc' from the vc bundle for TeX. +# The original file can be found at CTAN:support/vc. +# This file is Public Domain. + +# Parse command line options. +full=0 +mod=0 +while [ -n "$(echo $1 | grep '-')" ]; do + case $1 in + -f ) full=1 ;; + -m ) mod=1 ;; + * ) echo 'usage: vc [-f] [-m]' + exit 1 + esac + shift +done +# English locale. +LC_ALL=C +git --no-pager log -1 HEAD --pretty=format:"Hash: %H%nAbr. Hash: %h%nParent Hashes: %P%nAbr. Parent Hashes: %p%nAuthor Name: %an%nAuthor Email: %ae%nAuthor Date: %ai%nCommitter Name: %cn%nCommitter Email: %ce%nCommitter Date: %ci%n" |gawk -v script=log -v full=$full -f vc-git.awk > vc.tex +if [ "$mod" = 1 ] +then + git -c color.ui=never status |gawk -v script=status -f vc-git.awk >> vc.tex +fi diff --git a/vc-git.awk b/vc-git.awk new file mode 100644 index 0000000..a79977a --- /dev/null +++ b/vc-git.awk @@ -0,0 +1,89 @@ +# This is file 'vc-git.awk' from the vc bundle for TeX. +# The original file can be found at CTAN:support/vc. +# This file is Public Domain. +BEGIN { + +### Process output of "git status". + if (script=="status") { + modified = 0 + } + +} + + + +### Process output of "git log". +script=="log" && /^Hash:/ { Hash = substr($0, 2+match($0, ":")) } +script=="log" && /^Abr. Hash:/ { AbrHash = substr($0, 2+match($0, ":")) } +script=="log" && /^Parent Hashes:/ { ParentHashes = substr($0, 2+match($0, ":")) } +script=="log" && /^Abr. Parent Hashes:/ { AbrParentHashes = substr($0, 2+match($0, ":")) } +script=="log" && /^Author Name:/ { AuthorName = substr($0, 2+match($0, ":")) } +script=="log" && /^Author Email:/ { AuthorEmail = substr($0, 2+match($0, ":")) } +script=="log" && /^Author Date:/ { AuthorDate = substr($0, 2+match($0, ":")) } +script=="log" && /^Committer Name:/ { CommitterName = substr($0, 2+match($0, ":")) } +script=="log" && /^Committer Email:/ { CommitterEmail = substr($0, 2+match($0, ":")) } +script=="log" && /^Committer Date:/ { CommitterDate = substr($0, 2+match($0, ":")) } + +### Process output of "git status". +### Changed index? +script=="status" && /^Changes to be committed:/ { modified = 1 } +### Unstaged modifications? +script=="status" && /^Changes not staged for commit:/ { modified = 2 } + + + +END { + +### Process output of "git log". + if (script=="log") { +### Standard encoding is UTF-8. + if (Encoding == "") Encoding = "UTF-8" +### Extract relevant information from variables. + LongDate = substr(AuthorDate, 1, 25) + DateRAW = substr(LongDate, 1, 10) + DateISO = DateRAW + DateTEX = DateISO + gsub("-", "/", DateTEX) + Time = substr(LongDate, 12, 14) +### Write file identification to vc.tex. + print "%%% This file has been generated by the vc bundle for TeX." + print "%%% Do not edit this file!" + print "%%%" +### Write Git specific macros. + print "%%% Define Git specific macros." + print "\\gdef\\GITHash{" Hash "}%" + print "\\gdef\\GITAbrHash{" AbrHash "}%" + print "\\gdef\\GITParentHashes{" ParentHashes "}%" + print "\\gdef\\GITAbrParentHashes{" AbrParentHashes "}%" + print "\\gdef\\GITAuthorName{" AuthorName "}%" + print "\\gdef\\GITAuthorEmail{" AuthorEmail "}%" + print "\\gdef\\GITAuthorDate{" AuthorDate "}%" + print "\\gdef\\GITCommitterName{" CommitterName "}%" + print "\\gdef\\GITCommitterEmail{" CommitterEmail "}%" + print "\\gdef\\GITCommitterDate{" CommitterDate "}%" +### Write generic version control macros. + print "%%% Define generic version control macros." + print "\\gdef\\VCRevision{\\GITAbrHash}%" + print "\\gdef\\VCAuthor{\\GITAuthorName}%" + print "\\gdef\\VCDateRAW{" DateRAW "}%" + print "\\gdef\\VCDateISO{" DateISO "}%" + print "\\gdef\\VCDateTEX{" DateTEX "}%" + print "\\gdef\\VCTime{" Time "}%" + print "\\gdef\\VCModifiedText{\\textcolor{red}{with local modifications!}}%" + print "%%% Assume clean working copy." + print "\\gdef\\VCModified{0}%" + print "\\gdef\\VCRevisionMod{\\VCRevision}%" + } + +### Process output of "git status". + if (script=="status") { + print "%%% Is working copy modified?" + print "\\gdef\\VCModified{" modified "}%" + if (modified==0) { + print "\\gdef\\VCRevisionMod{\\VCRevision}%" + } else { + print "\\gdef\\VCRevisionMod{\\VCRevision~\\VCModifiedText}%" + } + } + +}

1 0

[tor-design-2012/master] Add Steven's email address and affiliation
by sjm217＠torproject.org 17 Dec '13

17 Dec '13

commit 6738fbe0bb8a2b6acbb08221690bc5375dce69c3 Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Mon Dec 16 18:27:47 2013 +0000 Add Steven's email address and affiliation --- tor-design-2012.tex | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tor-design-2012.tex b/tor-design-2012.tex index 712b381..1766883 100644 --- a/tor-design-2012.tex +++ b/tor-design-2012.tex @@ -57,7 +57,8 @@ \author{Roger Dingledine \\ The Free Haven Project \\ arma(a)freehaven.net \and Nick Mathewson \\ The Free Haven Project \\ nickm(a)freehaven.net \and -Steven Murdoch \\ affiliation \\ email \and +Steven Murdoch \\ Computer Laboratory \\ University of Cambridge\\ +Steven.Murdoch(a)cl.cam.ac.uk \and Paul Syverson \\ Naval Research Lab \\ syverson(a)itd.nrl.navy.mil} \maketitle

1 0

[obfs-flash/master] Set TOR_PT_SERVER_TRANSPORT_OPTIONS.
by dcf＠torproject.org 17 Dec '13

17 Dec '13

commit b90d02fcaad915c95a8723d5c0089e79a793c2d2 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 16 16:29:33 2013 -0800 Set TOR_PT_SERVER_TRANSPORT_OPTIONS. --- obfs-flash-server.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/obfs-flash-server.go b/obfs-flash-server.go index f6cc7af..d186df7 100644 --- a/obfs-flash-server.go +++ b/obfs-flash-server.go @@ -178,6 +178,7 @@ func encodeServerTransportOptions(methodName string, opts pt.Args) string { type ServerTransportPlugin struct { MethodName string Command []string + Options pt.Args } func startProcesses(connectBackAddr net.Addr, plugins []ServerTransportPlugin) (bindAddr *net.TCPAddr, procs ProcList, err error) { @@ -202,6 +203,7 @@ func startProcesses(connectBackAddr net.Addr, plugins []ServerTransportPlugin) ( "TOR_PT_EXTENDED_SERVER_PORT=", "TOR_PT_ORPORT=" + bindAddr.String(), "TOR_PT_SERVER_TRANSPORTS=" + plugin.MethodName, + "TOR_PT_SERVER_TRANSPORT_OPTIONS=" + encodeServerTransportOptions(plugin.MethodName, plugin.Options), "TOR_PT_SERVER_BINDADDR=" + plugin.MethodName + "-127.0.0.1:0", } log("%s environment %q", cmd.Args[0], cmd.Env) @@ -426,7 +428,8 @@ func (conf *Configuration) PluginList(methodName string) ([]ServerTransportPlugi if !ok { return nil, errors.New(fmt.Sprintf("no transport named %q", name)) } - stp = append(stp, ServerTransportPlugin{name, command}) + options := conf.Options[name] + stp = append(stp, ServerTransportPlugin{name, command, options}) } return stp, nil }

1 0

[obfs-flash/master] Add a function to encode a ServerTransportOptions string.
by dcf＠torproject.org 17 Dec '13

17 Dec '13

commit cf6b22666c1b4e47a3ac8d8cfce1f2fed5206e8a Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 16 16:26:04 2013 -0800 Add a function to encode a ServerTransportOptions string. --- obfs-flash-server.go | 28 ++++++++++++++++++++++++++++ pt_test.go | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/obfs-flash-server.go b/obfs-flash-server.go index d407547..f6cc7af 100644 --- a/obfs-flash-server.go +++ b/obfs-flash-server.go @@ -13,6 +13,7 @@ import ( "strings" "sync" "syscall" + "sort" "time" ) @@ -148,6 +149,30 @@ func findBindAddr(r io.Reader, methodName string) (*net.TCPAddr, error) { return nil, errors.New(fmt.Sprintf("no SMETHOD %s found before SMETHODS DONE", methodName)) } +// Escape a string for a ServerTransportOptions serialization. +func escape(s string) string { + repl := strings.NewReplacer(":", "\\:", ";", "\\;", "=", "\\=", "\\", "\\\\") + return repl.Replace(s) +} + +func encodeServerTransportOptions(methodName string, opts pt.Args) string { + if opts == nil { + return "" + } + keys := make([]string, 0, len(opts)) + for key, _ := range opts { + keys = append(keys, key) + } + sort.Strings(keys) + parts := make([]string, 0, len(keys)) + for _, key := range keys { + for _, value := range opts[key] { + parts = append(parts, escape(methodName) + ":" + escape(key) + "=" + escape(value)) + } + } + return strings.Join(parts, ";") +} + // Represents a server transport plugin configuration like: // ServerTransportPlugin MethodName exec Command type ServerTransportPlugin struct { @@ -365,6 +390,8 @@ func startChain(methodName string, bindaddr *net.TCPAddr, plugins []ServerTransp type Configuration struct { // Map from method names to command strings. Transports map[string][]string + // Map from method names to ServerTransportOptions. + Options map[string]pt.Args // Map from tor-friendly names like "obfs3_websocket" to systematic // names like "obfs3|websocket". Aliases map[string]string @@ -409,6 +436,7 @@ func getConfiguration() (conf *Configuration) { conf = new(Configuration) conf.Transports = make(map[string][]string) conf.Aliases = make(map[string]string) + conf.Options = make(map[string]pt.Args) conf.Transports["obfs3"] = []string{"obfsproxy", "managed"} conf.Transports["websocket"] = []string{"websocket-server"} conf.Aliases["obfs3_websocket"] = "obfs3|websocket" diff --git a/pt_test.go b/pt_test.go new file mode 100644 index 0000000..35d3aab --- /dev/null +++ b/pt_test.go @@ -0,0 +1,39 @@ +package main + +import "testing" + +import "git.torproject.org/pluggable-transports/goptlib.git" + +func TestEncodeServerTransportOptions(t *testing.T) { + tests := [...]struct { + methodName string + opts pt.Args + expected string + }{ + { + "foo", + pt.Args{}, + "", + }, + { + "foo", + pt.Args{ + "key": []string{"value1", "value2"}, + "something": []string{"value1", "value2"}, + }, + "foo:key=value1;foo:key=value2;foo:something=value1;foo:something=value2", + }, + { + "m:m", + pt.Args{"k;k": []string{"v=v", "b\\b"}}, + "m\\:m:k\\;k=v\\=v;m\\:m:k\\;k=b\\\\b", + }, + } + + for _, test := range tests { + output := encodeServerTransportOptions(test.methodName, test.opts) + if output != test.expected { + t.Errorf("%q %q → %q (expected %q)", test.methodName, test.opts, output, test.expected) + } + } +}

1 0

[obfs-flash/master] Dome of how to set ServerTransportOptions.
by dcf＠torproject.org 17 Dec '13

17 Dec '13

commit a5bb87f651674eddf440d896564060835dc79a75 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 16 16:49:06 2013 -0800 Dome of how to set ServerTransportOptions. --- obfs-flash-server.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/obfs-flash-server.go b/obfs-flash-server.go index d186df7..76ef4d4 100644 --- a/obfs-flash-server.go +++ b/obfs-flash-server.go @@ -442,6 +442,8 @@ func getConfiguration() (conf *Configuration) { conf.Options = make(map[string]pt.Args) conf.Transports["obfs3"] = []string{"obfsproxy", "managed"} conf.Transports["websocket"] = []string{"websocket-server"} + // conf.Options["obfs3"] = make(pt.Args) + // conf.Options["obfs3"]["secret"] = []string{"foo"} conf.Aliases["obfs3_websocket"] = "obfs3|websocket" return conf }

1 0

[obfs-flash/master] Port to goptlib.
by dcf＠torproject.org 17 Dec '13

17 Dec '13

commit d3dbd48275e568c59f4ffb183b2c12d44ae24cd5 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 16 15:05:34 2013 -0800 Port to goptlib. --- obfs-flash-server.go | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/obfs-flash-server.go b/obfs-flash-server.go index a62af47..d407547 100644 --- a/obfs-flash-server.go +++ b/obfs-flash-server.go @@ -16,7 +16,7 @@ import ( "time" ) -import "git.torproject.org/pluggable-transports/websocket.git/src/pt" +import "git.torproject.org/pluggable-transports/goptlib.git" const connStackSize = 10 const subprocessWaitTimeout = 30 * time.Second @@ -136,11 +136,11 @@ func findBindAddr(r io.Reader, methodName string) (*net.TCPAddr, error) { keyword := fields[0] args := fields[1:] if keyword == "SMETHOD" && len(args) >= 2 && args[0] == methodName { - bindAddr, err := net.ResolveTCPAddr("tcp", args[1]) + bindaddr, err := net.ResolveTCPAddr("tcp", args[1]) if err != nil { return nil, err } - return bindAddr, nil + return bindaddr, nil } else if keyword == "SMETHODS" && len(args) == 1 && args[0] == "DONE" { break } @@ -286,7 +286,7 @@ func handleInternalConnection(conn *net.TCPConn, chain *Chain) error { extConn := elem.(*net.TCPConn) log("Connecting to ORPort using remote addr %s.", extConn.RemoteAddr()) log("handleInternalConnection: now %d conns buffered.", chain.Conns.Length()) - or, err := pt.ConnectOr(&ptInfo, extConn, chain.MethodName) + or, err := pt.DialOr(&ptInfo, extConn.RemoteAddr().String(), chain.MethodName) if err != nil { log("Error connecting to ORPort: %s.", err) return err @@ -322,7 +322,7 @@ loop: } } -func startChain(methodName string, bindAddr *net.TCPAddr, plugins []ServerTransportPlugin) (*Chain, error) { +func startChain(methodName string, bindaddr *net.TCPAddr, plugins []ServerTransportPlugin) (*Chain, error) { chain := &Chain{} var err error @@ -347,9 +347,9 @@ func startChain(methodName string, bindAddr *net.TCPAddr, plugins []ServerTransp } log("Proxy chain on %s.", chain.ProcsAddr) - // Start external Internet listener (listens on bindAddr and connects to + // Start external Internet listener (listens on bindaddr and connects to // proxy chain). - chain.ExtLn, err = net.ListenTCP("tcp", bindAddr) + chain.ExtLn, err = net.ListenTCP("tcp", bindaddr) if err != nil { log("Error opening external listener: %s.", err) chain.Shutdown() @@ -435,30 +435,35 @@ func main() { log("Starting.") + var err error conf := getConfiguration() - ptInfo = pt.ServerSetup(conf.MethodNames()) + ptInfo, err = pt.ServerSetup(conf.MethodNames()) + if err != nil { + log("Error in ServerSetup: %s", err) + os.Exit(1) + } chains := make([]*Chain, 0) - for _, bindAddr := range ptInfo.BindAddrs { + for _, bindaddr := range ptInfo.Bindaddrs { // Override tor's requested port (which is 0 if this transport // has not been run before) with the one requested by the --port // option. if port != 0 { - bindAddr.Addr.Port = port + bindaddr.Addr.Port = port } - plugins, err := conf.PluginList(bindAddr.MethodName) + plugins, err := conf.PluginList(bindaddr.MethodName) if err != nil { - pt.SmethodError(bindAddr.MethodName, err.Error()) + pt.SmethodError(bindaddr.MethodName, err.Error()) continue } - chain, err := startChain(bindAddr.MethodName, bindAddr.Addr, plugins) + chain, err := startChain(bindaddr.MethodName, bindaddr.Addr, plugins) if err != nil { - pt.SmethodError(bindAddr.MethodName, err.Error()) + pt.SmethodError(bindaddr.MethodName, err.Error()) continue } - pt.Smethod(bindAddr.MethodName, chain.ExtLn.Addr()) + pt.Smethod(bindaddr.MethodName, chain.ExtLn.Addr()) chains = append(chains, chain) } pt.SmethodsDone()

1 0