- tor-commits - lists.torproject.org

r25443: {website} Move the TORGIT config option to Makefile.local (website/trunk)
by Peter Palfrader 17 Feb '12

17 Feb '12

Author: weasel Date: 2012-02-17 16:50:37 +0000 (Fri, 17 Feb 2012) New Revision: 25443 Added: website/trunk/.gitignore website/trunk/Makefile.local.sample Modified: website/trunk/Makefile Log: Move the TORGIT config option to Makefile.local Added: website/trunk/.gitignore =================================================================== --- website/trunk/.gitignore (rev 0) +++ website/trunk/.gitignore 2012-02-17 16:50:37 UTC (rev 25443) @@ -0,0 +1 @@ +/Makefile.local Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-02-17 16:34:41 UTC (rev 25442) +++ website/trunk/Makefile 2012-02-17 16:50:37 UTC (rev 25443) @@ -10,12 +10,12 @@ # 4. make # 5. ./publish -export TORGIT=set this to your tor.git path export STABLETAG=tor-0.2.2.35 export DEVTAG=tor-0.2.3.12-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton +include $(WMLBASE)/Makefile.local include $(WMLBASE)/Makefile.common all: $(SUBDIRS) Added: website/trunk/Makefile.local.sample =================================================================== --- website/trunk/Makefile.local.sample (rev 0) +++ website/trunk/Makefile.local.sample 2012-02-17 16:50:37 UTC (rev 25443) @@ -0,0 +1,13 @@ +# This is a sample for your Makefile.local. +# +# Copy this to Makefile.local and change the path to match your local +# system. +# + +# The path to a clone of the tor source code repository's .git dir. +# Note that if your clone is a non-bare repository that you must not +# leave out the .git part. +# +# e.g.: +# export TORGIT=/home/weasel/projects/tor/tor/.git +export TORGIT=set this to your tor.git path

1 0

[tor/master] Change type of unixoid_environment_block to match tor_spawn_background's arg
by nickm＠torproject.org 17 Feb '12

17 Feb '12

commit 340d906419f8f263cd75eee1fb9d6c735b45a5d2 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Feb 13 00:43:48 2012 -0800 Change type of unixoid_environment_block to match tor_spawn_background's arg --- src/common/util.h | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/common/util.h b/src/common/util.h index 9d1baf0..41bd3d9 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -386,8 +386,11 @@ struct process_environment_t { * 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; + * NUL-terminated strings of the form "NAME=VALUE". + * + * XXXX This should have type char **, but tor_spawn_background's + * prototype is incorrect. */ + const char **unixoid_environment_block; }; typedef struct process_environment_t process_environment_t;

1 0

[tor/master] Remove (void)envp from tor_spawn_background
by nickm＠torproject.org 17 Feb '12

17 Feb '12

commit ee3a49d6ed157b0d27a31f527bc5a55d0b2dad9d Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Feb 13 00:47:54 2012 -0800 Remove (void)envp from tor_spawn_background The envp argument is used on Windows. --- src/common/util.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index c8af602..ac65f48 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3334,8 +3334,6 @@ tor_spawn_background(const char *const filename, const char **argv, SECURITY_ATTRIBUTES saAttr; char *joined_argv; - (void)envp; // Unused on Windows - saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); saAttr.bInheritHandle = TRUE; /* TODO: should we set explicit security attributes? (#2046, comment 5) */

1 0

[tor/master] Rewrite managed proxy environment setup code
by nickm＠torproject.org 17 Feb '12

17 Feb '12

commit bf1ce3f53d67c4c0e71f79a108e1eaa04fbfb713 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Feb 13 00:46:18 2012 -0800 Rewrite managed proxy environment setup code Now, the environment setup is entirely OS-independent, as well as less hacky and brittle. --- changes/bug5105 | 11 +++ src/or/transports.c | 234 ++++++++++++++------------------------------------- 2 files changed, 73 insertions(+), 172 deletions(-) diff --git a/changes/bug5105 b/changes/bug5105 new file mode 100644 index 0000000..6a923d9 --- /dev/null +++ b/changes/bug5105 @@ -0,0 +1,11 @@ + o Minor bugfixes: + + - Ensure that variables set in Tor's environment cannot override + environment variables which Tor tries to pass to a managed + pluggable-transport proxy. Previously, Tor would pass every + variable in its environment to managed proxies along with the + new ones, in such a way that on many operating systems, the + inherited environment variables would override those which Tor + tried to explicitly set. Bugfix on 0.2.3.12-alpha for most + Unixoid systems; bugfix on 0.2.3.9-alpha for Windows. + diff --git a/src/or/transports.c b/src/or/transports.c index d279d7a..b3c8382 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -91,13 +91,8 @@ #include "util.h" #include "router.h" -#ifdef _WIN32 -static void set_managed_proxy_environment(LPVOID *envp, - const managed_proxy_t *mp); -#else -static void set_managed_proxy_environment(char ***envp, - const managed_proxy_t *mp); -#endif +static process_environment_t * +create_managed_proxy_environment(const managed_proxy_t *mp); static INLINE int proxy_configuration_finished(const managed_proxy_t *mp); @@ -287,35 +282,23 @@ launch_managed_proxy(managed_proxy_t *mp) { int retval; -#ifdef _WIN32 - - LPVOID envp=NULL; - - set_managed_proxy_environment(&envp, mp); - tor_assert(envp); + process_environment_t *env = create_managed_proxy_environment(mp); +#ifdef _WIN32 /* Passing NULL as lpApplicationName makes Windows search for the .exe */ - retval = tor_spawn_background(NULL, (const char **)mp->argv, envp, + retval = tor_spawn_background(NULL, + (const char **)mp->argv, + env->windows_environment_block, &mp->process_handle); - - tor_free(envp); - #else - - char **envp=NULL; - - /* prepare the environment variables for the managed proxy */ - set_managed_proxy_environment(&envp, mp); - tor_assert(envp); - - retval = tor_spawn_background(mp->argv[0], (const char **)mp->argv, - (const char **)envp, &mp->process_handle); - - /* free the memory allocated by set_managed_proxy_environment(). */ - free_execve_args(envp); - + retval = tor_spawn_background(mp->argv[0], + (const char **)mp->argv, + env->unixoid_environment_block, + &mp->process_handle); #endif + process_environment_free(env); + if (retval == PROCESS_STATUS_ERROR) { log_warn(LD_GENERAL, "Managed proxy at '%s' failed at launch.", mp->argv[0]); @@ -971,171 +954,78 @@ get_bindaddr_for_server_proxy(const managed_proxy_t *mp) return bindaddr_result; } -#ifdef _WIN32 - -/** Prepare the environment envp of managed proxy mp. - * envp is allocated on the heap and should be freed by the - * caller after its use. */ -static void -set_managed_proxy_environment(LPVOID *envp, const managed_proxy_t *mp) +/** Return a newly allocated process_environment_t * for mp's + * process. */ +static process_environment_t * +create_managed_proxy_environment(const managed_proxy_t *mp) { const or_options_t *options = get_options(); - char *tmp=NULL; - char *state_tmp=NULL; - char *state_env=NULL; - char *transports_to_launch=NULL; - char *transports_env=NULL; - char *bindaddr_tmp=NULL; - char *bindaddr_env=NULL; - char *orport_env=NULL; - - char version_env[31]; /* XXX temp */ - char extended_env[43]; /* XXX temp */ - - int env_size = 0; - - /* A smartlist carrying all the env. variables that the managed - proxy should inherit. */ + /* Environment variables to be added to or set in mp's environment. + * These are heap-allocated and are freed before this function + * returns. */ smartlist_t *envs = smartlist_new(); - /* Copy the whole environment of the Tor process. - It should also copy PATH and HOME of the Tor process.*/ - char **environ_tmp = environ; - while (*environ_tmp) - smartlist_add(envs, *environ_tmp++); + /* The final environment to be passed to mp. Inherited variables are + * statically allocated; new ones are heap-allocated. */ + smartlist_t *merged_env_vars = get_current_process_environment_variables(); - /* Create the TOR_PT_* environment variables. */ - state_tmp = get_datadir_fname("pt_state/"); /* XXX temp */ - tor_asprintf(&state_env, "TOR_PT_STATE_LOCATION=%s", state_tmp); + process_environment_t *env; - strcpy(version_env, "TOR_PT_MANAGED_TRANSPORT_VER=1"); - - transports_to_launch = - smartlist_join_strings(mp->transports_to_launch, ",", 0, NULL); - - tor_asprintf(&transports_env, - mp->is_server ? - "TOR_PT_SERVER_TRANSPORTS=%s" : "TOR_PT_CLIENT_TRANSPORTS=%s", - transports_to_launch); - - smartlist_add(envs, state_env); - smartlist_add(envs, version_env); - smartlist_add(envs, transports_env); + { + char *state_tmp = get_datadir_fname("pt_state/"); /* XXX temp */ + smartlist_add_asprintf(envs, "TOR_PT_STATE_LOCATION=%s", state_tmp); + tor_free(state_tmp); + } - if (mp->is_server) { - tor_asprintf(&orport_env, "TOR_PT_ORPORT=127.0.0.1:%s", - options->ORPort->value); + smartlist_add(envs, tor_strdup("TOR_PT_MANAGED_TRANSPORT_VER=1")); - bindaddr_tmp = get_bindaddr_for_server_proxy(mp); - tor_asprintf(&bindaddr_env, "TOR_PT_SERVER_BINDADDR=%s", bindaddr_tmp); + { + char *transports_to_launch = + smartlist_join_strings(mp->transports_to_launch, ",", 0, NULL); - strlcpy(extended_env, "TOR_PT_EXTENDED_SERVER_PORT=", - sizeof(extended_env)); + smartlist_add_asprintf(envs, + mp->is_server ? + "TOR_PT_SERVER_TRANSPORTS=%s" : + "TOR_PT_CLIENT_TRANSPORTS=%s", + transports_to_launch); - smartlist_add(envs, orport_env); - smartlist_add(envs, extended_env); - smartlist_add(envs, bindaddr_env); + tor_free(transports_to_launch); } - /* It seems like some versions of Windows need a sorted lpEnvironment - block. */ - smartlist_sort_strings(envs); - - /* An environment block consists of a null-terminated block of - null-terminated strings: */ - - /* Calculate the block's size. */ - SMARTLIST_FOREACH(envs, const char *, s, - env_size += strlen(s) + 1); - env_size += 1; /* space for last NUL */ - - *envp = tor_malloc(env_size); - tmp = *envp; - - /* Create the block. */ - SMARTLIST_FOREACH_BEGIN(envs, const char *, s) { - memcpy(tmp, s, strlen(s)); /* copy the env. variable string */ - tmp += strlen(s); - memset(tmp, '\0', 1); /* append NUL at the end of the string */ - tmp += 1; - } SMARTLIST_FOREACH_END(s); - memset(tmp, '\0', 1); /* last NUL */ - - /* Finally, free the whole mess. */ - tor_free(state_tmp); - tor_free(state_env); - tor_free(transports_to_launch); - tor_free(transports_env); - tor_free(bindaddr_tmp); - tor_free(bindaddr_env); - tor_free(orport_env); - - smartlist_free(envs); -} - -#else /* _WIN32 */ + if (mp->is_server) { + smartlist_add_asprintf(envs, "TOR_PT_ORPORT=127.0.0.1:%s", + options->ORPort->value); -extern char **environ; + { + char *bindaddr_tmp = get_bindaddr_for_server_proxy(mp); + smartlist_add_asprintf(envs, "TOR_PT_SERVER_BINDADDR=%s", bindaddr_tmp); + tor_free(bindaddr_tmp); + } -/** Prepare the environment envp of managed proxy mp. - * envp is allocated on the heap and should be freed by the - * caller after its use. */ -static void -set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp) -{ - const or_options_t *options = get_options(); - char **tmp=NULL; - char *state_loc=NULL; - char *transports_to_launch=NULL; - char *bindaddr=NULL; - int environ_size=0; - char **environ_tmp = environ; - - int n_envs = mp->is_server ? ENVIRON_SIZE_SERVER : ENVIRON_SIZE_CLIENT; - - while (*environ_tmp) { - environ_size++; - environ_tmp++; + /* XXX023 Remove the '=' here once versions of obfsproxy which + * assert that this env var exists are sufficiently dead. + * + * (If we remove this line entirely, some joker will stick this + * variable in Tor's environment and crash PTs that try to parse + * it even when not run in server mode.) */ + smartlist_add(envs, tor_strdup("TOR_PT_EXTENDED_SERVER_PORT=")); } - environ_tmp = environ; - /* allocate enough space for our env. vars and a NULL pointer */ - *envp = tor_malloc(sizeof(char*)*(environ_size+n_envs+1)); - tmp = *envp; + SMARTLIST_FOREACH_BEGIN(envs, const char *, env_var) { + set_environment_variable_in_smartlist(merged_env_vars, env_var, NULL, 0); + } SMARTLIST_FOREACH_END(env_var); - state_loc = get_datadir_fname("pt_state/"); /* XXX temp */ - transports_to_launch = - smartlist_join_strings(mp->transports_to_launch, ",", 0, NULL); + env = process_environment_make(merged_env_vars); - while (*environ_tmp) { - *tmp = tor_strdup(*environ_tmp); - tmp++, environ_tmp++; - } + smartlist_free(merged_env_vars); - tor_asprintf(tmp++, "TOR_PT_STATE_LOCATION=%s", state_loc); - tor_asprintf(tmp++, "TOR_PT_MANAGED_TRANSPORT_VER=1"); /* temp */ - if (mp->is_server) { - bindaddr = get_bindaddr_for_server_proxy(mp); - - /* XXX temp */ - tor_asprintf(tmp++, "TOR_PT_ORPORT=127.0.0.1:%d", - router_get_advertised_or_port(options)); - tor_asprintf(tmp++, "TOR_PT_SERVER_BINDADDR=%s", bindaddr); - tor_asprintf(tmp++, "TOR_PT_SERVER_TRANSPORTS=%s", transports_to_launch); - tor_asprintf(tmp++, "TOR_PT_EXTENDED_SERVER_PORT="); - } else { - tor_asprintf(tmp++, "TOR_PT_CLIENT_TRANSPORTS=%s", transports_to_launch); - } - *tmp = NULL; + SMARTLIST_FOREACH(envs, void *, x, tor_free(x)); + smartlist_free(envs); - tor_free(state_loc); - tor_free(transports_to_launch); - tor_free(bindaddr); + return env; } -#endif /* _WIN32 */ - /** Create and return a new managed proxy for transport using * proxy_argv. If is_server is true, it's a server * managed proxy. */

1 0

[tor/master] Pass process_environment_t * to tor_spawn_background
by nickm＠torproject.org 17 Feb '12

17 Feb '12

commit c0808b795f9b52184a18e7a2960f56ed0e330c4b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Feb 13 00:59:49 2012 -0800 Pass process_environment_t * to tor_spawn_background Now tor_spawn_background's prototype is OS-independent. --- src/common/util.c | 12 ++++-------- src/common/util.h | 15 ++++----------- src/or/transports.c | 4 ++-- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index ac65f48..90ad8c0 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3313,11 +3313,7 @@ process_handle_new(void) */ int tor_spawn_background(const char *const filename, const char **argv, -#ifdef _WIN32 - LPVOID envp, -#else - const char **envp, -#endif + process_environment_t *env, process_handle_t **process_handle_out) { #ifdef _WIN32 @@ -3398,7 +3394,7 @@ tor_spawn_background(const char *const filename, const char **argv, /*(TODO: set CREATE_NEW CONSOLE/PROCESS_GROUP to make GetExitCodeProcess() * work?) */ 0, // creation flags - envp, // use parent's environment + (env==NULL) ? NULL : env->windows_environment_block, NULL, // use parent's current directory &siStartInfo, // STARTUPINFO pointer &(process_handle->pid)); // receives PROCESS_INFORMATION @@ -3528,8 +3524,8 @@ tor_spawn_background(const char *const filename, const char **argv, /* Call the requested program. We need the cast because execvp doesn't define argv as const, even though it does not modify the arguments */ - if (envp) - execve(filename, (char *const *) argv, (char*const*)envp); + if (env) + execve(filename, (char *const *) argv, env->unixoid_environment_block); else execvp(filename, (char *const *) argv); diff --git a/src/common/util.h b/src/common/util.h index 41bd3d9..567efaa 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -365,12 +365,9 @@ void tor_check_port_forwarding(const char *filename, int dir_port, int or_port, time_t now); typedef struct process_handle_t process_handle_t; +typedef struct process_environment_t process_environment_t; int tor_spawn_background(const char *const filename, const char **argv, -#ifdef _WIN32 - LPVOID envp, -#else - const char **envp, -#endif + process_environment_t *env, process_handle_t **process_handle_out); #define SPAWN_ERROR_MESSAGE "ERR: Failed to spawn background process - code " @@ -386,13 +383,9 @@ struct process_environment_t { * 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". - * - * XXXX This should have type char **, but tor_spawn_background's - * prototype is incorrect. */ - const char **unixoid_environment_block; + * 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); diff --git a/src/or/transports.c b/src/or/transports.c index b3c8382..c10490e 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -288,12 +288,12 @@ launch_managed_proxy(managed_proxy_t *mp) /* Passing NULL as lpApplicationName makes Windows search for the .exe */ retval = tor_spawn_background(NULL, (const char **)mp->argv, - env->windows_environment_block, + env, &mp->process_handle); #else retval = tor_spawn_background(mp->argv[0], (const char **)mp->argv, - env->unixoid_environment_block, + env, &mp->process_handle); #endif

1 0

[tor/master] Merge branch 'bug5105-v2-squashed'
by nickm＠torproject.org 17 Feb '12

17 Feb '12

commit eaedcba49315f3fe384c379f30692793ca9da18e Merge: 3cdc464 773290c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 17 11:50:10 2012 -0500 Merge branch 'bug5105-v2-squashed' Conflicts: src/or/transports.c changes/bug5105 | 11 +++ src/common/util.c | 199 +++++++++++++++++++++++++++++++++++++++-- src/common/util.h | 30 +++++- src/or/transports.c | 235 +++++++++++++----------------------------------- src/test/test_util.c | 242 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 531 insertions(+), 186 deletions(-)

1 0

[tor/master] Heap-allocate strings returned by get_current_process_environment_variables
by nickm＠torproject.org 17 Feb '12

17 Feb '12

commit 33552c16ca3644e2dddd8ba6beee58aabd9d1977 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Feb 15 14:09:53 2012 -0800 Heap-allocate strings returned by get_current_process_environment_variables --- src/common/util.c | 6 +++--- src/or/transports.c | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 90ad8c0..509477a 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3832,8 +3832,8 @@ process_environment_make(struct smartlist_t *env_vars) * 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. */ + * The returned strings are heap-allocated, and must be freed by the + * caller. */ struct smartlist_t * get_current_process_environment_variables(void) { @@ -3841,7 +3841,7 @@ get_current_process_environment_variables(void) char **environ_tmp; /* Not const char ** ? Really? */ for (environ_tmp = environ; *environ_tmp; ++environ_tmp) { - smartlist_add(sl, (void *)(*environ_tmp)); + smartlist_add(sl, tor_strdup(*environ_tmp)); } return sl; diff --git a/src/or/transports.c b/src/or/transports.c index c10490e..726419e 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -961,13 +961,14 @@ create_managed_proxy_environment(const managed_proxy_t *mp) { const or_options_t *options = get_options(); - /* Environment variables to be added to or set in mp's environment. - * These are heap-allocated and are freed before this function - * returns. */ + /* Environment variables to be added to or set in mp's environment. */ smartlist_t *envs = smartlist_new(); + /* XXXX The next time someone touches this code, shorten the name of + * set_environment_variable_in_smartlist, add a + * set_env_var_in_smartlist_asprintf function, and get rid of the + * silly extra envs smartlist. */ - /* The final environment to be passed to mp. Inherited variables are - * statically allocated; new ones are heap-allocated. */ + /* The final environment to be passed to mp. */ smartlist_t *merged_env_vars = get_current_process_environment_variables(); process_environment_t *env; @@ -1013,16 +1014,17 @@ create_managed_proxy_environment(const managed_proxy_t *mp) } SMARTLIST_FOREACH_BEGIN(envs, const char *, env_var) { - set_environment_variable_in_smartlist(merged_env_vars, env_var, NULL, 0); + set_environment_variable_in_smartlist(merged_env_vars, env_var, + _tor_free, 1); } SMARTLIST_FOREACH_END(env_var); env = process_environment_make(merged_env_vars); - smartlist_free(merged_env_vars); - - SMARTLIST_FOREACH(envs, void *, x, tor_free(x)); smartlist_free(envs); + SMARTLIST_FOREACH(merged_env_vars, void *, x, tor_free(x)); + smartlist_free(merged_env_vars); + return env; }

1 0

[tor/master] Add unit tests for easily tested, non-trivial utility functions
by nickm＠torproject.org 17 Feb '12

17 Feb '12

commit 773290c09aaf4e1ed0b815b74da7b6ec07204283 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Feb 15 22:41:49 2012 -0800 Add unit tests for easily tested, non-trivial utility functions --- src/test/test_util.c | 242 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 242 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 508c155..4fabc22 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1856,6 +1856,245 @@ test_util_eat_whitespace(void *ptr) ; } +/** Return a newly allocated smartlist containing the lines of text in + * lines. The returned strings are heap-allocated, and must be + * freed by the caller. + * + * XXXX? Move to container.[hc] ? */ +static smartlist_t * +smartlist_new_from_text_lines(const char *lines) +{ + smartlist_t *sl = smartlist_new(); + char *last_line; + + smartlist_split_string(sl, lines, "\n", 0, 0); + + last_line = smartlist_pop_last(sl); + if (last_line != NULL && *last_line != '\0') { + smartlist_add(sl, last_line); + } + + return sl; +} + +/** Test smartlist_new_from_text_lines */ +static void +test_util_sl_new_from_text_lines(void *ptr) +{ + (void)ptr; + + { /* Normal usage */ + smartlist_t *sl = smartlist_new_from_text_lines("foo\nbar\nbaz\n"); + int sl_len = smartlist_len(sl); + + tt_want_int_op(sl_len, ==, 3); + + if (sl_len > 0) tt_want_str_op(smartlist_get(sl, 0), ==, "foo"); + if (sl_len > 1) tt_want_str_op(smartlist_get(sl, 1), ==, "bar"); + if (sl_len > 2) tt_want_str_op(smartlist_get(sl, 2), ==, "baz"); + + SMARTLIST_FOREACH(sl, void *, x, tor_free(x)); + smartlist_free(sl); + } + + { /* No final newline */ + smartlist_t *sl = smartlist_new_from_text_lines("foo\nbar\nbaz"); + int sl_len = smartlist_len(sl); + + tt_want_int_op(sl_len, ==, 3); + + if (sl_len > 0) tt_want_str_op(smartlist_get(sl, 0), ==, "foo"); + if (sl_len > 1) tt_want_str_op(smartlist_get(sl, 1), ==, "bar"); + if (sl_len > 2) tt_want_str_op(smartlist_get(sl, 2), ==, "baz"); + + SMARTLIST_FOREACH(sl, void *, x, tor_free(x)); + smartlist_free(sl); + } + + { /* No newlines */ + smartlist_t *sl = smartlist_new_from_text_lines("foo"); + int sl_len = smartlist_len(sl); + + tt_want_int_op(sl_len, ==, 1); + + if (sl_len > 0) tt_want_str_op(smartlist_get(sl, 0), ==, "foo"); + + SMARTLIST_FOREACH(sl, void *, x, tor_free(x)); + smartlist_free(sl); + } + + { /* No text at all */ + smartlist_t *sl = smartlist_new_from_text_lines(""); + int sl_len = smartlist_len(sl); + + tt_want_int_op(sl_len, ==, 0); + + SMARTLIST_FOREACH(sl, void *, x, tor_free(x)); + smartlist_free(sl); + } +} + +/** Test process_environment_make */ +static void +test_util_make_environment(void *ptr) +{ + const char *env_vars_string = + "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/bin\n" + "HOME=/home/foozer\n"; + const char expected_windows_env_block[] = + "HOME=/home/foozer\000" + "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/bin\000" + "\000"; + size_t expected_windows_env_block_len = sizeof(expected_windows_env_block); + + smartlist_t *env_vars = smartlist_new_from_text_lines(env_vars_string); + smartlist_t *env_vars_sorted = smartlist_new(); + smartlist_t *env_vars_in_unixoid_env_block_sorted = smartlist_new(); + + process_environment_t *env; + + (void)ptr; + + env = process_environment_make(env_vars); + + /* Check that the Windows environment block is correct. */ + tt_want(tor_memeq(expected_windows_env_block, env->windows_environment_block, + expected_windows_env_block_len)); + + /* Now for the Unixoid environment block. We don't care which order + * these environment variables are in, so we sort both lists first. */ + + smartlist_add_all(env_vars_sorted, env_vars); + + { + char **v; + for (v = env->unixoid_environment_block; *v; ++v) { + smartlist_add(env_vars_in_unixoid_env_block_sorted, *v); + } + } + + smartlist_sort_strings(env_vars_sorted); + smartlist_sort_strings(env_vars_in_unixoid_env_block_sorted); + + tt_want_int_op(smartlist_len(env_vars_sorted), ==, + smartlist_len(env_vars_in_unixoid_env_block_sorted)); + { + int len = smartlist_len(env_vars_sorted); + int i; + + if (smartlist_len(env_vars_in_unixoid_env_block_sorted) < len) { + len = smartlist_len(env_vars_in_unixoid_env_block_sorted); + } + + for (i = 0; i < len; ++i) { + tt_want_str_op(smartlist_get(env_vars_sorted, i), ==, + smartlist_get(env_vars_in_unixoid_env_block_sorted, i)); + } + } + + /* Clean up. */ + smartlist_free(env_vars_in_unixoid_env_block_sorted); + smartlist_free(env_vars_sorted); + + SMARTLIST_FOREACH(env_vars, char *, x, tor_free(x)); + smartlist_free(env_vars); + + process_environment_free(env); +} + +/** Test set_environment_variable_in_smartlist */ +static void +test_util_set_env_var_in_sl(void *ptr) +{ + /* The environment variables in these strings are in arbitrary + * order; we sort the resulting lists before comparing them. + * + * (They *will not* end up in the order shown in + * expected_resulting_env_vars_string.) */ + + const char *base_env_vars_string = + "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/bin\n" + "HOME=/home/foozer\n" + "TERM=xterm\n" + "SHELL=/bin/ksh\n" + "USER=foozer\n" + "LOGNAME=foozer\n" + "USERNAME=foozer\n" + "LANG=en_US.utf8\n" + ; + + const char *new_env_vars_string = + "TERM=putty\n" + "DISPLAY=:18.0\n" + ; + + const char *expected_resulting_env_vars_string = + "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/bin\n" + "HOME=/home/foozer\n" + "TERM=putty\n" + "SHELL=/bin/ksh\n" + "USER=foozer\n" + "LOGNAME=foozer\n" + "USERNAME=foozer\n" + "LANG=en_US.utf8\n" + "DISPLAY=:18.0\n" + ; + + smartlist_t *merged_env_vars = + smartlist_new_from_text_lines(base_env_vars_string); + smartlist_t *new_env_vars = + smartlist_new_from_text_lines(new_env_vars_string); + smartlist_t *expected_resulting_env_vars = + smartlist_new_from_text_lines(expected_resulting_env_vars_string); + + /* Elements of merged_env_vars are heap-allocated, and must be + * freed. Some of them are (or should) be freed by + * set_environment_variable_in_smartlist. + * + * Elements of new_env_vars are heap-allocated, but are copied into + * merged_env_vars, so they are not freed separately at the end of + * the function. + * + * Elements of expected_resulting_env_vars are heap-allocated, and + * must be freed. */ + + (void)ptr; + + SMARTLIST_FOREACH(new_env_vars, char *, env_var, + set_environment_variable_in_smartlist(merged_env_vars, + env_var, + _tor_free, + 1)); + + smartlist_sort_strings(merged_env_vars); + smartlist_sort_strings(expected_resulting_env_vars); + + tt_want_int_op(smartlist_len(merged_env_vars), ==, + smartlist_len(expected_resulting_env_vars)); + { + int len = smartlist_len(merged_env_vars); + int i; + + if (smartlist_len(expected_resulting_env_vars) < len) { + len = smartlist_len(expected_resulting_env_vars); + } + + for (i = 0; i < len; ++i) { + tt_want_str_op(smartlist_get(merged_env_vars, i), ==, + smartlist_get(expected_resulting_env_vars, i)); + } + } + + /* Clean up. */ + SMARTLIST_FOREACH(merged_env_vars, char *, x, tor_free(x)); + smartlist_free(merged_env_vars); + + smartlist_free(new_env_vars); + + SMARTLIST_FOREACH(expected_resulting_env_vars, char *, x, tor_free(x)); + smartlist_free(expected_resulting_env_vars); +} + #define UTIL_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_util_ ## name } @@ -1895,6 +2134,9 @@ struct testcase_t util_tests[] = { UTIL_TEST(split_lines, 0), UTIL_TEST(n_bits_set, 0), UTIL_TEST(eat_whitespace, 0), + UTIL_TEST(sl_new_from_text_lines, 0), + UTIL_TEST(make_environment, 0), + UTIL_TEST(set_env_var_in_sl, 0), END_OF_TESTCASES };

1 0

[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