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

[orbot/master] Address issues related to onionoo relay/node info lookup
by n8fr8＠torproject.org 02 Aug '14

02 Aug '14

commit 31cf9816fb64e2afaeb5eda052079c543308d179 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Aug 2 00:57:18 2014 -0400 Address issues related to onionoo relay/node info lookup -Ensure streams, files are closed -Add timeout values to socket, streams -Change torrc CircuitStreamTimeout to 120 --- src/org/torproject/android/service/TorService.java | 263 +++++++++++--------- .../android/service/TorServiceUtils.java | 2 +- 2 files changed, 150 insertions(+), 115 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 88e8082..a147bae 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -17,6 +17,7 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintStream; import java.io.PrintWriter; @@ -33,6 +34,8 @@ import java.util.List; import java.util.Properties; import java.util.Set; import java.util.StringTokenizer; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; import java.util.regex.Pattern; @@ -62,10 +65,8 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; -import android.graphics.Color; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.os.AsyncTask; import android.os.Build; import android.os.IBinder; import android.os.RemoteException; @@ -132,6 +133,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private boolean mTransProxyAll = false; private boolean mTransProxyTethering = false; + private ExecutorService mExecutor = Executors.newCachedThreadPool(); + public void debug(String msg) { if (ENABLE_DEBUG_LOG) @@ -251,7 +254,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (hmBuiltNodes.size() > 0) { - sbInfo.append("Your Tor Public IPs:\n"); + //sbInfo.append(getString(R.string.your_tor_public_ips_) + '\n'); + Set<String> itBuiltNodes = hmBuiltNodes.keySet(); for (String key : itBuiltNodes) { @@ -303,7 +307,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (notifyType != NOTIFY_ID) { mNotifyBuilder.setTicker(notifyMsg); - mNotifyBuilder.setLights(Color.GREEN, 1000, 1000); + // mNotifyBuilder.setLights(Color.GREEN, 1000, 1000); + } + else + { + mNotifyBuilder.setTicker(null); } mNotifyBuilder.setOngoing(prefPersistNotifications); @@ -330,7 +338,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - new startTorOperation().execute(intent); + mExecutor.execute (new TorStarter(intent)); return Service.START_STICKY; @@ -343,45 +351,46 @@ public class TorService extends Service implements TorServiceConstants, TorConst } + private class TorStarter implements Runnable + { + Intent mIntent; + + public TorStarter (Intent intent) + { + mIntent = intent; + } + + public void run () + { + try + { + + if (mNotificationManager == null) + { + + IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); + registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); + + mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + + if (mIntent != null && mIntent.getAction()!=null && mIntent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) + { + setTorProfile(PROFILE_ON); + } + } + } + catch (Exception e) + { + Log.e(TAG,"error onBind",e); + } + } + } + @Override public void onTaskRemoved(Intent rootIntent) { logNotice("Orbot was swiped away... background service will keep running"); } - private class startTorOperation extends AsyncTask<Intent, Void, Boolean> { - @Override - protected Boolean doInBackground(Intent... params) { - - try - { - Intent intent = params[0]; - - if (mNotificationManager == null) - { - - IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); - registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); - - mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - - if (intent != null && intent.getAction()!=null && intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) - { - setTorProfile(PROFILE_ON); - } - } - } - catch (Exception e) - { - Log.e(TAG,"error onBind",e); - } - - - return true; - } - - } - - @@ -561,6 +570,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void onCreate() { super.onCreate(); +// android.os.Debug.waitForDebugger(); + try { initBinariesAndDirectories(); @@ -635,6 +646,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst extraLines.append("AvoidDiskWrites 1").append('\n'); + extraLines.append("CircuitStreamTimeout 120").append('\n'); extraLines.append("SOCKSPort ").append(socksPort).append('\n'); extraLines.append("SafeSocks 0").append('\n'); @@ -909,7 +921,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst props.store(new FileWriter(file), "updated"); - props.list(System.out); } @@ -1371,7 +1382,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst //get IP from last nodename if(status.equals("BUILT")){ - new getExternalIP().execute(node); + + if (node.ipAddress == null) + mExecutor.execute(new ExternalIPFetcher(node)); hmBuiltNodes.put(node.id, node); } @@ -1379,6 +1392,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (status.equals("CLOSED")) { hmBuiltNodes.remove(node.id); + + //how check the IP's of any other nodes we have + for (String nodeId : hmBuiltNodes.keySet()) + { + node = hmBuiltNodes.get(nodeId); + + if (node.ipAddress == null) + mExecutor.execute(new ExternalIPFetcher(node)); + + } } @@ -1397,49 +1420,74 @@ public class TorService extends Service implements TorServiceConstants, TorConst String organization; } - private class getExternalIP extends AsyncTask<Node, Void, Void>{ + private class ExternalIPFetcher implements Runnable { + private Node mNode; + private int MAX_ATTEMPTS = 3; - @Override - protected Void doInBackground(Node... nodes) { + public ExternalIPFetcher (Node node) + { + mNode = node; + } + + public void run () + { - if (conn != null) + if (mNode.ipAddress != null) + return; + + for (int i = 0; i < MAX_ATTEMPTS; i++) { - try { - //String nodeDetails = conn.getInfo("ns/id/"+nodes[0].id); - Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 8118)); - - URLConnection conn = new URL("https://onionoo.torproject.org/details?lookup=" + nodes[0].id).openConnection(proxy); - // getting JSON string from URL - - StringBuffer json = new StringBuffer(); - String line = null; - BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream())); - while ((line = reader.readLine())!=null) - json.append(line); - - JSONObject jsonNodeInfo = new org.json.JSONObject(json.toString()); + if (conn != null) + { + try { + //String nodeDetails = conn.getInfo("ns/id/"+nodes[0].id); + Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 8118)); + + URLConnection conn = new URL("https://onionoo.torproject.org/details?lookup=" + mNode.id).openConnection(proxy); + conn.setRequestProperty("Connection","Close"); + conn.setConnectTimeout(60000); + conn.setReadTimeout(60000); - JSONArray jsonRelays = jsonNodeInfo.getJSONArray("relays"); - if (jsonRelays.length() > 0) - { - nodes[0].ipAddress = jsonRelays.getJSONObject(0).getJSONArray("or_addresses").getString(0).split(":")[0]; + InputStream is = conn.getInputStream(); + + BufferedReader reader = new BufferedReader(new InputStreamReader(is)); + + // getting JSON string from URL + + StringBuffer json = new StringBuffer(); + String line = null; + + while ((line = reader.readLine())!=null) + json.append(line); + + JSONObject jsonNodeInfo = new org.json.JSONObject(json.toString()); + + JSONArray jsonRelays = jsonNodeInfo.getJSONArray("relays"); + if (jsonRelays.length() > 0) + { + mNode.ipAddress = jsonRelays.getJSONObject(0).getJSONArray("or_addresses").getString(0).split(":")[0]; + + mNode.country = jsonRelays.getJSONObject(0).getString("country_name"); + mNode.organization = jsonRelays.getJSONObject(0).getString("as_name"); + + + + } + + reader.close(); + is.close(); - nodes[0].country = jsonRelays.getJSONObject(0).getString("country_name"); - nodes[0].organization = jsonRelays.getJSONObject(0).getString("as_name"); + break; + } catch (Exception e) { + + debug ("Error getting node details from onionoo: " + e.getMessage()); } - - return null; - - } catch (Exception e) { - - logException ("Error getting node details from onionoo",e); } } - return null; } @@ -1461,30 +1509,26 @@ public class TorService extends Service implements TorServiceConstants, TorConst public IBinder onBind(Intent intent) { - new initTorOperation().execute(true); + mExecutor.execute(new Runnable () + { + public void run () + { + try + { + findExistingProc (); + } + catch (Exception e) + { + Log.e(TAG,"error onBind",e); + } + + } + }); return mBinder; } - private class initTorOperation extends AsyncTask<Boolean, Void, Boolean> { - @Override - protected Boolean doInBackground(Boolean... params) { - - try - { - findExistingProc (); - } - catch (Exception e) - { - Log.e(TAG,"error onBind",e); - } - - - return true; - } - - } - + /** * The IRemoteInterface is defined through IDL @@ -1495,29 +1539,20 @@ public class TorService extends Service implements TorServiceConstants, TorConst return getTorStatus(); } - public void setProfile (int profile) + + public void setProfile (final int profileNew) { - - new AsyncTask<Integer, Void, Boolean>() { - @Override - protected Boolean doInBackground(Integer... params) { - - try - { - - setTorProfile(params[0].intValue()); - - } - catch (Exception e) - { - Log.e(TAG,"error onBind",e); - } - - - return true; - } - - }.execute(profile); + + mExecutor.execute(new Runnable() + { + + @Override + public void run() { + setTorProfile(profileNew); + } + + }); + } diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index af83709..18ae550 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -90,7 +90,7 @@ public class TorServiceUtils implements TorServiceConstants { if (line.contains("PID")) continue; - if (line.contains(processKey)) + if (line.contains('/' + processKey)) { String[] lineParts = line.split("\\s+");

1 0

[torspec/master] update the spec to say that you must refuse inbound relay_early cells
by arma＠torproject.org 02 Aug '14

02 Aug '14

commit 2180422f4a1fd51ea25fa3822c830581f7a56c43 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Aug 2 00:34:39 2014 -0400 update the spec to say that you must refuse inbound relay_early cells --- tor-spec.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tor-spec.txt b/tor-spec.txt index ba3393e..1c1257b 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -1199,17 +1199,15 @@ see tor-design.pdf. RELAY_EARLY cell. Otherwise, older Tors will relay it as a RELAY cell. If a node ever receives more than 8 RELAY_EARLY cells on a given - outbound circuit, it SHOULD close the circuit. (For historical reasons, - we don't limit the number of inbound RELAY_EARLY cells; they should - be harmless anyway because clients won't accept extend requests. See - bug 1038.) + outbound circuit, it SHOULD close the circuit. If it receives any + inbound RELAY_EARLY cells, it MUST close the circuit immediately. When speaking v2 of the link protocol or later, clients MUST only send EXTEND cells inside RELAY_EARLY cells. Clients SHOULD send the first ~8 RELAY cells that are not targeted at the first hop of any circuit as RELAY_EARLY cells too, in order to partially conceal the circuit length. - [Starting with Tor 0.2.3.11-alpha, future version of Tor, relays should + [Starting with Tor 0.2.3.11-alpha, relays should reject any EXTEND cell not received in a RELAY_EARLY cell.] 6. Application connections and stream management

1 0

[translation/torbutton-branddtd] Update translations for torbutton-branddtd
by translation＠torproject.org 01 Aug '14

01 Aug '14

commit 67174b73e2c23d7d31aa2a4162ba3c235493293e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 1 23:45:43 2014 +0000 Update translations for torbutton-branddtd --- es_MX/brand.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es_MX/brand.dtd b/es_MX/brand.dtd index 76e405d..e5fdf97 100644 --- a/es_MX/brand.dtd +++ b/es_MX/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> -<!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Tor Project"> +<!ENTITY brandShortName "NavegadorTor"> +<!ENTITY brandFullName "Navegador Tor"> +<!ENTITY vendorShortName "Proyecto Tor"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">

1 0

[translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
by translation＠torproject.org 01 Aug '14

01 Aug '14

commit 2123b215ba11658fd2e227c0356ef08f1f9a4b09 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 1 23:45:41 2014 +0000 Update translations for torbutton-brandproperties_completed --- es_MX/brand.properties | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/es_MX/brand.properties b/es_MX/brand.properties new file mode 100644 index 0000000..0144718 --- /dev/null +++ b/es_MX/brand.properties @@ -0,0 +1,15 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShortName=NavegadorTor +brandFullName=Navegador Tor +vendorShortName=Proyecto Tor + +homePageSingleStartMain=Firefox Start, una página de inicio rápida con búsqueda incluida. +homePageImport=Importe su página de inicio de %S + +homePageMigrationPageTitle=Selección de Página de Inicio +homePageMigrationDescription=Por favor seleccione la página de inicio que desea usar: + +syncBrandShortName=Sincronización

1 0

[translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
by translation＠torproject.org 01 Aug '14

01 Aug '14

commit 5a6132f270b2d411b92a29a1d8f6af5073d618ea Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 1 23:45:38 2014 +0000 Update translations for torbutton-brandproperties --- es_MX/brand.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/es_MX/brand.properties b/es_MX/brand.properties index 9ae168e..0144718 100644 --- a/es_MX/brand.properties +++ b/es_MX/brand.properties @@ -2,14 +2,14 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser -brandFullName=Tor Browser -vendorShortName=Tor Project +brandShortName=NavegadorTor +brandFullName=Navegador Tor +vendorShortName=Proyecto Tor -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, una página de inicio rápida con búsqueda incluida. +homePageImport=Importe su página de inicio de %S -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=Selección de Página de Inicio +homePageMigrationDescription=Por favor seleccione la página de inicio que desea usar: -syncBrandShortName=Sync +syncBrandShortName=Sincronización

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 01 Aug '14

01 Aug '14

commit b14624dfc8e7502e8f716c3f2fbfc341dd468081 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 1 21:15:29 2014 +0000 Update translations for https_everywhere_completed --- nl/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index 20a4fd8..0bee60e 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -38,8 +38,8 @@ <!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 bericht"> <!ENTITY https-everywhere.popup.paragraph1 "Oeps! U gebruikte de stabiele versie van HTTPS Everywhere, maar het is mogelijk dat we u tijdens de laatste uitgave per ongeluk naar de ontwikkelversie hebben geupgrade."> <!ENTITY https-everywhere.popup.paragraph2 "Wilt u teruggaan naar de stabiele versie?"> -<!ENTITY https-everywhere.popup.paragraph3 "We zouden het op prijs stellen als u doorging met het gebruik van onze ontwikkelde versie en ons hielp met het verbeteren van HTTPS Everywhere! U zult hier en daar wat bugs tegenkomen, die u kunt melden aan https-everywhere(a)eff.org. Excuses voor het ongemak, en veel dank voor het gebruik van HTTPS Everywhere."> -<!ENTITY https-everywhere.popup.keep "Hou me op de ontwikkelde versie"> +<!ENTITY https-everywhere.popup.paragraph3 "We zouden het op prijs stellen als u doorging met het gebruik van onze ontwikkelaars versie en ons hielp met het verbeteren van HTTPS Everywhere! U zult hier en daar wat bugs tegenkomen, die u kunt melden aan https-everywhere(a)eff.org. Excuses voor het ongemak, en veel dank voor het gebruik van HTTPS Everywhere."> +<!ENTITY https-everywhere.popup.keep "Blijf gebruik maken van de ontwikkelaars versie"> <!ENTITY https-everywhere.popup.revert "Download de meest recenste stabiele uitgave."> <!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Regels Testen">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 01 Aug '14

01 Aug '14

commit 2f322f9def49bf27d24f9698eb07c33c3e68a166 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 1 21:15:22 2014 +0000 Update translations for https_everywhere --- nl/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index 20a4fd8..0bee60e 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -38,8 +38,8 @@ <!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 bericht"> <!ENTITY https-everywhere.popup.paragraph1 "Oeps! U gebruikte de stabiele versie van HTTPS Everywhere, maar het is mogelijk dat we u tijdens de laatste uitgave per ongeluk naar de ontwikkelversie hebben geupgrade."> <!ENTITY https-everywhere.popup.paragraph2 "Wilt u teruggaan naar de stabiele versie?"> -<!ENTITY https-everywhere.popup.paragraph3 "We zouden het op prijs stellen als u doorging met het gebruik van onze ontwikkelde versie en ons hielp met het verbeteren van HTTPS Everywhere! U zult hier en daar wat bugs tegenkomen, die u kunt melden aan https-everywhere(a)eff.org. Excuses voor het ongemak, en veel dank voor het gebruik van HTTPS Everywhere."> -<!ENTITY https-everywhere.popup.keep "Hou me op de ontwikkelde versie"> +<!ENTITY https-everywhere.popup.paragraph3 "We zouden het op prijs stellen als u doorging met het gebruik van onze ontwikkelaars versie en ons hielp met het verbeteren van HTTPS Everywhere! U zult hier en daar wat bugs tegenkomen, die u kunt melden aan https-everywhere(a)eff.org. Excuses voor het ongemak, en veel dank voor het gebruik van HTTPS Everywhere."> +<!ENTITY https-everywhere.popup.keep "Blijf gebruik maken van de ontwikkelaars versie"> <!ENTITY https-everywhere.popup.revert "Download de meest recenste stabiele uitgave."> <!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Regels Testen">

1 0

[tor-launcher/maint-0.2.5] Bug 9516: Show Tor log in TorBrowser
by brade＠torproject.org 01 Aug '14

01 Aug '14

commit 40751d8580192902227a447ee89d8018a34800c9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 31 14:18:56 2014 -0400 Bug 9516: Show Tor log in TorBrowser Provide a stopgap solution: route all tor messages captured by Tor Launcher to the Browser Console. --- src/components/tl-protocol.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index bcff6ab..0e78736 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -25,6 +25,12 @@ function TorProtocolService() try { + this.mConsoleSvc = Cc["@mozilla.org/consoleservice;1"] + .getService(Ci.nsIConsoleService); + } catch (e) {} + + try + { var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); @@ -497,6 +503,7 @@ TorProtocolService.prototype = // Private Member Variables //////////////////////////////////////////////// + mConsoleSvc: null, mControlPort: null, mControlHost: null, mControlPassword: null, // JS string that contains hex-encoded password. @@ -1275,6 +1282,15 @@ TorProtocolService.prototype = this.mTorLog.splice(0, 1); } this.mTorLog.push(logObj); + + // We could use console.info(), console.error(), and console.warn() + // but when those functions are used the console output includes + // extraneous double quotes. See Mozilla bug # 977586. + if (this.mConsoleSvc) + { + let s = "Tor " + logObj.type + ": " + logObj.msg; + this.mConsoleSvc.logStringMessage(s); + } break; case "STATUS_CLIENT": this._parseBootstrapStatus(msg);

1 0

[fog/master] the tor_pt_state_location env var now has '/fog' to it to avoid clobbering similar transports launched directly by tor instead of fog. See ticket #12613
by infinity0＠torproject.org 01 Aug '14

01 Aug '14

commit 729d47bbeed5915d2f70013bcc9817ef19c83a08 Author: Quinn Jarrell <qjarrell(a)gosynapsify.com> Date: Wed Jul 16 15:04:06 2014 -0400 the tor_pt_state_location env var now has '/fog' to it to avoid clobbering similar transports launched directly by tor instead of fog. See ticket #12613 --- fog-client/fog-client | 3 +++ fog-server/fog-server.go | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/fog-client/fog-client b/fog-client/fog-client index 9b2e7ef..c59efc3 100755 --- a/fog-client/fog-client +++ b/fog-client/fog-client @@ -49,6 +49,9 @@ def pt_child_env(managed_ver, env=os.environ): exempt = ['TOR_PT_STATE_LOCATION'] cur_env = [(k, v) for k, v in env.iteritems() if not k.startswith('TOR_PT_') or k in exempt] + if 'TOR_PT_STATE_LOCATION' in env: + prev_pt_state_location = env['TOR_PT_STATE_LOCATION'] + cur_env.append(('TOR_PT_STATE_LOCATION', os.path.join(prev_pt_state_location, 'fog'))) cur_env.append(('TOR_PT_MANAGED_TRANSPORT_VER', ','.join(managed_ver))) return cur_env diff --git a/fog-server/fog-server.go b/fog-server/fog-server.go index bb34219..cf77a6a 100644 --- a/fog-server/fog-server.go +++ b/fog-server/fog-server.go @@ -10,6 +10,7 @@ import ( "os" "os/exec" "os/signal" + "path" "strings" "sync" "syscall" @@ -199,7 +200,7 @@ func startProcesses(connectBackAddr net.Addr, plugins []ServerTransportPlugin) ( cmd := exec.Command(plugin.Command[0], plugin.Command[1:]...) cmd.Env = []string{ "TOR_PT_MANAGED_TRANSPORT_VER=1", - "TOR_PT_STATE_LOCATION=" + os.Getenv("TOR_PT_STATE_LOCATION"), + "TOR_PT_STATE_LOCATION=" + path.Join(os.Getenv("TOR_PT_STATE_LOCATION"), "fog"), "TOR_PT_EXTENDED_SERVER_PORT=", "TOR_PT_ORPORT=" + bindAddr.String(), "TOR_PT_SERVER_TRANSPORTS=" + plugin.MethodName,

1 0

[fog/master] removed exempt env list from pt_child_env.
by infinity0＠torproject.org 01 Aug '14

01 Aug '14

commit 73869805c63e3d915c7326809529d25f855b6d5b Author: Quinn Jarrell <qjarrell(a)gosynapsify.com> Date: Thu Jul 24 13:16:10 2014 -0400 removed exempt env list from pt_child_env. --- fog-client/fog-client | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fog-client/fog-client b/fog-client/fog-client index c59efc3..808504c 100755 --- a/fog-client/fog-client +++ b/fog-client/fog-client @@ -44,11 +44,10 @@ def pt_setup_logger(): def pt_child_env(managed_ver, env=os.environ): """ Prepare the environment for a child PT process, by clearing all TOR_PT_* - envvars except TOR_PT_STATE_LOCATION and TOR_PT_MANAGED_TRANSPORT_VER. + envvars and TOR_PT_MANAGED_TRANSPORT_VER. """ - exempt = ['TOR_PT_STATE_LOCATION'] cur_env = [(k, v) for k, v in env.iteritems() - if not k.startswith('TOR_PT_') or k in exempt] + if not k.startswith('TOR_PT_')] if 'TOR_PT_STATE_LOCATION' in env: prev_pt_state_location = env['TOR_PT_STATE_LOCATION'] cur_env.append(('TOR_PT_STATE_LOCATION', os.path.join(prev_pt_state_location, 'fog')))

1 0