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

[tor/master] test.c: Try to create a more random temporary directory for our workspace (re: Bug#8638)
by nickm＠torproject.org 05 Apr '13

05 Apr '13

commit d1dc23c9386c6c85ec50c5b4d0a9077ffcb78683 Author: Peter Palfrader <peter(a)palfrader.org> Date: Thu Apr 4 18:05:14 2013 +0200 test.c: Try to create a more random temporary directory for our workspace (re: Bug#8638) --- changes/bug8638 | 3 +++ src/test/test.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/bug8638 b/changes/bug8638 new file mode 100644 index 0000000..3a790e5 --- /dev/null +++ b/changes/bug8638 @@ -0,0 +1,3 @@ + o Minor features + In our testsuite, create temporary directories with a bit more entropy + in their name to make name collissions less likely. Fixes bug 8638. diff --git a/src/test/test.c b/src/test/test.c index d3d3bd5..0b55f7b 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -88,8 +88,14 @@ setup_directory(void) { static int is_setup = 0; int r; + char rnd[256], rnd32[256]; if (is_setup) return; +/* Due to base32 limitation needs to be a multiple of 5. */ +#define RAND_PATH_BYTES 5 + crypto_rand(rnd, RAND_PATH_BYTES); + base32_encode(rnd32, sizeof(rnd32), rnd, RAND_PATH_BYTES); + #ifdef _WIN32 { char buf[MAX_PATH]; @@ -98,11 +104,11 @@ setup_directory(void) if (!GetTempPathA(sizeof(buf),buf)) tmp = "c:\\windows\\temp"; tor_snprintf(temp_dir, sizeof(temp_dir), - "%s\\tor_test_%d", tmp, (int)getpid()); + "%s\\tor_test_%d_%s", tmp, (int)getpid(), rnd32); r = mkdir(temp_dir); } #else - tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d", (int) getpid()); + tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d_%s", (int) getpid(), rnd32); r = mkdir(temp_dir, 0700); #endif if (r) { @@ -2094,6 +2100,7 @@ main(int c, const char **v) return 1; } crypto_set_tls_dh_prime(NULL); + crypto_seed_rng(1); rep_hist_init(); network_init(); setup_directory(); @@ -2106,8 +2113,6 @@ main(int c, const char **v) return 1; } - crypto_seed_rng(1); - atexit(remove_directory); have_failed = (tinytest_main(c, v, testgroups) != 0);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 05 Apr '13

05 Apr '13

commit 55817c4c5065a7689e17c329b3f4695b6d888220 Merge: b349f09 d1dc23c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 5 16:53:07 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8638 | 3 +++ src/test/test.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.4] test.c: Try to create a more random temporary directory for our workspace (re: Bug#8638)
by nickm＠torproject.org 05 Apr '13

05 Apr '13

commit d1dc23c9386c6c85ec50c5b4d0a9077ffcb78683 Author: Peter Palfrader <peter(a)palfrader.org> Date: Thu Apr 4 18:05:14 2013 +0200 test.c: Try to create a more random temporary directory for our workspace (re: Bug#8638) --- changes/bug8638 | 3 +++ src/test/test.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/bug8638 b/changes/bug8638 new file mode 100644 index 0000000..3a790e5 --- /dev/null +++ b/changes/bug8638 @@ -0,0 +1,3 @@ + o Minor features + In our testsuite, create temporary directories with a bit more entropy + in their name to make name collissions less likely. Fixes bug 8638. diff --git a/src/test/test.c b/src/test/test.c index d3d3bd5..0b55f7b 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -88,8 +88,14 @@ setup_directory(void) { static int is_setup = 0; int r; + char rnd[256], rnd32[256]; if (is_setup) return; +/* Due to base32 limitation needs to be a multiple of 5. */ +#define RAND_PATH_BYTES 5 + crypto_rand(rnd, RAND_PATH_BYTES); + base32_encode(rnd32, sizeof(rnd32), rnd, RAND_PATH_BYTES); + #ifdef _WIN32 { char buf[MAX_PATH]; @@ -98,11 +104,11 @@ setup_directory(void) if (!GetTempPathA(sizeof(buf),buf)) tmp = "c:\\windows\\temp"; tor_snprintf(temp_dir, sizeof(temp_dir), - "%s\\tor_test_%d", tmp, (int)getpid()); + "%s\\tor_test_%d_%s", tmp, (int)getpid(), rnd32); r = mkdir(temp_dir); } #else - tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d", (int) getpid()); + tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d_%s", (int) getpid(), rnd32); r = mkdir(temp_dir, 0700); #endif if (r) { @@ -2094,6 +2100,7 @@ main(int c, const char **v) return 1; } crypto_set_tls_dh_prime(NULL); + crypto_seed_rng(1); rep_hist_init(); network_init(); setup_directory(); @@ -2106,8 +2113,6 @@ main(int c, const char **v) return 1; } - crypto_seed_rng(1); - atexit(remove_directory); have_failed = (tinytest_main(c, v, testgroups) != 0);

1 0

[stem/master] Improving error message when get_system_tor_version() can't find tor
by atagar＠torproject.org 05 Apr '13

05 Apr '13

commit 95e9d663796a49fdc2427c7b70fe5f557b0e2cb3 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 5 09:02:59 2013 -0700 Improving error message when get_system_tor_version() can't find tor When tor is unavailable the error output from get_system_tor_version() is pretty sucky... Traceback (most recent call last): File "./run_tests.py", line 525, in <module> our_version = stem.version.get_system_tor_version(CONFIG["argument.tor"]) File "/home/atagar/stem/stem/version.py", line 84, in get_system_tor_version raise IOError(exc) IOError: [Errno 2] No such file or directory Making it more developer friendly. --- stem/version.py | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/stem/version.py b/stem/version.py index fa0c0fe..cef5487 100644 --- a/stem/version.py +++ b/stem/version.py @@ -55,6 +55,7 @@ easily parsed and compared, for instance... ===================================== =========== """ +import os import re import stem.util.enum @@ -77,10 +78,19 @@ def get_system_tor_version(tor_cmd = "tor"): """ if not tor_cmd in VERSION_CACHE: + version_cmd = "%s --version" % tor_cmd + try: - version_cmd = "%s --version" % tor_cmd version_output = stem.util.system.call(version_cmd) except OSError, exc: + # make the error message nicer if this is due to tor being unavialable + + if "No such file or directory" in str(exc): + if os.path.isabs(tor_cmd): + exc = "Unable to check tor's version. '%s' doesn't exist." % tor_cmd + else: + exc = "Unable to run '%s'. Mabye tor isn't in your PATH?" % version_cmd + raise IOError(exc) if version_output:

1 0

[stem/master] Skipping test_get_pid_by_port when connection resolvers are unavailable
by atagar＠torproject.org 05 Apr '13

05 Apr '13

commit 5879995bf9118792a9c27376a93361e779ec4fc2 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 5 09:19:48 2013 -0700 Skipping test_get_pid_by_port when connection resolvers are unavailable Our jenkins setup revealed that when netstat, sockstat, and lsof are all unavailable test_get_pid_by_port fails. Skipping instead since those connection resolvers are dependencies for the test. --- test/integ/util/system.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 7ad046d..2c2bc5d 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -222,6 +222,11 @@ class TestSystem(unittest.TestCase): elif not runner.is_ptraceable(): test.runner.skip(self, "(DisableDebuggerAttachment is set)") return + elif not (stem.util.system.is_available("netstat") or + stem.util.system.is_available("sockstat") or + stem.util.system.is_available("lsof")): + test.runner.skip(self, "(connection resolvers unavailable)") + return tor_pid, tor_port = runner.get_pid(), test.runner.CONTROL_PORT self.assertEquals(tor_pid, stem.util.system.get_pid_by_port(tor_port))

1 0

[stem/master] Still passing when tor's stime is zero
by atagar＠torproject.org 05 Apr '13

05 Apr '13

commit f5971e1da626425062d8922a35b7b87447faa238 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 5 08:47:34 2013 -0700 Still passing when tor's stime is zero The stime proc field is an integer, rounded down to the number of seconds that a process has been running. On my piddly little netbook tor takes long enough to start that this is always non-zero, but on our jenkins systems it's so quick that the test fails. Thanks to weasel for all of the help! --- test/integ/util/proc.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/integ/util/proc.py b/test/integ/util/proc.py index 4fabfe9..24bb805 100644 --- a/test/integ/util/proc.py +++ b/test/integ/util/proc.py @@ -70,7 +70,7 @@ class TestProc(unittest.TestCase): self.assertEquals('tor', command) self.assertTrue(float(utime) > 0) - self.assertTrue(float(stime) > 0) + self.assertTrue(float(stime) >= 0) self.assertTrue(float(start_time) > proc.get_system_start_time()) def test_get_connections(self):

1 0

[flashproxy/master] Use global regexp when quoting quotes in repr.
by dcf＠torproject.org 05 Apr '13

05 Apr '13

commit d969b8d7a9b83943476eca93b9a5146444157203 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Apr 5 08:37:19 2013 -0700 Use global regexp when quoting quotes in repr. --- proxy/flashproxy.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 441b511..56c1f0e 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -902,7 +902,7 @@ function Badge() { } function quote(s) { - return "\"" + s.replace(/([\\\"])/, "\\$1") + "\""; + return "\"" + s.replace(/([\\\"])/g, "\\$1") + "\""; } function maybe_quote(s) {

1 0

[torbrowser/maint-2.4] update recommended-versions
by erinn＠torproject.org 05 Apr '13

05 Apr '13

commit 54d74d5a3b100708bb40daf8c7102c709bd550cd Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 5 00:56:36 2013 -0400 update recommended-versions --- build-scripts/recommended-versions | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index caa37a5..09129d2 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,8 +1,8 @@ [ -"2.3.25-5-MacOS", -"2.3.25-5-Windows", -"2.3.25-5-Linux", -"2.4.11-alpha-1-MacOS", -"2.4.11-alpha-1-Windows", -"2.4.11-alpha-1-Linux" +"2.3.25-6-MacOS", +"2.3.25-6-Windows", +"2.3.25-6-Linux", +"2.4.11-alpha-2-MacOS", +"2.4.11-alpha-2-Windows", +"2.4.11-alpha-2-Linux" ]

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 05 Apr '13

05 Apr '13

commit 802e620cdc78a16cfb68c2ae43e56e87254d83fb Merge: 71ff1a2 54d74d5 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 5 00:56:49 2013 -0400 Merge branch 'maint-2.4' build-scripts/recommended-versions | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)

1 0

[torbrowser/master] update recommended-versions
by erinn＠torproject.org 05 Apr '13

05 Apr '13

commit 54d74d5a3b100708bb40daf8c7102c709bd550cd Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 5 00:56:36 2013 -0400 update recommended-versions --- build-scripts/recommended-versions | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index caa37a5..09129d2 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,8 +1,8 @@ [ -"2.3.25-5-MacOS", -"2.3.25-5-Windows", -"2.3.25-5-Linux", -"2.4.11-alpha-1-MacOS", -"2.4.11-alpha-1-Windows", -"2.4.11-alpha-1-Linux" +"2.3.25-6-MacOS", +"2.3.25-6-Windows", +"2.3.25-6-Linux", +"2.4.11-alpha-2-MacOS", +"2.4.11-alpha-2-Windows", +"2.4.11-alpha-2-Linux" ]

1 0