August 2015 - tor-commits - lists.torproject.org

[tor-browser-spec/master] Add HTTP workshop slides.
by mikeperry＠torproject.org 05 Aug '15

05 Aug '15

commit 739b1801071a2d46fa827a6d065c99301b3d18b6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 5 15:37:05 2015 -0700 Add HTTP workshop slides. --- position-papers/HTTP3/2015HTTPWorkshop-slides.pdf | Bin 0 -> 357523 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/position-papers/HTTP3/2015HTTPWorkshop-slides.pdf b/position-papers/HTTP3/2015HTTPWorkshop-slides.pdf new file mode 100644 index 0000000..00da9e8 Binary files /dev/null and b/position-papers/HTTP3/2015HTTPWorkshop-slides.pdf differ

1 0

[goptlib/master] Add a test for non-interpretation of escapes in transport lists.
by dcf＠torproject.org 05 Aug '15

05 Aug '15

commit b6b24f6815f01c3ca61bb22e39b99e1af52a94a4 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Aug 5 14:54:18 2015 -0700 Add a test for non-interpretation of escapes in transport lists. --- pt_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pt_test.go b/pt_test.go index 93fa491..0d641fe 100644 --- a/pt_test.go +++ b/pt_test.go @@ -164,6 +164,11 @@ func TestGetClientTransports(t *testing.T) { "alpha,*,gamma", []string{"alpha", "*", "gamma"}, }, + // No escaping is defined for TOR_PT_CLIENT_TRANSPORTS. + { + `alpha\,beta`, + []string{`alpha\`, `beta`}, + }, } Stdout = ioutil.Discard @@ -290,6 +295,13 @@ func TestGetServerBindaddrs(t *testing.T) { "alpha", "key=value", }, + // no escaping is defined for TOR_PT_SERVER_TRANSPORTS or + // TOR_PT_SERVER_BINDADDR. + { + `alpha\,beta-1.2.3.4:1111`, + `alpha\,beta`, + "", + }, } goodTests := [...]struct { ptServerBindaddr string

1 0

[tor/master] Update tor-fw-helper URL
by nickm＠torproject.org 05 Aug '15

05 Aug '15

commit 1ccba302f77315b459540cda2168c813e0d24371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 5 15:07:13 2015 -0400 Update tor-fw-helper URL --- src/tools/tor-fw-helper/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/tor-fw-helper/README b/src/tools/tor-fw-helper/README index 3868cc2..6a1ecaa 100644 --- a/src/tools/tor-fw-helper/README +++ b/src/tools/tor-fw-helper/README @@ -1,7 +1,7 @@ We no longer recommend the use of this tool. Instead, please use the pure-Go version of tor-fw-helper available at - https://github.com/Yawning/tor-fw-helper + https://gitweb.torproject.org/tor-fw-helper.git Why?

1 0

[tor-fw-helper/master] Changed the import paths to reflect the move to the tpo repo.
by yawning＠torproject.org 05 Aug '15

05 Aug '15

commit 481599ee37dd3135c9e17d1df4810f36b4de4e3d Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Aug 5 18:45:01 2015 +0000 Changed the import paths to reflect the move to the tpo repo. --- main.go | 226 -------------------------------------------- natclient/natclient.go | 6 +- natclient/natpmp/client.go | 2 +- natclient/upnp/client.go | 2 +- natclient/upnp/ssdp.go | 2 +- tor-fw-helper/main.go | 226 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 232 insertions(+), 232 deletions(-) diff --git a/main.go b/main.go deleted file mode 100644 index 5ee31fb..0000000 --- a/main.go +++ /dev/null @@ -1,226 +0,0 @@ -/* - * Copyright (c) 2010, Jacob Appelbaum, Steven J. Murdoch. - * Copyright (c) 2010-2013, The Tor Project, Inc. - * Copyright (c) 2014, The Tor Project, Inc. - * See LICENSE for licensing information - */ - -// tor-fw-helper is a tool for opening firewalls with the various NAT traversal -// mechanisms. This tool is designed as a drop in replacement for the orginal -// C language tor-fw-helper, with less hard-to-audit library code, and the use -// of a memory-safe language as design goals. -package main - -import ( - "flag" - "fmt" - "os" - "strconv" - "strings" - - "github.com/yawning/tor-fw-helper/natclient" -) - -const ( - // mappingDescr is the default mapping entry name. - mappingDescr = "Tor relay" - - // mappingDuration is the default mapping duration. A value of 0 indicates - // that the protocol implementation's safe default value is used. - mappingDuration = 0 - - versionString = "0.3" -) - -type portPair struct { - internal int - external int -} - -type forwardList []portPair - -func (l *forwardList) String() string { - return fmt.Sprint(*l) -} - -func (l *forwardList) Set(value string) error { - var internal, external int - - split := strings.Split(value, ":") - if len(split) != 2 { - return fmt.Errorf("failed to parse '%s'", value) - } - - // Internal port is required, so handle it first. - tmp, err := strconv.ParseUint(split[1], 10, 16) - if err != nil { - return err - } - internal = int(tmp) - - // External port is optional. - if split[0] == "" { - // If missing, set to the same as internal. - external = internal - } else { - tmp, err := strconv.ParseUint(split[0], 10, 16) - if err != nil { - return err - } - external = int(tmp) - } - - *l = append(*l, portPair{internal, external}) - return nil -} - -func usage() { - fmt.Fprintf(os.Stderr, "%s usage:\n"+ - " [-h|--help]\n"+ - " [-T|--test-commandline]\n"+ - " [-v|--verbose]\n"+ - " [-g|--fetch-public-ip]\n"+ - " [-p|--forward-port ([<external port>]:<internal port>)]\n"+ - " [-d|--unforward-port ([<external port>]:<internal port>]\n"+ - " [-l|--list-ports]\n"+ - " [--protocol NAT-PMP,UPnP]\n", os.Args[0]) - os.Exit(1) -} - -func main() { - doHelp := false - doTest := false - isVerbose := false - doFetchIP := false - doList := false - var portsToForward forwardList - var portsToUnforward forwardList - protocol := "" - - // So, the flag package kind of sucks and doesn't gracefully support the - // concept of aliased flags when printing usage, which results in a - // usage and help output that looks like crap. Fix this by ignoring the - // flag package's built in usage support, and overriding Usage(). - flag.Usage = usage - flag.BoolVar(&doHelp, "help", false, "") - flag.BoolVar(&doHelp, "h", false, "") - flag.BoolVar(&doTest, "test-commandline", false, "") - flag.BoolVar(&doTest, "T", false, "") - flag.BoolVar(&isVerbose, "verbose", false, "") - flag.BoolVar(&isVerbose, "v", false, "") - flag.BoolVar(&doFetchIP, "fetch-public-ip", false, "") - flag.BoolVar(&doFetchIP, "g", false, "") - flag.BoolVar(&doList, "list-ports", false, "") - flag.BoolVar(&doList, "l", false, "") - flag.StringVar(&protocol, "protocol", "", "") - flag.Var(&portsToForward, "forward-port", "") - flag.Var(&portsToForward, "p", "") - flag.Var(&portsToUnforward, "unforward-port", "") - flag.Var(&portsToUnforward, "d", "") - flag.Parse() - - // Extra flag related handling. - if doHelp || flag.NArg() > 0 { - usage() - } - if isVerbose { - // Dump information about how we were invoked. - fmt.Fprintf(os.Stderr, "V: tor-fw-helper version %s\n"+ - "V: We were called with the following arguments:\n"+ - "V: verbose = %v, help = %v, fetch_public_ip = %v, "+ - "list_ports = %v, protocol = '%s'\n", - versionString, isVerbose, doHelp, doFetchIP, doList, protocol) - - if len(portsToForward) > 0 { - fmt.Fprintf(os.Stderr, "V: TCP forwarding:\n") - for _, ent := range portsToForward { - fmt.Fprintf(os.Stderr, "V: External %v, Internal: %v\n", - ent.external, ent.internal) - } - } - if len(portsToUnforward) > 0 { - fmt.Fprintf(os.Stderr, "V: Remove TCP forwarding:\n") - for _, ent := range portsToUnforward { - fmt.Fprintf(os.Stderr, "V: External %v, Internal: %v\n", - ent.external, ent.internal) - } - } - } - if doTest { - // If the app is being called in test mode, dump the command line - // arguments to a file. - // - // TODO: I have no idea why this exists, I'll add this later. - fmt.Fprintf(os.Stderr, "E: --test-commandline not implemented yet\n") - os.Exit(1) - } - if len(portsToForward) == 0 && !doFetchIP && !doList && len(portsToUnforward) == 0 { - // Nothing to do, sad panda. - fmt.Fprintf(os.Stderr, "E: We require a port to be forwarded/unforwarded, "+ - "fetch_public_ip request, or list_ports!\n") - os.Exit(1) - } - - // Discover/Initialize a compatible NAT traversal method. - c, err := natclient.New(protocol, isVerbose) - if err != nil { - fmt.Fprintf(os.Stderr, "E: %s\n", err) - os.Exit(1) - } - defer c.Close() - - // Forward some ports, the response is delivered over stdout in a - // predefined format. - for _, pair := range portsToForward { - err = c.AddPortMapping(mappingDescr, pair.internal, pair.external, mappingDuration) - if err != nil { - c.Vlogf("AddPortMapping() failed: %s\n", err) - fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-forward %d %d FAIL\n", pair.external, pair.internal) - } else { - c.Vlogf("AddPortMapping() succeded\n") - fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-forward %d %d SUCCESS\n", pair.external, pair.internal) - } - os.Stdout.Sync() - } - - // Unforward some ports, the response is delivered over stdout in a - // predefined format similar to forwarding. - for _, pair := range portsToUnforward { - err := c.DeletePortMapping(pair.internal, pair.external) - if err != nil { - c.Vlogf("DeletePortMapping() failed: %s\n", err) - fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-unforward %d %d FAIL\n", pair.external, pair.internal) - } else { - c.Vlogf("DeletePortMapping() succeded\n") - fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-unforward %d %d SUCCESS\n", pair.external, pair.internal) - } - os.Stdout.Sync() - } - - // Get the external IP. - if doFetchIP { - ip, err := c.GetExternalIPAddress() - if err != nil { - fmt.Fprintf(os.Stderr, "E: Failed to query the external IP address: %s\n", err) - os.Exit(1) - } - fmt.Fprintf(os.Stderr, "tor-fw-helper: ExternalIPAddress = %s\n", ip) - } - - // List the current mappings. - if doList { - ents, err := c.GetListOfPortMappings() - if err != nil { - fmt.Fprintf(os.Stderr, "E: Failed to query the list of mappings: %s\n", err) - os.Exit(1) - } - fmt.Fprintf(os.Stderr, "tor-fw-helper: Current port forwarding mappings:\n") - if len(ents) == 0 { - fmt.Fprintf(os.Stderr, "tor-fw-helper: No entries found.\n") - } else { - for _, ent := range ents { - fmt.Fprintf(os.Stderr, "tor-fw-helper: %s\n", ent) - } - } - } -} diff --git a/natclient/natclient.go b/natclient/natclient.go index ab3ef61..47a8cd9 100644 --- a/natclient/natclient.go +++ b/natclient/natclient.go @@ -10,9 +10,9 @@ package natclient import ( "fmt" - "github.com/yawning/tor-fw-helper/natclient/base" - "github.com/yawning/tor-fw-helper/natclient/natpmp" - "github.com/yawning/tor-fw-helper/natclient/upnp" + "git.torproject.org/tor-fw-helper.git/natclient/base" + "git.torproject.org/tor-fw-helper.git/natclient/natpmp" + "git.torproject.org/tor-fw-helper.git/natclient/upnp" ) var factories = make(map[string]base.ClientFactory) diff --git a/natclient/natpmp/client.go b/natclient/natpmp/client.go index 966ab01..1a8c7e4 100644 --- a/natclient/natpmp/client.go +++ b/natclient/natpmp/client.go @@ -12,7 +12,7 @@ import ( "net" "syscall" - "github.com/yawning/tor-fw-helper/natclient/base" + "git.torproject.org/tor-fw-helper.git/natclient/base" ) const ( diff --git a/natclient/upnp/client.go b/natclient/upnp/client.go index 352531e..ab7987a 100644 --- a/natclient/upnp/client.go +++ b/natclient/upnp/client.go @@ -9,7 +9,7 @@ package upnp import ( "net" - "github.com/yawning/tor-fw-helper/natclient/base" + "git.torproject.org/tor-fw-helper.git/natclient/base" ) const ( diff --git a/natclient/upnp/ssdp.go b/natclient/upnp/ssdp.go index 06f2147..882cdf1 100644 --- a/natclient/upnp/ssdp.go +++ b/natclient/upnp/ssdp.go @@ -18,7 +18,7 @@ import ( "strings" "time" - "github.com/yawning/tor-fw-helper/natclient/upnp/httpu" + "git.torproject.org/tor-fw-helper.git/natclient/upnp/httpu" ) const ( diff --git a/tor-fw-helper/main.go b/tor-fw-helper/main.go new file mode 100644 index 0000000..f36225d --- /dev/null +++ b/tor-fw-helper/main.go @@ -0,0 +1,226 @@ +/* + * Copyright (c) 2010, Jacob Appelbaum, Steven J. Murdoch. + * Copyright (c) 2010-2013, The Tor Project, Inc. + * Copyright (c) 2014, The Tor Project, Inc. + * See LICENSE for licensing information + */ + +// tor-fw-helper is a tool for opening firewalls with the various NAT traversal +// mechanisms. This tool is designed as a drop in replacement for the orginal +// C language tor-fw-helper, with less hard-to-audit library code, and the use +// of a memory-safe language as design goals. +package main + +import ( + "flag" + "fmt" + "os" + "strconv" + "strings" + + "git.torproject.org/tor-fw-helper.git/natclient" +) + +const ( + // mappingDescr is the default mapping entry name. + mappingDescr = "Tor relay" + + // mappingDuration is the default mapping duration. A value of 0 indicates + // that the protocol implementation's safe default value is used. + mappingDuration = 0 + + versionString = "0.3" +) + +type portPair struct { + internal int + external int +} + +type forwardList []portPair + +func (l *forwardList) String() string { + return fmt.Sprint(*l) +} + +func (l *forwardList) Set(value string) error { + var internal, external int + + split := strings.Split(value, ":") + if len(split) != 2 { + return fmt.Errorf("failed to parse '%s'", value) + } + + // Internal port is required, so handle it first. + tmp, err := strconv.ParseUint(split[1], 10, 16) + if err != nil { + return err + } + internal = int(tmp) + + // External port is optional. + if split[0] == "" { + // If missing, set to the same as internal. + external = internal + } else { + tmp, err := strconv.ParseUint(split[0], 10, 16) + if err != nil { + return err + } + external = int(tmp) + } + + *l = append(*l, portPair{internal, external}) + return nil +} + +func usage() { + fmt.Fprintf(os.Stderr, "%s usage:\n"+ + " [-h|--help]\n"+ + " [-T|--test-commandline]\n"+ + " [-v|--verbose]\n"+ + " [-g|--fetch-public-ip]\n"+ + " [-p|--forward-port ([<external port>]:<internal port>)]\n"+ + " [-d|--unforward-port ([<external port>]:<internal port>]\n"+ + " [-l|--list-ports]\n"+ + " [--protocol NAT-PMP,UPnP]\n", os.Args[0]) + os.Exit(1) +} + +func main() { + doHelp := false + doTest := false + isVerbose := false + doFetchIP := false + doList := false + var portsToForward forwardList + var portsToUnforward forwardList + protocol := "" + + // So, the flag package kind of sucks and doesn't gracefully support the + // concept of aliased flags when printing usage, which results in a + // usage and help output that looks like crap. Fix this by ignoring the + // flag package's built in usage support, and overriding Usage(). + flag.Usage = usage + flag.BoolVar(&doHelp, "help", false, "") + flag.BoolVar(&doHelp, "h", false, "") + flag.BoolVar(&doTest, "test-commandline", false, "") + flag.BoolVar(&doTest, "T", false, "") + flag.BoolVar(&isVerbose, "verbose", false, "") + flag.BoolVar(&isVerbose, "v", false, "") + flag.BoolVar(&doFetchIP, "fetch-public-ip", false, "") + flag.BoolVar(&doFetchIP, "g", false, "") + flag.BoolVar(&doList, "list-ports", false, "") + flag.BoolVar(&doList, "l", false, "") + flag.StringVar(&protocol, "protocol", "", "") + flag.Var(&portsToForward, "forward-port", "") + flag.Var(&portsToForward, "p", "") + flag.Var(&portsToUnforward, "unforward-port", "") + flag.Var(&portsToUnforward, "d", "") + flag.Parse() + + // Extra flag related handling. + if doHelp || flag.NArg() > 0 { + usage() + } + if isVerbose { + // Dump information about how we were invoked. + fmt.Fprintf(os.Stderr, "V: tor-fw-helper version %s\n"+ + "V: We were called with the following arguments:\n"+ + "V: verbose = %v, help = %v, fetch_public_ip = %v, "+ + "list_ports = %v, protocol = '%s'\n", + versionString, isVerbose, doHelp, doFetchIP, doList, protocol) + + if len(portsToForward) > 0 { + fmt.Fprintf(os.Stderr, "V: TCP forwarding:\n") + for _, ent := range portsToForward { + fmt.Fprintf(os.Stderr, "V: External %v, Internal: %v\n", + ent.external, ent.internal) + } + } + if len(portsToUnforward) > 0 { + fmt.Fprintf(os.Stderr, "V: Remove TCP forwarding:\n") + for _, ent := range portsToUnforward { + fmt.Fprintf(os.Stderr, "V: External %v, Internal: %v\n", + ent.external, ent.internal) + } + } + } + if doTest { + // If the app is being called in test mode, dump the command line + // arguments to a file. + // + // TODO: I have no idea why this exists, I'll add this later. + fmt.Fprintf(os.Stderr, "E: --test-commandline not implemented yet\n") + os.Exit(1) + } + if len(portsToForward) == 0 && !doFetchIP && !doList && len(portsToUnforward) == 0 { + // Nothing to do, sad panda. + fmt.Fprintf(os.Stderr, "E: We require a port to be forwarded/unforwarded, "+ + "fetch_public_ip request, or list_ports!\n") + os.Exit(1) + } + + // Discover/Initialize a compatible NAT traversal method. + c, err := natclient.New(protocol, isVerbose) + if err != nil { + fmt.Fprintf(os.Stderr, "E: %s\n", err) + os.Exit(1) + } + defer c.Close() + + // Forward some ports, the response is delivered over stdout in a + // predefined format. + for _, pair := range portsToForward { + err = c.AddPortMapping(mappingDescr, pair.internal, pair.external, mappingDuration) + if err != nil { + c.Vlogf("AddPortMapping() failed: %s\n", err) + fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-forward %d %d FAIL\n", pair.external, pair.internal) + } else { + c.Vlogf("AddPortMapping() succeded\n") + fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-forward %d %d SUCCESS\n", pair.external, pair.internal) + } + os.Stdout.Sync() + } + + // Unforward some ports, the response is delivered over stdout in a + // predefined format similar to forwarding. + for _, pair := range portsToUnforward { + err := c.DeletePortMapping(pair.internal, pair.external) + if err != nil { + c.Vlogf("DeletePortMapping() failed: %s\n", err) + fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-unforward %d %d FAIL\n", pair.external, pair.internal) + } else { + c.Vlogf("DeletePortMapping() succeded\n") + fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-unforward %d %d SUCCESS\n", pair.external, pair.internal) + } + os.Stdout.Sync() + } + + // Get the external IP. + if doFetchIP { + ip, err := c.GetExternalIPAddress() + if err != nil { + fmt.Fprintf(os.Stderr, "E: Failed to query the external IP address: %s\n", err) + os.Exit(1) + } + fmt.Fprintf(os.Stderr, "tor-fw-helper: ExternalIPAddress = %s\n", ip) + } + + // List the current mappings. + if doList { + ents, err := c.GetListOfPortMappings() + if err != nil { + fmt.Fprintf(os.Stderr, "E: Failed to query the list of mappings: %s\n", err) + os.Exit(1) + } + fmt.Fprintf(os.Stderr, "tor-fw-helper: Current port forwarding mappings:\n") + if len(ents) == 0 { + fmt.Fprintf(os.Stderr, "tor-fw-helper: No entries found.\n") + } else { + for _, ent := range ents { + fmt.Fprintf(os.Stderr, "tor-fw-helper: %s\n", ent) + } + } + } +}

1 0

[tor/master] Write a bunch more test for doc/WritingTests
by nickm＠torproject.org 05 Aug '15

05 Aug '15

commit 9338847bf427b59d6dd5634fc2f8998ce0e269c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 5 11:47:38 2015 -0400 Write a bunch more test for doc/WritingTests --- doc/WritingTests.txt | 128 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 117 insertions(+), 11 deletions(-) diff --git a/doc/WritingTests.txt b/doc/WritingTests.txt index b0f8722..62a17e3 100644 --- a/doc/WritingTests.txt +++ b/doc/WritingTests.txt @@ -32,25 +32,97 @@ set STEM_SOURCE_DIR to the checkout, and run "make test-stem". To run the Chutney tests as well, fetch chutney from the git repository, set CHUTNEY_PATH to the checkout, and run "make test-network". +To run all of the above, run "make test-full". + +To run all of the above, plus tests that require a working connection to the +internet, run "make test-full-online". + === Running particular subtests -XXXX WRITEME +The Tor unit tests are divided into separate programs and a couple of +bundled unit test programs. + +Separate programs are easy. For example, to run the memwipe tests in +isolation, you just run ./src/test/test-memwipe . + +To run tests within the unit test programs, you can specify the name +of the test. The string ".." can be used as a wildcard at the end of the +test name. For example, to run all the cell format tests, enter +"./src/test/test cellfmt/..". To run + +Many tests that need to mess with global state run in forked subprocesses in +order to keep from contaminating one another. But when debugging a failing test, +you might want to run it without forking a subprocess. To do so, use the +"--no-fork" option with a single test. (If you specify it along with +multiple tests, they might interfere.) + +You can turn on logging in the unit tests by passing one of "--debug", +"--info", "--notice", or "--warn". By default only errors are displayed. + +Unit tests are divided into "./src/test/test" and "./src/test/test-slow". +The former are those that should finish in a few seconds; the latter tend to +take more time, and may include CPU-intensive operations, deliberate delays, +and stuff like that. === Finding test coverage When you configure Tor with the --enable-coverage option, it should build with support for coverage in the unit tests, and in a special -"tor-cov" binary. If you launch +"tor-cov" binary. + +Then, run the tests you'd like to see coverage from. If you have old +coverage output, you may need to run "reset-gcov" first. + +Now you've got a bunch of files scattered around your build directories +called "*.gcda". In order to extract the coverage output from them, make a +temporary directory for them and run "./scripts/test/coverage ${TMPDIR}", +where ${TMPDIR} is the temporary directory you made. This will create a +".gcov" file for each source file under tests, containing that file's source +annotated with the number of times the tests hit each line. (You'll need to +have gcov installed.) + +You can get a summary of the test coverage for each file by running +"./scripts/test/cov-display ${TMPDIR}/*" . Each line lists the file's name, +the number of uncovered lines, the number of uncovered lines, and the +coverage percentage. + +For a summary of the test coverage for each _function_, run +"./scripts/test/cov-display -f ${TMPDIR}/*" . + +=== Comparing test coverage + +Sometimes it's useful to compare test coverage for a branch you're writing to +coverage from another branch (such as git master, for example). But you +can't run "diff" on the two coverage outputs directly, since the actual +number of times each line is executed aren't so important, and aren't wholly +deterministic. + +Instead, follow the instructions above for each branch, creating a separate +temporary directory for each. Then, run "./scripts/test/cov-diff ${D1} +${D2}", where D1 and D2 are the directories you want to compare. This will +produce a diff of the two directories, with all lines normalized to be either +covered or uncovered. + +To count new or modified uncovered lines in D2, you can run: + + "./scripts/test/cov-diff ${D1} ${D2}" | grep '^+ *\#' |wc -l -XXXX "make test-network" doesn't know about "tor-cov"; you don't get -XXXX coverage from that yet, unless you do "cp src/or/tor-cov -XXXX src/or/tor" before you run it. What kinds of test should I write? ---------------------------------- -XXXX writeme. +Integration testing and unit testing are complementary: it's probably a +good idea to make sure that your code is hit by both if you can. + +If your code is very-low level, and its behavior is easily described in +terms of a relation between inputs and outputs, or a set of state +transitions, then it's a natural fit for unit tests. (If not, please +consider refactoring it until most of it _is_ a good fit for unit +tests!) +If your code adds new externally visible functionality to Tor, it would +be great to have a test for that functionality. That's where +integration tests more usually come in. Unit and regression tests: Does this function do what it's supposed to? ----------------------------------------------------------------------- @@ -117,7 +189,7 @@ Sometimes you need to test a function, but you don't want to expose it outside its usual module. To support this, Tor's build system compiles a testing version of -teach module, with extra identifiers exposed. If you want to +each module, with extra identifiers exposed. If you want to declare a function as static but available for testing, use the macro "STATIC" instead of "static". Then, make sure there's a macro-protected declaration of the function in the module's header. @@ -134,13 +206,47 @@ CRYPTO_CURVE25519_PRIVATE, so they can see this declaration. === Mock functions for testing in isolation -Often we want to test that a function works right, but the function depends -on other functions whose behavior is hard to observe, or whose +Often we want to test that a function works right, but the function to +be tested depends on other functions whose behavior is hard to observe, +or which require a working Tor network, or something like that. -XXXX WRITEME +To write tests for this case, you can replace the underlying functions +with testing stubs while your unit test is running. You need to declare +the underlying function as 'mockable', as follows: -=== Advanced techniques: Namespaces + MOCK_DECL(returntype, functionname, (argument list)); + +and then later implement it as: + + MOCK_IMPL(returntype, functionname, (argument list)) + { + /* implementation here */ + } + +For example, if you had a 'connect to remote server' function, you could +declare it as: + + + MOCK_DECL(int, connect_to_remote, (const char *name, status_t *status)); +When you declare a function this way, it will be declared as normal in +regular builds, but when the module is built for testing, it is declared +as a function pointer initialized to the actual implementation. + +In your tests, if you want to override the function with a temporary +replacement, you say: + + MOCK(functionname, replacement_function_name); + +And later, you can restore the original function with: + + UNMOCK(functionname); + +For more information, see the definitions of this mocking logic in +testsupport.h. + + +=== Advanced techniques: Namespaces XXXX write this. danah boyd made us some really awesome stuff here.

1 0

[tor/master] Allow cov-display to take directories as arguments
by nickm＠torproject.org 05 Aug '15

05 Aug '15

commit ebff18d18eb5fa93a82b19af95c65a36fd3a841d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 5 11:06:41 2015 -0400 Allow cov-display to take directories as arguments --- scripts/test/cov-display | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/test/cov-display b/scripts/test/cov-display index 6c3bbd5..4628cd5 100755 --- a/scripts/test/cov-display +++ b/scripts/test/cov-display @@ -1,5 +1,5 @@ #!/usr/bin/python -import sys, re +import sys, re, os none0, some0 = 0,0 branchTaken0, branchNot0 = 0,0 @@ -20,7 +20,16 @@ def show(name, none, some): none = 1 print name, none, some, "%.02f"%(100*(float(some)/(some+none))) -for fn in sys.argv[1:]: + +file_args = sys.argv[1:] +files = [] +for fn in file_args: + if os.path.isdir(fn): + files.extend(os.path.join(fn, f) for f in os.listdir(fn)) + else: + files.append(fn) + +for fn in files: none = some = branchTaken = branchNot = 0 inFunc = "" for line in open(fn, 'r'):

1 0

[stem/master] Remove python3 argument from the help message
by atagar＠torproject.org 05 Aug '15

05 Aug '15

commit 1d6e4896d1b05a264816424b095d6d6c6a44601b Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Jul 24 14:23:55 2015 +0200 Remove python3 argument from the help message Functionality behind this argument was removed in e8ce90be6b3aa0dcf2c7b960561ac185d49db3bb. --- test/settings.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/test/settings.cfg b/test/settings.cfg index fe0468c..0b050d5 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -38,7 +38,6 @@ msg.help | -i, --integ runs integration tests | -t, --target TARGET comma separated list of extra targets for integ tests | --test TEST_NAME only run tests modules containing the given name -| --python3 runs tests against a 2to3 conversion of the codebase | -l, --log RUNLEVEL includes logging output with test results, runlevels: | TRACE, DEBUG, INFO, NOTICE, WARN, ERROR | --tor PATH custom tor binary to run testing against

1 0

[tor/master] Let's try to get test_workqueue working on windows
by nickm＠torproject.org 05 Aug '15

05 Aug '15

commit 1d63ecbed0c8416eeed9d1f278422dc1edbea8ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 5 10:34:46 2015 -0400 Let's try to get test_workqueue working on windows --- changes/test-workqueue-windows | 3 +++ src/test/test_workqueue.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/test-workqueue-windows b/changes/test-workqueue-windows new file mode 100644 index 0000000..8d7b7f6 --- /dev/null +++ b/changes/test-workqueue-windows @@ -0,0 +1,3 @@ + o Testing: + - Make the test-workqueue test work on windows by initializing the + network before we begin. diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c index a1a9488..7f20642 100644 --- a/src/test/test_workqueue.c +++ b/src/test/test_workqueue.c @@ -369,6 +369,7 @@ main(int argc, char **argv) } init_logging(1); + network_init(); crypto_global_init(1, NULL, NULL); crypto_seed_rng();

1 0

[tor-browser-spec/master] Android Java calls added
by mikeperry＠torproject.org 04 Aug '15

04 Aug '15

commit 55a79bd26aea36666dec4e62c42e8977b8d55937 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Tue Jun 30 17:12:20 2015 -0400 Android Java calls added --- audits/FF38_NETWORK_AUDIT | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/audits/FF38_NETWORK_AUDIT b/audits/FF38_NETWORK_AUDIT index 8b84994..e6e0ce2 100644 --- a/audits/FF38_NETWORK_AUDIT +++ b/audits/FF38_NETWORK_AUDIT @@ -296,3 +296,18 @@ Misc XPCOM: + Only exception seems to be if an RtspMediaResource could be used, but this appears to be FxOS-only. + XXX: Note for FxOS tor support. This may be an issue. + +Android Java calls: + + Uses HttpURLConnection: + + mobile/android/base/CrashReporter.java + + mobile/android/base/SuggestClient.java + + mobile/android/base/distribution/Distribution.java + + Uses org.apache.http.client.* + + mobile/android/base/favicons/LoadFaviconTask.java + + Uses ch.boye.httpclientandroidlib.impl.client.*: + + mobile/android/base/sync/net/BaseResource.java + + mobile/android/base/CrashReporter.java + + mobile/android/base/SuggestClient.java + + mobile/android/base/distribution/Distribution.java + + mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java + + mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug #13749.2: Regression tests for first-party isolation of cache
by mikeperry＠torproject.org 04 Aug '15

04 Aug '15

commit 7a73984f8e8f394417d850284578f2b97fed6120 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jul 13 16:14:56 2015 -0700 fixup! Bug #13749.2: Regression tests for first-party isolation of cache --- netwerk/test/browser/browser.ini | 2 ++ netwerk/test/browser/browser_cacheFirstParty.js | 2 +- netwerk/test/browser/thirdPartyChild.iframe.html | 1 + netwerk/test/browser/thirdPartyChild.worker.js | 3 +++ netwerk/test/browser/thirdPartyChild.worker.xhr.html | 8 ++++++++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/netwerk/test/browser/browser.ini b/netwerk/test/browser/browser.ini index aaf0def..ca711b7 100644 --- a/netwerk/test/browser/browser.ini +++ b/netwerk/test/browser/browser.ini @@ -10,6 +10,8 @@ support-files = thirdPartyChild.embed.png thirdPartyChild.img.png thirdPartyChild.object.png + thirdPartyChild.worker.js + thirdPartyChild.worker.xhr.html thirdPartyChild.xhr.html thirdPartyChild.track.vtt diff --git a/netwerk/test/browser/browser_cacheFirstParty.js b/netwerk/test/browser/browser_cacheFirstParty.js index 9795539..c23f669 100644 --- a/netwerk/test/browser/browser_cacheFirstParty.js +++ b/netwerk/test/browser/browser_cacheFirstParty.js @@ -106,7 +106,7 @@ let privacyPref = "privacy.thirdparty.isolate", // We will check cache for example.net content from // iframe, link, script, img, object, embed, xhr, audio, video, track suffixes = ["iframe.html", "link.css", "script.js", "img.png", "object.png", - "embed.png", "xhr.html", "audio.ogg", "video.ogv", "track.vtt" ]; + "embed.png", "xhr.html", "worker.xhr.html", "audio.ogg", "video.ogv", "track.vtt" ]; // __checkCachePopulation(pref, numberOfDomains)__. // Check if the number of entries found in the cache for each diff --git a/netwerk/test/browser/thirdPartyChild.iframe.html b/netwerk/test/browser/thirdPartyChild.iframe.html index f7b7531..bbd6043 100644 --- a/netwerk/test/browser/thirdPartyChild.iframe.html +++ b/netwerk/test/browser/thirdPartyChild.iframe.html @@ -8,6 +8,7 @@ var xhr = new XMLHttpRequest(); xhr.open("GET", "http://example.net/browser/netwerk/test/browser/thirdPartyChild.xhr.html", true); xhr.send(); + var worker = new Worker("http://example.net/browser/netwerk/test/browser/thirdPartyChild.worker.js"); </script> </body> </html> diff --git a/netwerk/test/browser/thirdPartyChild.worker.js b/netwerk/test/browser/thirdPartyChild.worker.js new file mode 100644 index 0000000..49154b7 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.worker.js @@ -0,0 +1,3 @@ +var xhr = new XMLHttpRequest(); +xhr.open("GET", "http://example.net/browser/netwerk/test/browser/thirdPartyChild.worker.xhr.…", true); +xhr.send(); diff --git a/netwerk/test/browser/thirdPartyChild.worker.xhr.html b/netwerk/test/browser/thirdPartyChild.worker.xhr.html new file mode 100644 index 0000000..1f18646 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.worker.xhr.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + +<body> +<div>thirdPartyChild.worker.xhr.html</div> +</body> +</html>

1 0