July 2014 - tor-commits - lists.torproject.org

[tor/master] add changes file for 12503
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 7bc7188fc94f6662690e07039b4e01dd8a92cdbc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 16 09:52:37 2014 +0200 add changes file for 12503 --- changes/bug12503 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug12503 b/changes/bug12503 new file mode 100644 index 0000000..ff96fa2 --- /dev/null +++ b/changes/bug12503 @@ -0,0 +1,3 @@ + o Testing: + - Fix and re-enable the fgets_eagain unit test. Fixes bug 12503; + bugfix on 0.2.3.1-alpha. Patch from "cypherpunks."

1 0

[tor/master] Fixed fgets_eagain unit test.
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 61507417919d88eb7ee2e3fc877f751be2a6bfa3 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Jul 16 09:50:09 2014 +0200 Fixed fgets_eagain unit test. On a non-blocking pipe fgets sets EAGAIN when it encounters partial lines. No error is set on full lines or EOF. EOF is reached when the writing end of the pipe is closed. Partial lines and full lines are both returned by fgets, EOF results in NULL. Mention of this behaviour can be found in #1903 and #2045. --- src/test/test_util.c | 45 +++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 86ff747..cf116ef 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2447,8 +2447,9 @@ test_util_exit_status(void *ptr) #endif #ifndef _WIN32 -/** Check that fgets waits until a full line, and not return a partial line, on - * a EAGAIN with a non-blocking pipe */ +/* Check that fgets with a non-blocking pipe returns partial lines and sets + * EAGAIN, returns full lines and sets no error, and returns NULL on EOF and + * sets no error */ static void test_util_fgets_eagain(void *ptr) { @@ -2457,17 +2458,19 @@ test_util_fgets_eagain(void *ptr) ssize_t retlen; char *retptr; FILE *test_stream = NULL; - char buf[10]; + char buf[4] = { 0 }; (void)ptr; + errno = 0; + /* Set up a pipe to test on */ retval = pipe(test_pipe); - tt_int_op(retval, >=, 0); + tt_int_op(retval, ==, 0); /* Set up the read-end to be non-blocking */ retval = fcntl(test_pipe[0], F_SETFL, O_NONBLOCK); - tt_int_op(retval, >=, 0); + tt_int_op(retval, ==, 0); /* Open it as a stdio stream */ test_stream = fdopen(test_pipe[0], "r"); @@ -2477,51 +2480,69 @@ test_util_fgets_eagain(void *ptr) retlen = write(test_pipe[1], "A", 1); tt_int_op(retlen, ==, 1); retptr = fgets(buf, sizeof(buf), test_stream); - tt_want(retptr == NULL); tt_int_op(errno, ==, EAGAIN); + tt_ptr_op(retptr, ==, buf); + tt_str_op(buf, ==, "A"); + errno = 0; /* Send in the rest */ retlen = write(test_pipe[1], "B\n", 2); tt_int_op(retlen, ==, 2); retptr = fgets(buf, sizeof(buf), test_stream); + tt_int_op(errno, ==, 0); tt_ptr_op(retptr, ==, buf); - tt_str_op(buf, ==, "AB\n"); + tt_str_op(buf, ==, "B\n"); + errno = 0; /* Send in a full line */ retlen = write(test_pipe[1], "CD\n", 3); tt_int_op(retlen, ==, 3); retptr = fgets(buf, sizeof(buf), test_stream); + tt_int_op(errno, ==, 0); tt_ptr_op(retptr, ==, buf); tt_str_op(buf, ==, "CD\n"); + errno = 0; /* Send in a partial line */ retlen = write(test_pipe[1], "E", 1); tt_int_op(retlen, ==, 1); retptr = fgets(buf, sizeof(buf), test_stream); - tt_ptr_op(retptr, ==, NULL); tt_int_op(errno, ==, EAGAIN); + tt_ptr_op(retptr, ==, buf); + tt_str_op(buf, ==, "E"); + errno = 0; /* Send in the rest */ retlen = write(test_pipe[1], "F\n", 2); tt_int_op(retlen, ==, 2); retptr = fgets(buf, sizeof(buf), test_stream); + tt_int_op(errno, ==, 0); tt_ptr_op(retptr, ==, buf); - tt_str_op(buf, ==, "EF\n"); + tt_str_op(buf, ==, "F\n"); + errno = 0; /* Send in a full line and close */ retlen = write(test_pipe[1], "GH", 2); tt_int_op(retlen, ==, 2); retval = close(test_pipe[1]); - test_pipe[1] = -1; tt_int_op(retval, ==, 0); + test_pipe[1] = -1; retptr = fgets(buf, sizeof(buf), test_stream); + tt_int_op(errno, ==, 0); tt_ptr_op(retptr, ==, buf); tt_str_op(buf, ==, "GH"); + errno = 0; /* Check for EOF */ retptr = fgets(buf, sizeof(buf), test_stream); + tt_int_op(errno, ==, 0); tt_ptr_op(retptr, ==, NULL); - tt_int_op(feof(test_stream), >, 0); + retval = feof(test_stream); + tt_int_op(retval, !=, 0); + errno = 0; + + /* Check that buf is unchanged according to C99 and C11 */ + tt_str_op(buf, ==, "GH"); done: if (test_stream != NULL) @@ -3782,7 +3803,7 @@ struct testcase_t util_tests[] = { #endif #ifndef _WIN32 UTIL_TEST(exit_status, 0), - UTIL_TEST(fgets_eagain, TT_SKIP), + UTIL_TEST(fgets_eagain, 0), #endif UTIL_TEST(spawn_background_ok, 0), UTIL_TEST(spawn_background_fail, 0),

1 0

[bridgedb/develop] Fix test suite for bridgedb.scheduled.Unscheduled
by isis＠torproject.org 16 Jul '14

16 Jul '14

commit a9e65a0c9c3e40359731b6fe3408e068f9c1501a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Jul 15 04:04:46 2014 -0400 Fix test suite for bridgedb.scheduled.Unscheduled Previously, the test suite checked only that Unscheduled.getInterval would return a particular value when invoked with no argument. Now, the test suite checks the only property of Unscheduled.getInterval that its callers rely on: that it returns the same string regardless of which time is passed in to it. --- lib/bridgedb/test/test_schedule.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/test/test_schedule.py b/lib/bridgedb/test/test_schedule.py index 24c45ef..178e3e4 100644 --- a/lib/bridgedb/test/test_schedule.py +++ b/lib/bridgedb/test/test_schedule.py @@ -36,10 +36,21 @@ class UnscheduledTests(unittest.TestCase): self.assertIsInstance(time, int) self.assertEquals(time, -62135596800) - def test_Unscheduled_getInterval_noargs(self): - time = self.sched.getInterval() - self.assertIsInstance(time, str) - self.assertEquals(time, "1970-01-01 00:00:00") + def test_Unscheduled_getInterval_is_constant(self): + import time + now = time.time() + + interval_default = self.sched.getInterval() + self.assertIsInstance(interval_default, str) + + interval_zero = self.sched.getInterval(0) + self.assertIsInstance(interval_zero, str) + + interval_now = self.sched.getInterval(now) + self.assertIsInstance(interval_now, str) + + self.assertEquals(interval_default, interval_zero) + self.assertEquals(interval_default, interval_now) def test_Unscheduled_nextIntervalStarts_noargs(self): time = self.sched.nextIntervalStarts()

1 0

[bridgedb/develop] Fix bug shown in test_Unscheduled_getInterval_is_constant() unittest.
by isis＠torproject.org 16 Jul '14

16 Jul '14

commit a7551e22cc141d48bd7498afcc07d4378c0c0fcc Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jul 16 04:13:30 2014 +0000 Fix bug shown in test_Unscheduled_getInterval_is_constant() unittest. * FIXES an additional problem for #12147 pointed out by Robert Ransom's `bridgedb.test.test_Unscheduled_getInterval_is_constant()` unittest. --- lib/bridgedb/schedule.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/schedule.py b/lib/bridgedb/schedule.py index 6cef1a6..930f2e7 100644 --- a/lib/bridgedb/schedule.py +++ b/lib/bridgedb/schedule.py @@ -91,6 +91,10 @@ class Unscheduled(object): def getInterval(self, when=0): """Get the interval that contains the time **when**. + .. note: We explicitly ignore the ``when`` parameter in this + implementation because if something is Unscheduled then + all timestamps should reside within the same period. + :param int when: The time which we're trying to find the corresponding interval for. :rtype: str @@ -98,8 +102,9 @@ class Unscheduled(object): specificity depends on what type of interval we're using. For example, if using ``"month"``, the return value would be something like ``"2013-12"``. + """ - return fromUnixSeconds(when).strftime('%04Y-%02m-%02d %02H:%02M:%02S') + return fromUnixSeconds(0).strftime('%04Y-%02m-%02d %02H:%02M:%02S') def nextIntervalStarts(self, when=0): """Return the start time of the interval starting _after_ when.

1 0

[bridgedb/develop] Merge branch 'rransom/fix/12147-schedule-unittest' into develop
by isis＠torproject.org 16 Jul '14

16 Jul '14

commit 91142d6c02aa7304d03d768c076aea1ad230db53 Merge: 024c978 a7551e2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jul 16 06:52:29 2014 +0000 Merge branch 'rransom/fix/12147-schedule-unittest' into develop lib/bridgedb/schedule.py | 7 ++++++- lib/bridgedb/test/test_schedule.py | 19 +++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-)

1 0

[tor-browser-bundle/master] Unset TOR_CONTROL_PASSWD in setControlPassword() if autoset to '"secret"'.
by gk＠torproject.org 16 Jul '14

16 Jul '14

commit 798f147f44ff80d2104ed3b0162f17198dd2a4f2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jul 16 02:33:00 2014 +0000 Unset TOR_CONTROL_PASSWD in setControlPassword() if autoset to '"secret"'. * FIXES #12624, a bug caused by the TOR_CONTROL_PASSWD being by default set to '"secret"' in the example, and then mistakenly not unset in the setControlPasswd() function. --- RelativeLink/RelativeLink.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 4e6b7bb..e75482a 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -220,7 +220,12 @@ export LD_LIBRARY_PATH function setControlPortPasswd() { local ctrlPasswd=$1 - test -z "$ctrlPasswd" -o "$ctrlPasswd" = $'\"secret\"' && return + + if test -z "$ctrlPasswd" -o "$ctrlPasswd" = $'\"secret\"' ; then + unset TOR_CONTROL_PASSWD + return + fi + if test "${ctrlPasswd:0:1}" = $'\"'; then # First 2 chars were '" printf "Using system Tor process.\n" export TOR_CONTROL_PASSWD

1 0

r26874: {website} Fix homebrew link (#10141) (website/trunk/docs/en)
by Matt Pagan 15 Jul '14

15 Jul '14

Author: mttp Date: 2014-07-16 01:32:05 +0000 (Wed, 16 Jul 2014) New Revision: 26874 Modified: website/trunk/docs/en/tor-doc-osx.wml Log: Fix homebrew link (#10141) Modified: website/trunk/docs/en/tor-doc-osx.wml =================================================================== --- website/trunk/docs/en/tor-doc-osx.wml 2014-07-15 12:35:21 UTC (rev 26873) +++ website/trunk/docs/en/tor-doc-osx.wml 2014-07-16 01:32:05 UTC (rev 26874) @@ -26,7 +26,7 @@ - The advanced Tor without any graphical user interface can be installed using <a href="http://mxcl.github.com/homebrew">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm>">arm</a>, a command-line Tor monitor and alternative to the Vidalia GUI. + The advanced Tor without any graphical user interface can be installed using <a href="http://brew.sh">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm>">arm</a>, a command-line Tor monitor and alternative to the Vidalia GUI. If you don't have Homebrew installed, open a terminal window and run:

1 0

[tor-browser-bundle/maint-3.6] Update gitian tag (to use tar instead of rsync).
by mikeperry＠torproject.org 15 Jul '14

15 Jul '14

commit 7bdb7f0df642f0613dc0096d3f37f3efd61d212a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 15 16:26:08 2014 -0700 Update gitian tag (to use tar instead of rsync). --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index b8155a7..37a0d66 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,7 +23,7 @@ FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1h GMP_VER=5.1.3 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5ad3b82..4906e1c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -22,7 +22,7 @@ LIBFTE_TAG=0.0.2 FTEPROXY_TAG=0.2.14 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 diff --git a/gitian/versions.beta b/gitian/versions.beta index 5a9f2b8..c76acde 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -23,7 +23,7 @@ FTEPROXY_TAG=b5d7fba5c505907693fd2b5321f2aa57d4390cfa # tag 0.2.14 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a88421b..e19ebdc 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -23,7 +23,7 @@ FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Update gitian tag (to use tar instead of rsync).
by mikeperry＠torproject.org 15 Jul '14

15 Jul '14

commit 3caa9489db34c573460ed79e2b613b54ebfd0933 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 15 16:24:34 2014 -0700 Update gitian tag (to use tar instead of rsync). --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index 11b35ad..e1b4f55 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.9 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 32b0c88..e73d2ae 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.9 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1h GMP_VER=5.1.3 diff --git a/gitian/versions.beta b/gitian/versions.beta index f019dc4..2594f60 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.9 -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4133d03..617c3dd 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=master MEEK_TAG=master -GITIAN_TAG=tor-browser-builder-3.x-5 +GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1h GMP_VER=5.1.3

1 0

[gitian-builder/tor-browser-builder-3] Switch from rsync to tar for copy-to-target.
by mikeperry＠torproject.org 15 Jul '14

15 Jul '14

commit ae72871ea2e1c731ee34bba27a47fcce1b79786e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 15 15:08:29 2014 -0700 Switch from rsync to tar for copy-to-target. In Ubuntu 14.04, rsync now fails on dangling symlinks. --- libexec/copy-to-target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/copy-to-target b/libexec/copy-to-target index 5843595..82c102a 100755 --- a/libexec/copy-to-target +++ b/libexec/copy-to-target @@ -47,7 +47,7 @@ if [ $# = 0 ] ; then fi if [ -z "$USE_LXC" ]; then - rsync -a -L -e "ssh $QUIET_FLAG -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -p $VM_SSH_PORT" $1 $TUSER@localhost:$2 + tar -h -C `dirname "$1"` -cf - `basename "$1"` | ssh $QUIET_FLAG -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -p $VM_SSH_PORT $TUSER@localhost -- tar -C "$2" -xf - else config-lxc tar -h -C `dirname "$1"` -cf - `basename "$1"` | sudo lxc-start -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -C "$2" -xf -

1 0