February 2012 - tor-commits - lists.torproject.org

[tor/master] Use get_environment(), not environ.
by nickm＠torproject.org 17 Feb '12

17 Feb '12

commit 1d36693570e5e2994a05b8860a4fceaf81be306a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 17 11:50:19 2012 -0500 Use get_environment(), not environ. --- src/common/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 509477a..5fd8c2d 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3840,7 +3840,7 @@ get_current_process_environment_variables(void) smartlist_t *sl = smartlist_new(); char **environ_tmp; /* Not const char ** ? Really? */ - for (environ_tmp = environ; *environ_tmp; ++environ_tmp) { + for (environ_tmp = get_environment(); *environ_tmp; ++environ_tmp) { smartlist_add(sl, tor_strdup(*environ_tmp)); }

1 0

[tor/master] Add get_current_process_environment_variables
by nickm＠torproject.org 17 Feb '12

17 Feb '12

commit 0ba93e184ad6216f886d7347dd81fe08edbb99c7 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Feb 12 20:34:52 2012 -0800 Add get_current_process_environment_variables --- src/common/util.c | 21 +++++++++++++++++++++ src/common/util.h | 2 ++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 5c3a85e..02a638e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3832,6 +3832,27 @@ process_environment_make(struct smartlist_t *env_vars) return env; } +/** Return a newly allocated smartlist containing every variable in + * this process's environment, as a NUL-terminated string of the form + * "NAME=VALUE". Note that on some/many/most/all OSes, the parent + * process can put strings not of that form in our environment; + * callers should try to not get crashed by that. + * + * The returned strings are statically allocated, and must be treated + * as read-only. */ +struct smartlist_t * +get_current_process_environment_variables(void) +{ + smartlist_t *sl = smartlist_new(); + + char **environ_tmp; /* Not const char ** ? Really? */ + for (environ_tmp = environ; *environ_tmp; ++environ_tmp) { + smartlist_add(sl, (void *)(*environ_tmp)); + } + + return sl; +} + #ifdef _WIN32 /** Read from a handle h into buf, up to count bytes. If * hProcess is NULL, the function will return immediately if there is diff --git a/src/common/util.h b/src/common/util.h index 3989cb4..f485446 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -394,6 +394,8 @@ typedef struct process_environment_t process_environment_t; process_environment_t *process_environment_make(struct smartlist_t *env_vars); void process_environment_free(process_environment_t *env); +struct smartlist_t *get_current_process_environment_variables(void); + /* Values of process_handle_t.status. PROCESS_STATUS_NOTRUNNING must be * 0 because tor_check_port_forwarding depends on this being the initial * statue of the static instance of process_handle_t */

1 0

[tor/master] Add set_environment_variable_in_smartlist
by nickm＠torproject.org 17 Feb '12

17 Feb '12

commit d37a1ec8c678d80072c0299515547343bd1c8a07 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Feb 12 21:17:11 2012 -0800 Add set_environment_variable_in_smartlist --- src/common/util.c | 24 ++++++++++++++++++++++++ src/common/util.h | 5 +++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 02a638e..c8af602 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3853,6 +3853,30 @@ get_current_process_environment_variables(void) return sl; } +/** For each string s in env_vars such that + * environment_variable_names_equal(s, new_var), remove it; if + * free_p is non-zero, call free_old(s). If + * new_var contains '=', insert it into env_vars. */ +void +set_environment_variable_in_smartlist(struct smartlist_t *env_vars, + const char *new_var, + void (*free_old)(void*), + int free_p) +{ + SMARTLIST_FOREACH_BEGIN(env_vars, const char *, s) { + if (environment_variable_names_equal(s, new_var)) { + SMARTLIST_DEL_CURRENT(env_vars, s); + if (free_p) { + free_old((void *)s); + } + } + } SMARTLIST_FOREACH_END(s); + + if (strchr(new_var, '=') != NULL) { + smartlist_add(env_vars, (void *)new_var); + } +} + #ifdef _WIN32 /** Read from a handle h into buf, up to count bytes. If * hProcess is NULL, the function will return immediately if there is diff --git a/src/common/util.h b/src/common/util.h index f485446..9d1baf0 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -396,6 +396,11 @@ void process_environment_free(process_environment_t *env); struct smartlist_t *get_current_process_environment_variables(void); +void set_environment_variable_in_smartlist(struct smartlist_t *env_vars, + const char *new_var, + void (*free_old)(void*), + int free_p); + /* Values of process_handle_t.status. PROCESS_STATUS_NOTRUNNING must be * 0 because tor_check_port_forwarding depends on this being the initial * statue of the static instance of process_handle_t */

1 0

[tor/master] Add tor_calloc
by nickm＠torproject.org 17 Feb '12

17 Feb '12

commit 806e0f7e19ed10f91b1a7477486991611c9732de Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Feb 12 20:09:56 2012 -0800 Add tor_calloc --- src/common/util.c | 29 +++++++++++++++++++++++++++++ src/common/util.h | 2 ++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 52fea21..9040877 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -172,6 +172,35 @@ _tor_malloc_zero(size_t size DMALLOC_PARAMS) return result; } +/** Allocate a chunk of nmemb*size bytes of memory, fill + * the memory with zero bytes, and return a pointer to the result. + * Log and terminate the process on error. (Same as + * calloc(nmemb,size), but never returns NULL.) + * + * XXXX This implementation probably asserts in cases where it could + * work, because it only tries dividing SIZE_MAX by size (according to + * the calloc(3) man page, the size of an element of the nmemb-element + * array to be allocated), not by nmemb (which could in theory be + * smaller than size). Don't do that then. + */ +void * +_tor_calloc(size_t nmemb, size_t size DMALLOC_PARAMS) +{ + /* You may ask yourself, "wouldn't it be smart to use calloc instead of + * malloc+memset? Perhaps libc's calloc knows some nifty optimization trick + * we don't!" Indeed it does, but its optimizations are only a big win when + * we're allocating something very big (it knows if it just got the memory + * from the OS in a pre-zeroed state). We don't want to use tor_malloc_zero + * for big stuff, so we don't bother with calloc. */ + void *result; + size_t max_nmemb = (size == 0) ? SIZE_MAX : SIZE_MAX/size; + + tor_assert(nmemb < max_nmemb); + + result = _tor_malloc_zero((nmemb * size) DMALLOC_FN_ARGS); + return result; +} + /** Change the size of the memory block pointed to by ptr to size * bytes long; return the new memory block. On error, log and * terminate. (Like realloc(ptr,size), but never returns NULL.) diff --git a/src/common/util.h b/src/common/util.h index 1bad24b..955a682 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -73,6 +73,7 @@ void *_tor_malloc(size_t size DMALLOC_PARAMS) ATTR_MALLOC; void *_tor_malloc_zero(size_t size DMALLOC_PARAMS) ATTR_MALLOC; void *_tor_malloc_roundup(size_t *size DMALLOC_PARAMS) ATTR_MALLOC; +void *_tor_calloc(size_t nmemb, size_t size DMALLOC_PARAMS) ATTR_MALLOC; void *_tor_realloc(void *ptr, size_t size DMALLOC_PARAMS); char *_tor_strdup(const char *s DMALLOC_PARAMS) ATTR_MALLOC ATTR_NONNULL((1)); char *_tor_strndup(const char *s, size_t n DMALLOC_PARAMS) @@ -107,6 +108,7 @@ extern int dmalloc_free(const char *file, const int line, void *pnt, #define tor_malloc(size) _tor_malloc(size DMALLOC_ARGS) #define tor_malloc_zero(size) _tor_malloc_zero(size DMALLOC_ARGS) +#define tor_calloc(nmemb,size) _tor_calloc(nmemb, size DMALLOC_ARGS) #define tor_malloc_roundup(szp) _tor_malloc_roundup(szp DMALLOC_ARGS) #define tor_realloc(ptr, size) _tor_realloc(ptr, size DMALLOC_ARGS) #define tor_strdup(s) _tor_strdup(s DMALLOC_ARGS)

1 0

[tor/master] Add process_environment_make and related utilities
by nickm＠torproject.org 17 Feb '12

17 Feb '12

commit 98cec14982718d71e1a7b001f8a9a73c3bf0800b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Feb 12 20:14:48 2012 -0800 Add process_environment_make and related utilities --- src/common/util.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/common/util.h | 15 +++++++ 2 files changed, 126 insertions(+), 0 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 9040877..5c3a85e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3721,6 +3721,117 @@ tor_get_exit_code(const process_handle_t *process_handle, return PROCESS_EXIT_EXITED; } +/** Return non-zero iff getenv would consider s1 and s2 + * to have the same name as strings in a process's environment. */ +int +environment_variable_names_equal(const char *s1, const char *s2) +{ + size_t s1_name_len = strcspn(s1, "="); + size_t s2_name_len = strcspn(s2, "="); + + return (s1_name_len == s2_name_len && + tor_memeq(s1, s2, s1_name_len)); +} + +/** Free env (assuming it was produced by + * process_environment_make). */ +void +process_environment_free(process_environment_t *env) +{ + if (env == NULL) return; + + /* As both an optimization hack to reduce consing on Unixoid systems + * and a nice way to ensure that some otherwise-Windows-specific + * code will always get tested before changes to it get merged, the + * strings which env->unixoid_environment_block points to are packed + * into env->windows_environment_block. */ + tor_free(env->unixoid_environment_block); + tor_free(env->windows_environment_block); + + tor_free(env); +} + +/** Make a process_environment_t containing the environment variables + * specified in env_vars (as C strings of the form + * "NAME=VALUE"). */ +process_environment_t * +process_environment_make(struct smartlist_t *env_vars) +{ + process_environment_t *env = tor_malloc_zero(sizeof(process_environment_t)); + size_t n_env_vars = smartlist_len(env_vars); + size_t i; + size_t total_env_length; + smartlist_t *env_vars_sorted; + + tor_assert(n_env_vars + 1 != 0); + env->unixoid_environment_block = tor_calloc(n_env_vars + 1, sizeof(char *)); + /* env->unixoid_environment_block is already NULL-terminated, + * because we assume that NULL == 0 (and check that during compilation). */ + + total_env_length = 1; /* terminating NUL of terminating empty string */ + for (i = 0; i < n_env_vars; ++i) { + const char *s = smartlist_get(env_vars, i); + size_t slen = strlen(s); + + tor_assert(slen + 1 != 0); + tor_assert(slen + 1 < SIZE_MAX - total_env_length); + total_env_length += slen + 1; + } + + env->windows_environment_block = tor_malloc_zero(total_env_length); + /* env->windows_environment_block is already + * (NUL-terminated-empty-string)-terminated. */ + + /* Some versions of Windows supposedly require that environment + * blocks be sorted. Or maybe some Windows programs (or their + * runtime libraries) fail to look up strings in non-sorted + * environment blocks. + * + * Also, sorting strings makes it easy to find duplicate environment + * variables and environment-variable strings without an '=' on all + * OSes, and they can cause badness. Let's complain about those. */ + env_vars_sorted = smartlist_new(); + smartlist_add_all(env_vars_sorted, env_vars); + smartlist_sort_strings(env_vars_sorted); + + /* Now copy the strings into the environment blocks. */ + { + char *cp = env->windows_environment_block; + const char *prev_env_var = NULL; + + for (i = 0; i < n_env_vars; ++i) { + const char *s = smartlist_get(env_vars_sorted, i); + size_t slen = strlen(s); + size_t s_name_len = strcspn(s, "="); + + if (s_name_len == slen) { + log_warn(LD_GENERAL, + "Preparing an environment containing a variable " + "without a value: %s", + s); + } + if (prev_env_var != NULL && + environment_variable_names_equal(s, prev_env_var)) { + log_warn(LD_GENERAL, + "Preparing an environment containing two variables " + "with the same name: %s and %s", + prev_env_var, s); + } + + prev_env_var = s; + + /* Actually copy the string into the environment. */ + memcpy(cp, s, slen+1); + env->unixoid_environment_block[i] = cp; + cp += slen+1; + } + + tor_assert(cp == env->windows_environment_block + total_env_length - 1); + } + + return env; +} + #ifdef _WIN32 /** Read from a handle h into buf, up to count bytes. If * hProcess is NULL, the function will return immediately if there is diff --git a/src/common/util.h b/src/common/util.h index 955a682..3989cb4 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -379,6 +379,21 @@ int tor_spawn_background(const char *const filename, const char **argv, HANDLE load_windows_system_library(const TCHAR *library_name); #endif +int environment_variable_names_equal(const char *s1, const char *s2); + +struct process_environment_t { + /** A pointer to a sorted empty-string-terminated sequence of + * NUL-terminated strings of the form "NAME=VALUE". */ + char *windows_environment_block; + /** A pointer to a NULL-terminated array of pointers to + * NUL-terminated strings of the form "NAME=VALUE". */ + char **unixoid_environment_block; +}; +typedef struct process_environment_t process_environment_t; + +process_environment_t *process_environment_make(struct smartlist_t *env_vars); +void process_environment_free(process_environment_t *env); + /* Values of process_handle_t.status. PROCESS_STATUS_NOTRUNNING must be * 0 because tor_check_port_forwarding depends on this being the initial * statue of the static instance of process_handle_t */

1 0

r25442: {website} No need to explicitly ask for tor-geoipdb, II (website/trunk/docs/en)
by Peter Palfrader 17 Feb '12

17 Feb '12

Author: weasel Date: 2012-02-17 16:34:41 +0000 (Fri, 17 Feb 2012) New Revision: 25442 Modified: website/trunk/docs/en/debian.wml Log: No need to explicitly ask for tor-geoipdb, II Modified: website/trunk/docs/en/debian.wml =================================================================== --- website/trunk/docs/en/debian.wml 2012-02-17 16:32:34 UTC (rev 25441) +++ website/trunk/docs/en/debian.wml 2012-02-17 16:34:41 UTC (rev 25442) @@ -146,7 +146,7 @@ gpg --keyserver keys.gnupg.net --recv 886DDD89 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - apt-get update -apt-get install tor tor-geoipdb +apt-get install tor deb.torproject.org-keyring </pre>

1 0

r25441: {website} No need to explicitly ask for tor-geoipdb. It's recommended (website/trunk/docs/en)
by Peter Palfrader 17 Feb '12

17 Feb '12

Author: weasel Date: 2012-02-17 16:32:34 +0000 (Fri, 17 Feb 2012) New Revision: 25441 Modified: website/trunk/docs/en/debian.wml Log: No need to explicitly ask for tor-geoipdb. It's recommended Modified: website/trunk/docs/en/debian.wml =================================================================== --- website/trunk/docs/en/debian.wml 2012-02-17 16:27:40 UTC (rev 25440) +++ website/trunk/docs/en/debian.wml 2012-02-17 16:32:34 UTC (rev 25441) @@ -17,7 +17,7 @@ If you're using Debian, just run -<tt>apt-get install tor tor-geoipdb</tt> +<tt>apt-get install tor</tt> as root.

1 0

r25440: {website} mention our keyring package, II (website/trunk/docs/en)
by Peter Palfrader 17 Feb '12

17 Feb '12

Author: weasel Date: 2012-02-17 16:27:40 +0000 (Fri, 17 Feb 2012) New Revision: 25440 Modified: website/trunk/docs/en/debian-vidalia.wml Log: mention our keyring package, II Modified: website/trunk/docs/en/debian-vidalia.wml =================================================================== --- website/trunk/docs/en/debian-vidalia.wml 2012-02-17 16:27:35 UTC (rev 25439) +++ website/trunk/docs/en/debian-vidalia.wml 2012-02-17 16:27:40 UTC (rev 25440) @@ -58,7 +58,7 @@ commands at your command prompt: <pre> apt-get update -apt-get install vidalia +apt-get install vidalia deb.torproject.org-keyring </pre>

1 0

r25439: {website} mention our keyring package (website/trunk/docs/en)
by Peter Palfrader 17 Feb '12

17 Feb '12

Author: weasel Date: 2012-02-17 16:27:35 +0000 (Fri, 17 Feb 2012) New Revision: 25439 Modified: website/trunk/docs/en/debian.wml Log: mention our keyring package Modified: website/trunk/docs/en/debian.wml =================================================================== --- website/trunk/docs/en/debian.wml 2012-02-17 16:05:56 UTC (rev 25438) +++ website/trunk/docs/en/debian.wml 2012-02-17 16:27:35 UTC (rev 25439) @@ -82,15 +82,30 @@ gpg --keyserver keys.gnupg.net --recv 886DDD89 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - </pre> -Now refresh your sources and install Tor by running the following -commands (as root) at your command prompt: +Now refresh your sources, running the following command (as root) at your +command prompt: <pre> apt-get update -apt-get install tor tor-geoipdb </pre> +If there are no errors you're good to continue. +We provide a Debian package to help you keep our signing key current. It is +recommended you use it. Install it using +<pre> +apt-get install deb.torproject.org-keyring +</pre> + + + +To finally install Tor just run: +<pre> +apt-get install tor +</pre> + + + Now Tor is installed and running. Move on to <a href="<page docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix" instructions.

1 0

r25438: {website} Remove arma's mirror for obfsproxy too (website/trunk/projects/en)
by Sebastian Hahn 17 Feb '12

17 Feb '12

Author: sebastian Date: 2012-02-17 16:05:56 +0000 (Fri, 17 Feb 2012) New Revision: 25438 Modified: website/trunk/projects/en/obfsproxy.wml Log: Remove arma's mirror for obfsproxy too Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-02-17 14:47:24 UTC (rev 25437) +++ website/trunk/projects/en/obfsproxy.wml 2012-02-17 16:05:56 UTC (rev 25438) @@ -67,31 +67,25 @@ href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Windows Obfsproxy Tor Browser Bundle</a> (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) (<a - href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or <a - <a href="http://mit.edu/arma/Public/obfsprxy.exe">mirror</a> - (<a href="http://mit.edu/arma/Public/obfsprxy.exe.asc">sig</a>, - <a href="http://mit.edu/arma/Public/obfsprxy.torrent">torrent</a>). + href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>). <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">OSX (10.6 & 10.7) Obfsproxy Tor Browser Bundle</a> (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) - (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or - <a href="http://mit.edu/arma/Public/obfsprxy_osx.zip">mirror</a> (<a href="http://mit.edu/arma/Public/obfsprxy_osx.zip.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_osx.torrent">torrent</a>). + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>). <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Linux 32-bit Obfsproxy Tor Browser Bundle</a> (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) - (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or - <a href=" http://mit.edu/arma/Public/obfsprxy_32bit_linux.tar.gz">mirror</a> (<a href="http://mit.edu/arma/Public/obfsprxy_32bit_linux.tar.gz.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_32bit_linux.torrent">torrent</a>). + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>). <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Linux 64-bit Obfsproxy Tor Browser Bundle</a> (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) - (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or - <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz">mirror 1</a> (<a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz.asc">sig</a>, <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.torrent">torrent</a>), <a href=" http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz">mirror 2</a> (<a href="http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_64bit_linux.torrent">torrent</a>). + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>). <h2><a class="anchor" href="#instructions">Installation Instructions</a></h2>

1 0