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

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 14 Jun '14

14 Jun '14

commit 030b1e385ad637568c16c64f7b8fd79b11bba315 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 14 13:15:13 2014 +0000 Update translations for torcheck --- he/torcheck.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he/torcheck.po b/he/torcheck.po index b61446e..8ebba4d 100644 --- a/he/torcheck.po +++ b/he/torcheck.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-06-14 12:43+0000\n" +"PO-Revision-Date: 2014-06-14 12:50+0000\n" "Last-Translator: GenghisKhan <genghiskhan(a)gmx.ca>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgid "Your IP address appears to be: " msgstr "נראה כי כתובת ה-IP שלך היא:" msgid "Are you using Tor?" -msgstr "האם אתה משתמש ברשת Tor?" +msgstr "האם אתה משתמש ברשת Tor?&rlm;" msgid "This page is also available in the following languages:" msgstr "עמוד זה הינו זמין גם בשפות הבאות:"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 14 Jun '14

14 Jun '14

commit 30a952ab4a0d67eeaf34c24d26b8e2e538363e09 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 14 12:45:13 2014 +0000 Update translations for torcheck_completed --- he/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he/torcheck.po b/he/torcheck.po index 5dbc922..b61446e 100644 --- a/he/torcheck.po +++ b/he/torcheck.po @@ -6,12 +6,12 @@ # Amichay P. K. <am1chay.p.k(a)gmail.com>, 2011 # GenghisKhan <genghiskhan(a)gmx.ca>, 2014 # Kunda, 2014 -# יעקב פייקין <jacobpa9(a)gmail.com>, 2012 +# Jacob Paikin <jacobpa9(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 09:20+0000\n" +"PO-Revision-Date: 2014-06-14 12:43+0000\n" "Last-Translator: GenghisKhan <genghiskhan(a)gmx.ca>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -71,7 +71,7 @@ msgstr "למידע נוסף אודות ממסר יציאה זה, ראה:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "הפרויקט Tor הינו US 501(c)(3)&lrm; ללא מטרות רווח אשר מוקדש לשם מחקר, פיתוח, וחינוך של אנונימיות ופרטיות באינטרנט." +msgstr "הפרויקט Tor הינו US 501(c)(3)‎ ללא מטרות רווח אשר מוקדש לשם מחקר, פיתוח, וחינוך של אנונימיות ופרטיות באינטרנט." msgid "Learn More »" msgstr "למד עוד »"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 14 Jun '14

14 Jun '14

commit 99d80c6ebc9f2804d842b634bd4794891cd69d13 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 14 12:45:09 2014 +0000 Update translations for torcheck --- he/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he/torcheck.po b/he/torcheck.po index 5dbc922..b61446e 100644 --- a/he/torcheck.po +++ b/he/torcheck.po @@ -6,12 +6,12 @@ # Amichay P. K. <am1chay.p.k(a)gmail.com>, 2011 # GenghisKhan <genghiskhan(a)gmx.ca>, 2014 # Kunda, 2014 -# יעקב פייקין <jacobpa9(a)gmail.com>, 2012 +# Jacob Paikin <jacobpa9(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 09:20+0000\n" +"PO-Revision-Date: 2014-06-14 12:43+0000\n" "Last-Translator: GenghisKhan <genghiskhan(a)gmx.ca>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -71,7 +71,7 @@ msgstr "למידע נוסף אודות ממסר יציאה זה, ראה:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "הפרויקט Tor הינו US 501(c)(3)&lrm; ללא מטרות רווח אשר מוקדש לשם מחקר, פיתוח, וחינוך של אנונימיות ופרטיות באינטרנט." +msgstr "הפרויקט Tor הינו US 501(c)(3)‎ ללא מטרות רווח אשר מוקדש לשם מחקר, פיתוח, וחינוך של אנונימיות ופרטיות באינטרנט." msgid "Learn More »" msgstr "למד עוד »"

1 0

r26836: {website} future-proof it as suggested by fortin (website/trunk/docs/en)
by Roger Dingledine 14 Jun '14

14 Jun '14

Author: arma Date: 2014-06-14 11:51:00 +0000 (Sat, 14 Jun 2014) New Revision: 26836 Modified: website/trunk/docs/en/debian.wml Log: future-proof it as suggested by fortin Modified: website/trunk/docs/en/debian.wml =================================================================== --- website/trunk/docs/en/debian.wml 2014-06-14 11:50:04 UTC (rev 26835) +++ website/trunk/docs/en/debian.wml 2014-06-14 11:51:00 UTC (rev 26836) @@ -11,7 +11,7 @@ </div> <div id="maincol"> <a id="debian"></a> -<h2><a class="anchor" href="#debian">Option one: Tor on Debian wheezy, +<h2><a class="anchor" href="#debian">Option one: Tor on Debian stable, Debian sid, or Debian testing</a></h2> <br />

1 0

r26835: {website} squeeze is the distant past (website/trunk/docs/en)
by Roger Dingledine 14 Jun '14

14 Jun '14

Author: arma Date: 2014-06-14 11:50:04 +0000 (Sat, 14 Jun 2014) New Revision: 26835 Modified: website/trunk/docs/en/debian.wml Log: squeeze is the distant past Modified: website/trunk/docs/en/debian.wml =================================================================== --- website/trunk/docs/en/debian.wml 2014-06-14 07:11:55 UTC (rev 26834) +++ website/trunk/docs/en/debian.wml 2014-06-14 11:50:04 UTC (rev 26835) @@ -11,7 +11,7 @@ </div> <div id="maincol"> <a id="debian"></a> -<h2><a class="anchor" href="#debian">Option one: Tor on Debian squeeze, +<h2><a class="anchor" href="#debian">Option one: Tor on Debian wheezy, Debian sid, or Debian testing</a></h2> <br />

1 0

[orbot/master] use one prefs instance
by n8fr8＠torproject.org 14 Jun '14

14 Jun '14

commit c0f7d754dd2eaf74808eaa625db58f6306d26c51 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 13 12:59:02 2014 -0400 use one prefs instance --- src/org/torproject/android/Orbot.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 1f59c23..e252412 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -86,15 +86,16 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic //should move this up with all the other class variables private boolean mIsBound = false; - + private SharedPreferences mPrefs = null; + private boolean autoStartFromIntent = false; /** Called when the activity is first created. */ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - TorServiceUtils.getSharedPrefs(getApplicationContext()).registerOnSharedPreferenceChangeListener(this); + mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + mPrefs.registerOnSharedPreferenceChangeListener(this); setLocale(); @@ -490,7 +491,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic private void enableHiddenServicePort (int hsPort) { - SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); Editor pEdit = mPrefs.edit(); @@ -609,7 +609,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic newBridgeValue = URLDecoder.decode(newBridgeValue); //decode the value here showAlert("Bridges Updated","Restart Orbot to use this bridge: " + newBridgeValue,false); - SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); String bridges = mPrefs.getString(TorConstants.PREF_BRIDGES_LIST, null); @@ -635,15 +634,13 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic else { - - SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); showWizard = mPrefs.getBoolean("show_wizard",showWizard); if (showWizard) { Editor pEdit = mPrefs.edit(); pEdit.putBoolean("show_wizard",false); - pEdit.commit(); + pEdit.commit(); showWizard = false; startActivity(new Intent(this, ChooseLocaleWizardActivity.class)); @@ -683,7 +680,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic */ private void openBrowser(final String browserLaunchUrl) { - SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); boolean isOrwebInstalled = appInstalledOrNot("info.guardianproject.browser"); boolean isTransProxy = mPrefs.getBoolean("pref_transparent", false); @@ -904,7 +900,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic appendLogTextAndScroll(mTorServiceMsg); } - SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); boolean showFirstTime = mPrefs.getBoolean("connect_first_time",true); if (showFirstTime) @@ -1282,7 +1277,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic Configuration config = getResources().getConfiguration(); - SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); String lang = mPrefs.getString(PREF_DEFAULT_LOCALE, ""); if (! "".equals(lang) && ! config.locale.getLanguage().equals(lang))

1 0

[orbot/master] improve resource installer ability to update torrc
by n8fr8＠torproject.org 14 Jun '14

14 Jun '14

commit f3d21eec4f447d895e060f405fb1b2be48ac188f Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 13 12:59:36 2014 -0400 improve resource installer ability to update torrc --- .../android/service/TorResourceInstaller.java | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java index c2fcb6a..fa00b1e 100644 --- a/src/org/torproject/android/service/TorResourceInstaller.java +++ b/src/org/torproject/android/service/TorResourceInstaller.java @@ -116,34 +116,32 @@ public class TorResourceInstaller implements TorServiceConstants { return true; } - public boolean installTorrc (String extraLines) throws IOException, FileNotFoundException, TimeoutException + public boolean updateTorConfig (File fileTorRc, String extraLines) throws IOException, FileNotFoundException, TimeoutException { InputStream is; - File outFile; Shell shell = Shell.startShell(new ArrayList<String>(),installFolder.getAbsolutePath()); - is = context.getResources().openRawResource(R.raw.torrc); - outFile = new File(installFolder, TORRC_ASSET_KEY); - shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); - streamToFile(is,outFile, false, false); + is = context.getResources().openRawResource(R.raw.torrc); + shell.add(new SimpleCommand(COMMAND_RM_FORCE + fileTorRc.getAbsolutePath())).waitForFinish(); + streamToFile(is,fileTorRc, false, false); if (extraLines != null && extraLines.length() > 0) { StringBufferInputStream sbis = new StringBufferInputStream('\n' + extraLines + '\n'); - streamToFile(sbis,outFile,true,false); + streamToFile(sbis,fileTorRc,true,false); } is = context.getResources().openRawResource(R.raw.torrcdiag); - outFile = new File(installFolder, TORRCDIAG_ASSET_KEY); - shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); - streamToFile(is,outFile, false, false); + fileTorRc = new File(installFolder, TORRCDIAG_ASSET_KEY); + shell.add(new SimpleCommand(COMMAND_RM_FORCE + fileTorRc.getAbsolutePath())).waitForFinish(); + streamToFile(is,fileTorRc, false, false); if (extraLines != null && extraLines.length() > 0) { StringBufferInputStream sbis = new StringBufferInputStream('\n' + extraLines + '\n'); - streamToFile(sbis,outFile,true,false); + streamToFile(sbis,fileTorRc,true,false); } shell.close();

1 0

[orbot/master] clean up unbind process and service shutdown
by n8fr8＠torproject.org 14 Jun '14

14 Jun '14

commit 156ed574e888b0801777399e11f94429945d918c Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 13 13:50:55 2014 -0400 clean up unbind process and service shutdown --- src/org/torproject/android/Orbot.java | 37 +++------------------------------ 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index e252412..f7e0f95 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -83,9 +83,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic /* The primary interface we will be calling on the service. */ ITorService mService = null; - //should move this up with all the other class variables - private boolean mIsBound = false; - private SharedPreferences mPrefs = null; private boolean autoStartFromIntent = false; @@ -431,6 +428,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic //terminology but also making sure there are clear distinctions in control stopTor(); + if (mConnection != null) + unbindService(mConnection); + //perhaps this should be referenced as INTENT_TOR_SERVICE as in startService stopService(new Intent(this,TorService.class)); @@ -1164,8 +1164,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic public void onServiceConnected(ComponentName className, IBinder service) { - mIsBound = true; - // This is called when the connection with the service has been // established, giving us the service object we can use to // interact with the service. We are communicating with our @@ -1215,35 +1213,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } }; - - //unbind removes the callback, and unbinds the service - private void unbindService () - { - if (mIsBound) { - // If we have received the service, and hence registered with - // it, then now is the time to unregister. - if (mService != null) { - try { - mService.unregisterCallback(mCallback); - - } catch (RemoteException e) { - // There is nothing special we need to do if the service - // has crashed. - } - } - - // Detach our existing connection. - unbindService(mConnection); - mIsBound = false; - - Log.d(TAG,"service was ubnound"); - - //maybe needs this? - mService = null; - - - } - } /* private void createProgressDialog (String msg)

1 0

[orbot/master] make default config files have ports off by default (0)
by n8fr8＠torproject.org 14 Jun '14

14 Jun '14

commit 2ce9ea92f14f7b5c04798809f0c262475766977e Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 13 12:58:39 2014 -0400 make default config files have ports off by default (0) --- res/raw/torrc | 4 +++- res/raw/torrcdiag | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/res/raw/torrc b/res/raw/torrc index e222fe7..2a5a48a 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -1,5 +1,7 @@ Log notice stdout -ControlPortWriteToFile /data/data/org.torproject.android/app_bin/control.txt ControlPort auto +SOCKSPort 0 +DNSPort 0 +TransPort 0 CookieAuthentication 1 AvoidDiskWrites 1 \ No newline at end of file diff --git a/res/raw/torrcdiag b/res/raw/torrcdiag index c102d81..b8f9661 100644 --- a/res/raw/torrcdiag +++ b/res/raw/torrcdiag @@ -1,5 +1,7 @@ Log debug stdout -ControlPortWriteToFile /data/data/org.torproject.android/app_bin/control.txt ControlPort auto +SOCKSPort 0 +DNSPort 0 +TransPort 0 CookieAuthentication 1 AvoidDiskWrites 1 \ No newline at end of file

1 0

[orbot/master] use canonical paths to ensure shell commands are correct
by n8fr8＠torproject.org 14 Jun '14

14 Jun '14

commit 8a59cfb6d210aa460ce7d5f71bd569f9407ef3ea Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 13 13:00:42 2014 -0400 use canonical paths to ensure shell commands are correct also cleanup torrc updating --- src/org/torproject/android/service/TorService.java | 145 +++++++++++++------- 1 file changed, 99 insertions(+), 46 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 3de7fb3..63730d6 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.StringTokenizer; import java.util.Timer; import java.util.TimerTask; +import java.util.concurrent.TimeoutException; import net.freehaven.tor.control.ConfigEntry; import net.freehaven.tor.control.EventHandler; @@ -72,7 +73,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst private TorControlConnection conn = null; private Socket torConnSocket = null; private int mLastProcessId = -1; - private int mSocksPort = 9050; private static final int NOTIFY_ID = 1; private static final int TRANSPROXY_NOTIFY_ID = 2; @@ -96,6 +96,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private File fileXtables; private File fileTorRc; + private File fileControlPort; private TorTransProxy mTransProxy; @@ -361,11 +362,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (currentStatus == STATUS_ON) { - this.showToolbarNotification("Tor service stopped unexpectedly", ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, false); + //make sure we stop Tor processes + stopTor(); + + showToolbarNotification("Tor service stopped unexpectedly", ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, false); + } - //Log.d(TAG,"onDestroy called"); - // Unregister all callbacks. + // Unregister all callbacks. mCallbacks.kill(); unregisterReceiver(mNetworkStateReceiver); @@ -505,7 +509,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst int procId = -1; Shell shell = Shell.startShell(); - while ((procId = TorServiceUtils.findProcessId(fileProcBin.getAbsolutePath())) != -1) + while ((procId = TorServiceUtils.findProcessId(fileProcBin.getCanonicalPath())) != -1) { logNotice("Found fileObfsclient PID=" + procId + " - killing now..."); @@ -556,13 +560,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); - String extraLines = prefs.getString("pref_custom_torrc", null); - - if (extraLines != null) - { - boolean success = installer.installTorrc(extraLines); - } - if (version == null || (!version.equals(BINARY_TOR_VERSION)) || (!fileTor.exists())) { logNotice("upgrading binaries to latest version: " + BINARY_TOR_VERSION); @@ -573,9 +570,37 @@ public class TorService extends Service implements TorServiceConstants, TorConst prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit(); } - + updateTorConfigFile (); + + } + private boolean updateTorConfigFile () throws FileNotFoundException, IOException, TimeoutException + { + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + + TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); + + StringBuffer extraLines = new StringBuffer(); + + String TORRC_CONTROLPORT_FILE_KEY = "ControlPortWriteToFile"; + fileControlPort = new File(appBinHome,"control.txt"); + extraLines.append(TORRC_CONTROLPORT_FILE_KEY).append(' ').append(fileControlPort.getCanonicalPath()); + extraLines.append('\n'); + extraLines.append(prefs.getString("pref_custom_torrc", "")); + + logNotice("updating torrc configuration..."); + + boolean success = installer.updateTorConfig(fileTorRc, extraLines.toString()); + + if (success) + { + logNotice ("success."); + } + + return success; + } + private boolean enableBinExec (File fileBin) throws Exception { @@ -583,12 +608,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (!fileBin.canExecute()) { - logNotice("(re)Setting permission on binary: " + fileBin.getAbsolutePath()); - Shell shell = Shell.startShell(new ArrayList<String>(), appBinHome.getAbsolutePath()); + logNotice("(re)Setting permission on binary: " + fileBin.getCanonicalPath()); + Shell shell = Shell.startShell(new ArrayList<String>(), appBinHome.getCanonicalPath()); - shell.add(new SimpleCommand("chmod " + CHMOD_EXE_VALUE + ' ' + fileBin.getAbsolutePath())).waitForFinish(); + shell.add(new SimpleCommand("chmod " + CHMOD_EXE_VALUE + ' ' + fileBin.getCanonicalPath())).waitForFinish(); - File fileTest = new File(fileBin.getAbsolutePath()); + File fileTest = new File(fileBin.getCanonicalPath()); logNotice(fileTest.getName() + ": POST: Is binary exec? " + fileTest.canExecute()); shell.close(); @@ -748,13 +773,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst SharedPreferences prefs =TorServiceUtils.getSharedPrefs(getApplicationContext()); - String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getAbsolutePath(); + String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getCanonicalPath(); boolean transProxyTethering = prefs.getBoolean("pref_transparent_tethering", false); if (transProxyTethering) { - torrcPath = new File(appBinHome, TORRC_TETHER_KEY).getAbsolutePath(); + torrcPath = new File(appBinHome, TORRC_TETHER_KEY).getCanonicalPath(); } int torRetryWaitTimeMS = 1000; @@ -765,7 +790,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst Shell shell = Shell.startShell(); - SimpleCommand cmdTor = new SimpleCommand(fileTor.getAbsolutePath() + " DataDirectory " + appCacheHome.getAbsolutePath() + " -f " + torrcPath + " &"); + SimpleCommand cmdTor = new SimpleCommand(fileTor.getCanonicalPath() + " DataDirectory " + appCacheHome.getCanonicalPath() + " -f " + torrcPath + " &"); shell.add(cmdTor); @@ -804,7 +829,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice( "Starting polipo process"); - int polipoProcId = TorServiceUtils.findProcessId(filePolipo.getAbsolutePath()); + int polipoProcId = TorServiceUtils.findProcessId(filePolipo.getCanonicalPath()); StringBuilder log = null; @@ -816,15 +841,15 @@ public class TorService extends Service implements TorServiceConstants, TorConst { log = new StringBuilder(); - String polipoConfigPath = new File(appBinHome, POLIPOCONFIG_ASSET_KEY).getAbsolutePath(); - SimpleCommand cmdPolipo = new SimpleCommand(filePolipo.getAbsolutePath() + " -c " + polipoConfigPath + " &"); + String polipoConfigPath = new File(appBinHome, POLIPOCONFIG_ASSET_KEY).getCanonicalPath(); + SimpleCommand cmdPolipo = new SimpleCommand(filePolipo.getCanonicalPath() + " -c " + polipoConfigPath + " &"); shell.add(cmdPolipo); //wait one second to make sure it has started up Thread.sleep(1000); - while ((polipoProcId = TorServiceUtils.findProcessId(filePolipo.getAbsolutePath())) == -1 && attempts < MAX_START_TRIES) + while ((polipoProcId = TorServiceUtils.findProcessId(filePolipo.getCanonicalPath())) == -1 && attempts < MAX_START_TRIES) { logNotice("Couldn't find Polipo process... retrying...\n" + log); Thread.sleep(3000); @@ -953,31 +978,36 @@ public class TorService extends Service implements TorServiceConstants, TorConst private int getControlPort () { - File fileControl = new File(appBinHome,"control.txt"); int result = -1; try { - - logNotice("Reading control port config file: " + fileControl.getAbsolutePath()); - BufferedReader bufferedReader = new BufferedReader(new FileReader(fileControl)); - String line = bufferedReader.readLine(); - - //PORT=127.0.0.1:45051 - - if (line != null) + if (fileControlPort.exists()) + { + logNotice("Reading control port config file: " + fileControlPort.getCanonicalPath()); + BufferedReader bufferedReader = new BufferedReader(new FileReader(fileControlPort)); + String line = bufferedReader.readLine(); + + //PORT=127.0.0.1:45051 + + if (line != null) + { + String[] lineParts = line.split(":"); + result = Integer.parseInt(lineParts[1]); + } + + bufferedReader.close(); + } + else { - String[] lineParts = line.split(":"); - result = Integer.parseInt(lineParts[1]); + logNotice("Control Port config file does not yet exist (waiting for tor): " + fileControlPort.getCanonicalPath()); } - bufferedReader.close(); - } catch (FileNotFoundException e) { - logNotice("unable to get control port; no file at: " + fileControl.getAbsolutePath()); + logNotice("unable to get control port; file not found"); } catch (IOException e) { @@ -1071,7 +1101,30 @@ public class TorService extends Service implements TorServiceConstants, TorConst * Returns the port number that the SOCKS proxy is running on */ public int getSOCKSPort() throws RemoteException { - return mSocksPort; + + int socksPort = -1; + + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + + String socksConfig = prefs.getString(TorConstants.PREF_SOCKS, TorServiceConstants.PORT_SOCKS_DEFAULT); + + try + { + + if (!socksConfig.equalsIgnoreCase("auto")) + if (socksConfig.contains(":")) + socksPort = Integer.parseInt(socksConfig.split(":")[1]); + else + socksPort = Integer.parseInt(socksConfig); + + } + catch (Exception e) + { + logException ("unable to parse socks config: " + socksConfig,e); + + } + + return socksPort; } @@ -1817,8 +1870,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getAbsolutePath(), false); - mBinder.updateConfiguration("GeoIPv6File", fileGeoIP6.getAbsolutePath(), false); + mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getCanonicalPath(), false); + mBinder.updateConfiguration("GeoIPv6File", fileGeoIP6.getCanonicalPath(), false); } catch (Exception e) @@ -1876,7 +1929,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (obfsBridges) { - String bridgeConfig = "obfs2,obfs3,scramblesuit exec " + fileObfsclient.getAbsolutePath(); + String bridgeConfig = "obfs2,obfs3,scramblesuit exec " + fileObfsclient.getCanonicalPath(); logMessage ("Using OBFUSCATED bridges: " + bridgeConfig); @@ -1979,7 +2032,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst hsPort = Integer.parseInt(hsPortConfig.split(" ")[0]); - String hsDirPath = new File(appCacheHome,"hs" + hsPort).getAbsolutePath(); + String hsDirPath = new File(appCacheHome,"hs" + hsPort).getCanonicalPath(); logMessage("Adding hidden service on port: " + hsPortConfig); @@ -2009,7 +2062,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } private void enableSocks (String socks, boolean safeSocks) throws RemoteException - { + { mBinder.updateConfiguration("SOCKSPort", socks, false); mBinder.updateConfiguration("SafeSocks", safeSocks ? "1" : "0", false); mBinder.updateConfiguration("TestSocks", "1", false); @@ -2034,7 +2087,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst bw.println("nameserver 8.8.4.4"); bw.close(); - return file.getAbsolutePath(); + return file.getCanonicalPath(); } @SuppressLint("NewApi") @@ -2140,7 +2193,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { try { - int foundPrcId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath()); + int foundPrcId = TorServiceUtils.findProcessId(fileTor.getCanonicalPath()); if (foundPrcId != -1) {

1 0