tor-commits July 2013

tor-commits@lists.torproject.org

19 participants
1044 discussions

[tor-browser-bundle/master] Merge remote-tracking branch 'arlolra/vagrant'
by mikeperry＠torproject.org 16 Jul '13

16 Jul '13

commit 803cdcac96f93a66a21f9240505fd86825efc426 Merge: 6cd12b3 88f6c9e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Jul 15 15:43:05 2013 -0700 Merge remote-tracking branch 'arlolra/vagrant' .gitignore | 1 + gitian/README.build | 2 +- vagrant/Makefile | 50 ++++++++++++++++++++++++ vagrant/README.md | 12 ++++++ vagrant/Vagrantfile | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 172 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-17.0.7esr-2] fixup! Tor Browser's official .mozconfigs.
by mikeperry＠torproject.org 15 Jul '13

15 Jul '13

commit 24297ac66cebb7fcc781c5501508f8244901341f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Jul 15 16:44:19 2013 -0700 fixup! Tor Browser's official .mozconfigs. Disable JS-Ctypes as a test. --- .mozconfig | 1 + .mozconfig-mac | 5 +---- .mozconfig-mingw | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.mozconfig b/.mozconfig index 46502b2..c548bfc 100755 --- a/.mozconfig +++ b/.mozconfig @@ -15,3 +15,4 @@ ac_add_options --disable-debug ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-ctypes diff --git a/.mozconfig-mac b/.mozconfig-mac index 8e56467..9a8a6d8 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -20,7 +20,4 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests - -# XXX: So close.. Undefined ref to _IID_IAccessible during linking -ac_add_options --disable-accessibility -ac_add_options --disable-webgl +ac_add_options --disable-ctypes diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 0f819f5..02d7a61 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -25,3 +25,5 @@ ac_add_options --disable-tests # XXX: So close.. Undefined ref to _IID_IAccessible during linking ac_add_options --disable-accessibility ac_add_options --disable-webgl + +ac_add_options -disable-ctypes

1 0

[tor-browser/tor-browser-17.0.7esr-2] Add processID API to nsXULAppInfo.
by mikeperry＠torproject.org 15 Jul '13

15 Jul '13

commit ac1d62429de71e03eda09669d41e7bbe9f7b5575 Author: Kathleen Brade <brade(a)pearlcrescent.com> Date: Mon Jul 15 16:36:42 2013 -0700 Add processID API to nsXULAppInfo. This is needed to allow Tor Launcher to pass Firefox's PID as the owning controller process, so Tor knows to exit when Firefox does. --- toolkit/xre/nsAppRunner.cpp | 12 ++++++++++++ xpcom/system/nsIXULRuntime.idl | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 68a52e6..fc2446a 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -762,6 +762,18 @@ nsXULAppInfo::GetProcessType(uint32_t* aResult) } NS_IMETHODIMP +nsXULAppInfo::GetProcessID(uint32_t* aResult) +{ + NS_ENSURE_ARG_POINTER(aResult); +#ifdef XP_WIN + *aResult = GetCurrentProcessId(); +#else + *aResult = getpid(); +#endif + return NS_OK; +} + +NS_IMETHODIMP nsXULAppInfo::EnsureContentProcess() { if (XRE_GetProcessType() != GeckoProcessType_Default) diff --git a/xpcom/system/nsIXULRuntime.idl b/xpcom/system/nsIXULRuntime.idl index 07466fc..e3948b6 100644 --- a/xpcom/system/nsIXULRuntime.idl +++ b/xpcom/system/nsIXULRuntime.idl @@ -11,7 +11,8 @@ * stable/frozen, please contact Benjamin Smedberg. */ -[scriptable, uuid(cb0b8eda-4c83-4d0e-a63c-d3b65714bc85)] + +[scriptable, uuid(e080b1f6-8452-4bde-9368-c795808b86d1)] interface nsIXULRuntime : nsISupports { /** @@ -68,6 +69,11 @@ interface nsIXULRuntime : nsISupports readonly attribute unsigned long processType; /** + * The system process ID of the caller's process. + */ + readonly attribute unsigned long processID; + + /** * Signal the apprunner to invalidate caches on the next restart. * This will cause components to be autoregistered and all * fastload data to be re-created.

1 0

[tor-launcher/master] Use new processID API if available.
by mikeperry＠torproject.org 15 Jul '13

15 Jul '13

commit c5a14f99a548c95647653dd293327aac78891979 Author: Kathleen Brade <brade(a)pearlcrescent.com> Date: Mon Jul 15 16:50:57 2013 -0700 Use new processID API if available. This removes the Tor Launcher dependency on JS-Ctypes. --- src/components/tl-process.js | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 1ef4d8a..91a5ec2 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -537,8 +537,24 @@ TorProcessService.prototype = _getpid: function() { + // Use nsIXULRuntime.processID if it is available. + var pid = 0; + try { + var xreSvc = Cc["@mozilla.org/xre/app-info;1"] + .getService(Ci.nsIXULRuntime); + pid = xreSvc.processID; + } + catch (e) + { + TorLauncherLogger.safelog(2, "failed to get process ID via XUL runtime:", + e); + } + + // Try libc.getpid() via js-ctypes. + if (!pid) try + { var getpid; if (TorLauncherUtil.isMac) { @@ -566,14 +582,14 @@ TorProcessService.prototype = getpid = libc.declare("getpid", ctypes.default_abi, ctypes.int); } - return getpid(); + pid = getpid(); } catch(e) { TorLauncherLogger.safelog(4, "unable to get process ID: ", e); } - return 0; + return pid; }, endOfObject: true

1 0

[tor/master] Appease "make check-spaces"
by nickm＠torproject.org 15 Jul '13

15 Jul '13

commit 55f5caf0963935bebb41ded66416c730c3598cb2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 15 17:35:56 2013 -0400 Appease "make check-spaces" --- src/or/circuitmux.h | 3 ++- src/test/test_circuitlist.c | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/or/circuitmux.h b/src/or/circuitmux.h index ffa28be..ee2f5d1 100644 --- a/src/or/circuitmux.h +++ b/src/or/circuitmux.h @@ -128,7 +128,8 @@ void circuitmux_notify_xmit_cells(circuitmux_t *cmux, circuit_t *circ, void circuitmux_notify_xmit_destroy(circuitmux_t *cmux); /* Circuit interface */ -MOCK_DECL(void, circuitmux_attach_circuit, (circuitmux_t *cmux, circuit_t *circ, +MOCK_DECL(void, circuitmux_attach_circuit, (circuitmux_t *cmux, + circuit_t *circ, cell_direction_t direction)); MOCK_DECL(void, circuitmux_detach_circuit, (circuitmux_t *cmux, circuit_t *circ)); diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index a233653..720b407 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -62,7 +62,6 @@ circuitmux_detach_mock(circuitmux_t *cmux, circuit_t *circ) memset(&cdm, 0, sizeof(cdm)); \ } while (0) - static void test_clist_maps(void *arg) { @@ -150,8 +149,7 @@ test_clist_maps(void *arg) tt_assert(! circuit_id_in_use_on_channel(200, ch2)); tt_assert(! circuit_id_in_use_on_channel(100, ch1)); - -done: + done: tor_free(ch1); tor_free(ch2); tor_free(ch3); @@ -163,8 +161,8 @@ done: UNMOCK(circuitmux_detach_circuit); } - struct testcase_t circuitlist_tests[] = { { "maps", test_clist_maps, TT_FORK, NULL, NULL }, END_OF_TESTCASES }; +

1 0

[tor/master] Use format_hex_number_sigsafe to format syscalls in sandbox.c
by nickm＠torproject.org 15 Jul '13

15 Jul '13

commit 85178e2e93036d0708bafa431fcdf4c1029ad2ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 15 13:07:09 2013 -0400 Use format_hex_number_sigsafe to format syscalls in sandbox.c This way, we don't have to use snprintf, which is not guaranteed to be signal-safe. (Technically speaking, strlen() and strlcpy() are not guaranteed to be signal-safe by the POSIX standard. But I claim that they are on every platform that supports libseccomp2, which is what matters here.) --- src/common/sandbox.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 68be89e..dbb1657 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -13,9 +13,10 @@ #include <string.h> #include <stdlib.h> +#include "orconfig.h" #include "sandbox.h" #include "torlog.h" -#include "orconfig.h" +#include "util.h" #if defined(HAVE_SECCOMP_H) && defined(__linux__) #define USE_LIBSECCOMP @@ -202,7 +203,7 @@ static void sigsys_debugging(int nr, siginfo_t *info, void *void_context) { ucontext_t *ctx = (ucontext_t *) (void_context); - char message[64]; + char message[256]; int rv = 0, syscall, length, err; (void) nr; @@ -214,11 +215,12 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context) syscall = ctx->uc_mcontext.gregs[REG_SYSCALL]; - /* XXXX Avoid use of snprintf; it isn't on the list of Stuff You're Allowed - * To Do In A Signal Handler. */ - length = snprintf(message, sizeof(message), - "\n\n(Sandbox) bad syscall (%d) was caught.\n", - syscall); + strlcpy(message, "\n\n(Sandbox) Caught a bad syscall attempt (syscall 0x", + sizeof(message)); + (void) format_hex_number_sigsafe(syscall, message+strlen(message), + sizeof(message)-strlen(message)); + strlcat(message, ")\n", sizeof(message)); + length = strlen(message); err = 0; if (sigsys_debugging_fd >= 0) {

1 0

[tor/master] Lightly refactor and test format_hex_number_sigsafe
by nickm＠torproject.org 15 Jul '13

15 Jul '13

commit 9fda7e8cd1bbc33479c667ea97a220333f81c148 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 15 12:52:29 2013 -0400 Lightly refactor and test format_hex_number_sigsafe Better tests for upper bounds, and for failing cases. Also, change the function's interface to take a buffer length rather than a maximum length, and then NUL-terminate: functions that don't NUL-terminate are trouble waiting to happen. --- src/common/util.c | 20 +++++++++++--------- src/test/test_util.c | 14 ++++++++++---- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index a5e41bf..d9913dd 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3382,13 +3382,13 @@ tor_join_win_cmdline(const char *argv[]) } /** - * Helper function to output hex numbers, called by - * format_helper_exit_status(). This writes the hexadecimal digits of x into - * buf, up to max_len digits, and returns the actual number of digits written. - * If there is insufficient space, it will write nothing and return 0. + * Helper function to output hex numbers from within a signal handler. * - * This function DOES NOT add a terminating NUL character to its output: be - * careful! + * Writes the nul-terminated hexadecimal digits of <b>x</b> into a buffer + * <b>buf</b> of size <b>buf_len</b>, and return the actual number of digits + * written, not counting the terminal NUL. + * + * If there is insufficient space, write nothing and return 0. * * This accepts an unsigned int because format_helper_exit_status() needs to * call it with a signed int and an unsigned char, and since the C standard @@ -3403,14 +3403,14 @@ tor_join_win_cmdline(const char *argv[]) * arbitrary C functions. */ int -format_hex_number_sigsafe(unsigned int x, char *buf, int max_len) +format_hex_number_sigsafe(unsigned int x, char *buf, int buf_len) { int len; unsigned int tmp; char *cur; /* Sanity check */ - if (!buf || max_len <= 0) + if (!buf || buf_len <= 1) return 0; /* How many chars do we need for x? */ @@ -3426,7 +3426,7 @@ format_hex_number_sigsafe(unsigned int x, char *buf, int max_len) } /* Bail if we would go past the end of the buffer */ - if (len > max_len) + if (len+1 > buf_len) return 0; /* Point to last one */ @@ -3438,6 +3438,8 @@ format_hex_number_sigsafe(unsigned int x, char *buf, int max_len) x >>= 4; } while (x != 0 && cur >= buf); + buf[len] = '\0'; + /* Return len */ return len; } diff --git a/src/test/test_util.c b/src/test/test_util.c index 4880b73..2cc25e9 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2643,7 +2643,8 @@ test_util_format_hex_number(void *ptr) {"1", 1}, {"273A", 0x273a}, {"FFFF", 0xffff}, - + {"7FFFFFFF", 0x7fffffff}, + {"FFFFFFFF", 0xffffffff}, #if UINT_MAX >= 0xffffffff {"31BC421D", 0x31bc421d}, {"FFFFFFFF", 0xffffffff}, @@ -2654,18 +2655,23 @@ test_util_format_hex_number(void *ptr) (void)ptr; for (i = 0; test_data[i].str != NULL; ++i) { - len = format_hex_number_sigsafe(test_data[i].x, buf, 32); + len = format_hex_number_sigsafe(test_data[i].x, buf, sizeof(buf)); test_neq(len, 0); - buf[len] = '\0'; + test_eq(len, strlen(buf)); test_streq(buf, test_data[i].str); } + test_eq(4, format_hex_number_sigsafe(0xffff, buf, 5)); + test_streq(buf, "FFFF"); + test_eq(0, format_hex_number_sigsafe(0xffff, buf, 4)); + test_eq(0, format_hex_number_sigsafe(0, buf, 1)); + done: return; } /** - * Test that we can properly format q Windows command line + * Test that we can properly format a Windows command line */ static void test_util_join_win_cmdline(void *ptr)

1 0

[tor/master] HEX_ERRNO_SIZE is no longer the correct upper limit for format_hex_number_sigsafe
by nickm＠torproject.org 15 Jul '13

15 Jul '13

commit 18136afbbb4934c1104716a29a0efc68a8fd8f51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 15 12:39:47 2013 -0400 HEX_ERRNO_SIZE is no longer the correct upper limit for format_hex_number_sigsafe --- src/test/test_util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index d5ce1eb..4880b73 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2634,7 +2634,7 @@ static void test_util_format_hex_number(void *ptr) { int i, len; - char buf[HEX_ERRNO_SIZE + 1]; + char buf[33]; const struct { const char *str; unsigned int x; @@ -2643,6 +2643,7 @@ test_util_format_hex_number(void *ptr) {"1", 1}, {"273A", 0x273a}, {"FFFF", 0xffff}, + #if UINT_MAX >= 0xffffffff {"31BC421D", 0x31bc421d}, {"FFFFFFFF", 0xffffffff}, @@ -2653,7 +2654,7 @@ test_util_format_hex_number(void *ptr) (void)ptr; for (i = 0; test_data[i].str != NULL; ++i) { - len = format_hex_number_sigsafe(test_data[i].x, buf, HEX_ERRNO_SIZE); + len = format_hex_number_sigsafe(test_data[i].x, buf, 32); test_neq(len, 0); buf[len] = '\0'; test_streq(buf, test_data[i].str);

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 15 Jul '13

15 Jul '13

commit 54a823bfac04ee00a9845bcb627e5f1b85efe954 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 15 16:45:22 2013 +0000 Update translations for tsum --- pt/short-user-manual_pt_noimg.xhtml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pt/short-user-manual_pt_noimg.xhtml b/pt/short-user-manual_pt_noimg.xhtml index 25269ab..c26dfd9 100644 --- a/pt/short-user-manual_pt_noimg.xhtml +++ b/pt/short-user-manual_pt_noimg.xhtml @@ -4,11 +4,11 @@ <title/> </head> <body> - <h1 id="the-short-user-manual">Guia rápido de utilização</h1> - <p>Este manual contém informações sobre como baixar o Tor, como usá-lo, e o que fazer se o Tor estiver disponível para se conectar à Internet. Se você não conseguir encontrar a resposta para sua questão neste documento, envie um e-mail para help(a)rt.torproject.org.</p> - <p>Por favor, note que nós provemos suporte através de bases voluntárias, e temos vários e-mails todo dia. Não há motivo para se preocupar se não retornarmos à você rapidamente.</p> - <h2 id="how-tor-works">Como Tor funciona</h2> - <p>Tor é uma rede com túneis virtuais que permitem a você manter sua privacidade e segurança na Internet. Tor trabalha enviando seu tráfego através de 3 servidores aleatórios (também conhecidos como retransmissores) na rede Tor, antes do tráfego ser enviado para a Internet pública.</p> + <h1 id="the-short-user-manual">Manual de Utilização Rápida </h1> + <p>Este manual do utilizador contém informações sobre como descarregar o Tor, a sua utilização e o que fazer caso o Tor não consiga estabelecer ligação à rede. Se não conseguir encontrar, neste documento, a resposta à sua questão envie um email para help(a)rt.torproject.org.</p> + <p>Por favor, tenha em consideração que o apoio que fornecemos é voluntário e que todos os dias recebemos vários emails. Não se preocupe se não respondermos de imediato.</p> + <h2 id="how-tor-works">Funcionamento do Tor</h2> + <p>O Tor é uma rede com túneis virtuais que lhe permitem manter sua privacidade e segurança na Internet. Tor trabalha enviando seu tráfego através de 3 servidores aleatórios (também conhecidos como <em>retransmissores</em>) na rede Tor, antes do tráfego ser enviado para a Internet pública.</p> <p>A imagem abaixo ilustra um usuário navegando através de diversos sites usando Tor. As telas verdes representam retransmissores dentro da rede Tor, enquanto as três chaves representam as camadas de encriptação entre o usuário e cada retransmissor.</p> <p>Tor vai deixar a origem do seu tráfego anônima, e irá encriptar tudo que passar entre você e a rede Tor. Tor também irá encriptar seu tráfego dentro da rede Tor, mas não pode encriptar seu tráfego entre a rede Tor e o destino final.</p> <p>Se você está enviando informações confidenciais, como um nome de usuário e senha, tenha certeza de que está usando HTTPS (ex: <strong>https</strong>://torproject.org/, e não <strong>http</strong>://torproject.org/).</p>

1 0

[tor/master] Expose format_hex_number_..., and rename it to ..._sigsafe().
by nickm＠torproject.org 15 Jul '13

15 Jul '13

commit 22977b7c1dd6b693237fb3fed1cd6f88ec71cb21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 15 12:26:55 2013 -0400 Expose format_hex_number_..., and rename it to ..._sigsafe(). There are some other places in the code that will want a signal-safe way to format numbers, so it shouldn't be static to util.c. --- src/common/util.c | 12 +++++------- src/common/util.h | 7 +++++-- src/test/test_util.c | 5 ++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 95dea4b..a5e41bf 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3402,9 +3402,8 @@ tor_join_win_cmdline(const char *argv[]) * function; it's designed to be used in code paths where you can't call * arbitrary C functions. */ -STATIC int -format_hex_number_for_helper_exit_status(unsigned int x, char *buf, - int max_len) +int +format_hex_number_sigsafe(unsigned int x, char *buf, int max_len) { int len; unsigned int tmp; @@ -3490,8 +3489,8 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, cur = hex_errno; /* Emit child_state */ - written = format_hex_number_for_helper_exit_status(child_state, - cur, left); + written = format_hex_number_sigsafe(child_state, cur, left); + if (written <= 0) goto err; @@ -3520,8 +3519,7 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, } /* Emit unsigned_errno */ - written = format_hex_number_for_helper_exit_status(unsigned_errno, - cur, left); + written = format_hex_number_sigsafe(unsigned_errno, cur, left); if (written <= 0) goto err; diff --git a/src/common/util.h b/src/common/util.h index ca6ce7c..ad75266 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -518,11 +518,12 @@ int32_t tor_weak_random_range(tor_weak_rng_t *rng, int32_t top); * <b>n</b> */ #define tor_weak_random_one_in_n(rng, n) (0==tor_weak_random_range((rng),(n))) +int format_hex_number_sigsafe(unsigned int x, char *buf, int max_len); + #ifdef UTIL_PRIVATE /* Prototypes for private functions only used by util.c (and unit tests) */ -STATIC int format_hex_number_for_helper_exit_status(unsigned int x, char *buf, - int max_len); +#ifndef _WIN32 STATIC int format_helper_exit_status(unsigned char child_state, int saved_errno, char *hex_errno); @@ -532,6 +533,8 @@ STATIC int format_helper_exit_status(unsigned char child_state, 1 + sizeof(int) * 2 + 1) #endif +#endif + const char *libor_get_digests(void); #endif diff --git a/src/test/test_util.c b/src/test/test_util.c index 603eded..d5ce1eb 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2627,7 +2627,7 @@ test_util_spawn_background_partial_read(void *ptr) } /** - * Test for format_hex_number_for_helper_exit_status() + * Test for format_hex_number_sigsafe() */ static void @@ -2653,8 +2653,7 @@ test_util_format_hex_number(void *ptr) (void)ptr; for (i = 0; test_data[i].str != NULL; ++i) { - len = format_hex_number_for_helper_exit_status(test_data[i].x, - buf, HEX_ERRNO_SIZE); + len = format_hex_number_sigsafe(test_data[i].x, buf, HEX_ERRNO_SIZE); test_neq(len, 0); buf[len] = '\0'; test_streq(buf, test_data[i].str);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2013