- tor-commits - lists.torproject.org

[tor/master] document a cool attack that we evaluated
by arma＠torproject.org 17 Feb '12

17 Feb '12

commit 3a94530595cfb57bdb4e3401d29a8a4d0b638d01 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Feb 17 14:02:25 2012 -0500 document a cool attack that we evaluated --- src/or/policies.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index 0982b4b..e5062cd 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1452,7 +1452,17 @@ compare_tor_addr_to_short_policy(const tor_addr_t *addr, uint16_t port, else accept = ! policy->is_accept; - /* ???? are these right? */ + /* ???? are these right? -NM */ + /* We should be sure not to return ADDR_POLICY_ACCEPTED in the accept + * case here, because it would cause clients to believe that the node + * allows exit enclaving. Trying it anyway would open up a cool attack + * where the node refuses due to exitpolicy, the client reacts in + * surprise by rewriting the node's exitpolicy to reject *:*, and then + * a bad guy targets users by causing them to attempt such connections + * to 98% of the exits. + * + * Once microdescriptors can handle addresses in special cases (e.g. if + * we ever solve ticket 1774), we can provide certainty here. -RD */ if (accept) return ADDR_POLICY_PROBABLY_ACCEPTED; else

1 0

r25448: {website} and fix output fd for the error message (website/trunk)
by Peter Palfrader 17 Feb '12

17 Feb '12

Author: weasel Date: 2012-02-17 17:17:51 +0000 (Fri, 17 Feb 2012) New Revision: 25448 Modified: website/trunk/publish Log: and fix output fd for the error message Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2012-02-17 17:15:47 UTC (rev 25447) +++ website/trunk/publish 2012-02-17 17:17:51 UTC (rev 25448) @@ -35,7 +35,7 @@ ssh www-master.torproject.org ' ( find /srv/www-master.torproject.org/htdocs ! -perm -444 -print0 | xargs -0 --no-run-if-empty chmod -v a+r || - ( echo 2>&1 "There are unreadable files in /srv/www-master.torproject.org/htdocs, not triggering mirror run."; exit 1) + ( echo >&2 "There are unreadable files in /srv/www-master.torproject.org/htdocs, not triggering mirror run."; exit 1) ) && echo "Triggering mirror run" && /home/mirroradm/bin/trigger-mirrors'

1 0

r25447: {website} publish: Fix find logic, and we do not need a tty (website/trunk)
by Peter Palfrader 17 Feb '12

17 Feb '12

Author: weasel Date: 2012-02-17 17:15:47 +0000 (Fri, 17 Feb 2012) New Revision: 25447 Modified: website/trunk/publish Log: publish: Fix find logic, and we do not need a tty Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2012-02-17 17:11:49 UTC (rev 25446) +++ website/trunk/publish 2012-02-17 17:15:47 UTC (rev 25447) @@ -32,9 +32,10 @@ -Prvz --delete . www-master.torproject.org:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update" -ssh -t www-master.torproject.org ' +ssh www-master.torproject.org ' ( - find /srv/www-master.torproject.org/htdocs ! -perm +444 -print0 | xargs -0 --no-run-if-empty chmod -v a+r || - echo 2>&1 "There are unreadable files in /srv/www-master.torproject.org/htdocs, not triggering mirror run." + find /srv/www-master.torproject.org/htdocs ! -perm -444 -print0 | xargs -0 --no-run-if-empty chmod -v a+r || + ( echo 2>&1 "There are unreadable files in /srv/www-master.torproject.org/htdocs, not triggering mirror run."; exit 1) ) && + echo "Triggering mirror run" && /home/mirroradm/bin/trigger-mirrors'

1 0

r25446: {website} Update publish - extend ignore list for rsync - use www-mast (website/trunk)
by Peter Palfrader 17 Feb '12

17 Feb '12

Author: weasel Date: 2012-02-17 17:11:49 +0000 (Fri, 17 Feb 2012) New Revision: 25446 Modified: website/trunk/publish Log: Update publish - extend ignore list for rsync - use www-master.torproject.org instead of unqualified vescum - fix recursive chmod to only try to chmod files that need it - supported updating with both git and svn instead of just svn - do not trigger a mirrorrun if there are unreadable files in www-master's docroot Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2012-02-17 16:56:55 UTC (rev 25445) +++ website/trunk/publish 2012-02-17 17:11:49 UTC (rev 25446) @@ -2,7 +2,13 @@ set -e # stop if we encounter an error # pull the latest changes -svn update +if [ -e .svn ] ; then + svn update +elif [ -e .git ] ; then + git svn rebase +else + echo 2>&1 "Cannot figure out which version control thing you're using. Skipping update" +fi # clean up the working directory make clean @@ -12,8 +18,23 @@ # don't copy over stuff with permissions that make it useless chmod -R a+r * -rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum:/srv/www-master.torproject.org/htdocs +rsync \ + --exclude .DS_Store \ + --exclude .svn \ + --exclude .git \ + --exclude '.*.sw[po]' \ + --exclude .deps \ + --exclude svn \ + --exclude dist \ + --exclude releases \ + --exclude torbutton-current.xpi \ + --exclude project \ + -Prvz --delete . www-master.torproject.org:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update" -ssh vescum '/home/mirroradm/bin/trigger-mirrors' -ssh vescum chmod g+w -R /srv/www-master.torproject.org/htdocs +ssh -t www-master.torproject.org ' + ( + find /srv/www-master.torproject.org/htdocs ! -perm +444 -print0 | xargs -0 --no-run-if-empty chmod -v a+r || + echo 2>&1 "There are unreadable files in /srv/www-master.torproject.org/htdocs, not triggering mirror run." + ) && + /home/mirroradm/bin/trigger-mirrors'

1 0

r25445: {website} Fix the <pre>s in debian (website/trunk/docs/en)
by Peter Palfrader 17 Feb '12

17 Feb '12

Author: weasel Date: 2012-02-17 16:56:55 +0000 (Fri, 17 Feb 2012) New Revision: 25445 Modified: website/trunk/docs/en/debian.wml Log: Fix the <pre>s in debian Modified: website/trunk/docs/en/debian.wml =================================================================== --- website/trunk/docs/en/debian.wml 2012-02-17 16:51:50 UTC (rev 25444) +++ website/trunk/docs/en/debian.wml 2012-02-17 16:56:55 UTC (rev 25445) @@ -67,7 +67,7 @@ Then add this line to your <tt>/etc/apt/sources.list</tt> file: -<pre> +<pre style="margin: 1.5em 0 1.5em 2em"> deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main </pre> where you put the codename of your distribution (i.e. lenny, sid, @@ -78,13 +78,13 @@ Then add the gpg key used to sign the packages by running the following commands at your command prompt: -<pre> +<pre style="margin: 1.5em 0 1.5em 2em"> gpg --keyserver keys.gnupg.net --recv 886DDD89 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - </pre> Now refresh your sources, running the following command (as root) at your command prompt: -<pre> +<pre style="margin: 1.5em 0 1.5em 2em"> apt-get update </pre> If there are no errors you're good to continue. @@ -93,14 +93,14 @@ We provide a Debian package to help you keep our signing key current. It is recommended you use it. Install it using -<pre> +<pre style="margin: 1.5em 0 1.5em 2em"> apt-get install deb.torproject.org-keyring </pre> To finally install Tor just run: -<pre> +<pre style="margin: 1.5em 0 1.5em 2em"> apt-get install tor </pre> @@ -131,7 +131,7 @@ download/download>#packagediff">development branch</a> of Tor instead (more features and more bugs), you need to add a different set of lines to your <tt>/etc/apt/sources.list</tt> file: -<pre> +<pre style="margin: 1.5em 0 1.5em 2em"> deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main deb http://deb.torproject.org/torproject.org experimental-<DISTRIBUTION> main </pre> @@ -142,7 +142,7 @@ Then run the following commands at your command prompt: -<pre> +<pre style="margin: 1.5em 0 1.5em 2em"> gpg --keyserver keys.gnupg.net --recv 886DDD89 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - apt-get update @@ -165,7 +165,7 @@ If you want to build your own debs from source you must first add an appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>. -<pre> +<pre style="margin: 1.5em 0 1.5em 2em"> # For the stable version. deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main @@ -175,12 +175,12 @@ </pre> You also need to install the necessary packages to build your own debs and the packages needed to build Tor: -<pre> +<pre style="margin: 1.5em 0 1.5em 2em"> apt-get install build-essential fakeroot devscripts apt-get build-dep tor </pre> Then you can build Tor in ~/debian-packages: -<pre> +<pre style="margin: 1.5em 0 1.5em 2em"> mkdir ~/debian-packages; cd ~/debian-packages apt-get source tor cd tor-* @@ -188,7 +188,7 @@ cd .. </pre> Now you can install the new package: -<pre> +<pre style="margin: 1.5em 0 1.5em 2em"> sudo dpkg -i tor_*.deb </pre>

1 0

r25444: {website} Update .gitignore (website/trunk)
by Peter Palfrader 17 Feb '12

17 Feb '12

Author: weasel Date: 2012-02-17 16:51:50 +0000 (Fri, 17 Feb 2012) New Revision: 25444 Modified: website/trunk/.gitignore Log: Update .gitignore Modified: website/trunk/.gitignore =================================================================== --- website/trunk/.gitignore 2012-02-17 16:50:37 UTC (rev 25443) +++ website/trunk/.gitignore 2012-02-17 16:51:50 UTC (rev 25444) @@ -1 +1,81 @@ /Makefile.local +.deps + +about/board.html.en +about/contact.html.en +about/contributors.html.en +about/corepeople.html.en +about/financials.html.en +about/gsoc.html.en +about/overview.html.en +about/sponsors.html.en +about/torusers.html.en +about/translators.html.en +about/volunteers.html.en +docs/N900.html.en +docs/android.html.en +docs/bridges.html.en +docs/debian-vidalia.html.en +docs/debian.html.en +docs/documentation.html.en +docs/faq-abuse.html.en +docs/faq.html.en +docs/hidden-services.html.en +docs/installguide.html.en +docs/manual.html.en +docs/proxychain.html.en +docs/rpms.html.en +docs/running-a-mirror.html.en +docs/short-user-manual.html.en +docs/signing-keys.html.en +docs/tor-doc-osx.html.en +docs/tor-doc-relay.html.en +docs/tor-doc-unix.html.en +docs/tor-doc-web.html.en +docs/tor-doc-win32.html.en +docs/tor-doc-windows.html.en +docs/tor-hidden-service.html.en +docs/tor-manual-dev.html.en +docs/tor-manual.html.en +docs/trademark-faq.html.en +docs/verifying-signatures.html.en +donate/become-sponsor.html.en +donate/donate-hardware.html.en +donate/donate-service.html.en +donate/donate.html.en +donate/matching-program.html.en +donate/thankyou.html.en +download/download-easy.html.en +download/download-unix.html.en +download/download.html.en +eff/tor-dmca-response.html.en +eff/tor-legal-faq.html.en +getinvolved/mirrors.html.en +getinvolved/open-positions.html.en +getinvolved/research.html.en +getinvolved/translation-overview.html.en +getinvolved/translation.html.en +getinvolved/tshirt.html.en +getinvolved/volunteer.html.en +index.html.en +press/2008-12-19-roadmap-press-release.html.en +press/2009-03-12-performance-roadmap-press-release.html.en +press/2010-03-25-tor-store-press-release.html.en +press/2010-09-16-ten-things-circumvention-tools.html.en +press/2011-08-28-tor-022-stable.html.en +press/inthemedia.html.en +press/press.html.en +projects/arm.html.en +projects/gettor.html.en +projects/obfsproxy-instructions.html.en +projects/obfsproxy.html.en +projects/projects.html.en +projects/sampleproject.html.en +projects/torbrowser-details.html.en +projects/torbrowser.html.en +projects/tordnsel.html.en +projects/torweather.html.en +projects/vidalia.html.en +torbutton/index.html.en +torbutton/torbutton-faq.html.en +torbutton/torbutton-options.html.en

1 0

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