May 2011 - tor-commits - lists.torproject.org

[vidalia/alpha] Adds the helperprocess part
by chiiph＠torproject.org 03 May '11

03 May '11

commit 25950fa9ceeb6ce44924fb607b54691601adb66c Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Fri Apr 8 20:26:20 2011 -0300 Adds the helperprocess part --- src/vidalia/CMakeLists.txt | 2 + src/vidalia/MainWindow.cpp | 236 ++++++++++++++++++++++++++++++++++++++++++++ src/vidalia/MainWindow.h | 27 +++++ 3 files changed, 265 insertions(+), 0 deletions(-) diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt index c9803e9..22a869f 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -163,6 +163,7 @@ set(vidalia_SRCS ${vidalia_SRCS} ControlPasswordInputDialog.cpp VidaliaTab.cpp StatusTab.cpp + HelperProcess.cpp ) qt4_wrap_cpp(vidalia_SRCS Vidalia.h @@ -173,6 +174,7 @@ qt4_wrap_cpp(vidalia_SRCS ControlPasswordInputDialog.h VidaliaTab.h StatusTab.h + HelperProcess.h ) if (USE_MINIUPNPC) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index ac048e5..d61b5e8 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -383,6 +383,24 @@ MainWindow::createConnections() connect(UPNPControl::instance(), SIGNAL(error(UPNPControl::UPNPError)), this, SLOT(upnpError(UPNPControl::UPNPError))); #endif + /* Create a new HelperProcess object, used to start the web browser */ + _browserProcess = new HelperProcess(this); + connect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)), + this, SLOT(onSubprocessFinished(int, QProcess::ExitStatus))); + connect(_browserProcess, SIGNAL(startFailed(QString)), + this, SLOT(onBrowserFailed(QString))); + + /* Create a new HelperProcess object, used to start the IM client */ + _imProcess = new HelperProcess(this); + connect(_imProcess, SIGNAL(finished(int, QProcess::ExitStatus)), + this, SLOT(onSubprocessFinished(int, QProcess::ExitStatus))); + connect(_imProcess, SIGNAL(startFailed(QString)), + this, SLOT(onIMFailed(QString))); + + /* Create a new HelperProcess object, used to start the proxy server */ + _proxyProcess = new HelperProcess(this); + connect(_proxyProcess, SIGNAL(startFailed(QString)), + this, SLOT(onProxyFailed(QString))); } /** Called when the application is closing, by selecting "Exit" from the tray @@ -431,6 +449,10 @@ MainWindow::running() start(); } + /* Start the proxy server, if configured */ + if (settings.runProxyAtStart()) + startProxy(); + #if defined(USE_AUTOUPDATE) if (settings.isAutoUpdateEnabled()) { QDateTime lastCheckedAt = settings.lastCheckedForUpdates(); @@ -476,9 +498,33 @@ MainWindow::aboutToQuit() ServerSettings settings(_torControl); settings.cleanupPortForwarding(); + if (_proxyProcess->state() != QProcess::NotRunning) { + /* Close the proxy server (Polipo ignores the WM_CLOSE event sent by + * terminate() so we have to kill() it) */ + _proxyProcess->kill(); + } + /* Kill the browser and IM client if using the new launcher */ VidaliaSettings vidalia_settings; + if (! vidalia_settings.getBrowserDirectory().isEmpty()) { + /* Disconnect the finished signals so that we won't try to exit Vidalia again */ + QObject::disconnect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)), 0, 0); + QObject::disconnect(_imProcess, SIGNAL(finished(int, QProcess::ExitStatus)), 0, 0); + + /* Use QProcess terminate function */ + if (_browserProcess->state() == QProcess::Running) + _browserProcess->terminate(); + +#if defined(Q_OS_WIN) + /* Kill any processes which might have been forked off */ + win32_end_process_by_filename(vidalia_settings.getBrowserExecutable()); +#endif + + if (_imProcess->state() == QProcess::Running) + _imProcess->terminate(); + } + /* Disconnect all of the TorControl object's signals */ QObject::disconnect(_torControl, 0, 0, 0); } @@ -1009,6 +1055,7 @@ MainWindow::circuitEstablished() // TODO: fix hardcoded total length setStartupProgress(130, tr("Connected to the Tor network!")); + startSubprocesses(); #if defined(USE_AUTOUPDATE) VidaliaSettings settings; @@ -1722,3 +1769,192 @@ MainWindow::installUpdatesFailed(const QString &errmsg) #endif +/** Called when browser or IM client have exited */ +void +MainWindow::onSubprocessFinished(int exitCode, QProcess::ExitStatus exitStatus) +{ + Q_UNUSED(exitCode) + Q_UNUSED(exitStatus) + + /* Get path to browser and IM client */ + VidaliaSettings settings; + QString browserExecutable = settings.getBrowserExecutable(); + QString browserDirectory = settings.getBrowserDirectory(); + QString imExecutable = settings.getIMExecutable(); + + /* A subprocess is finished if it successfully exited or was never asked to start */ + bool browserDone = (browserExecutable.isEmpty() + && browserDirectory.isEmpty()) + || _browserProcess->isDone(); + bool imDone = imExecutable.isEmpty() || _imProcess->isDone(); + + /* Exit if both subprocesses are finished */ + if (browserDone && imDone) { + if (browserDirectory.isEmpty()) { + /* We are using the standard launcher, exit immediately */ + vApp->quit(); + } else { + /* We are using the alternate launcher, wait until the browser has really died */ + QTimer *browserWatcher = new QTimer(this); + connect(browserWatcher, SIGNAL(timeout()), this, SLOT(onCheckForBrowser())); + browserWatcher->start(2000); + } + } +} + +/** Called periodically to check if the browser is running. If it is not, + * exit Vidalia cleanly */ +void +MainWindow::onCheckForBrowser() +{ +/* This only works on Windows for now */ +#if defined(Q_OS_WIN) + + VidaliaSettings settings; + QString browserDirectoryFilename = settings.getBrowserExecutable(); + + /* Get list of running processes */ + QHash<qint64, QString> procList = win32_process_list(); + + /* On old versions of Windows win32_process_list() will return + an empty list. In this case, just keep Vidalia open */ + if (procList.isEmpty()) { + return; + } + + /* Loop over all processes or until we find <browserDirectoryFilename> */ + QHashIterator<qint64, QString> i(procList); + while (i.hasNext()) { + i.next(); + if (i.value().toLower() == browserDirectoryFilename) { + /* The browser is still running, so Vidalia should keep running too */ + return; + } + } + + /* The browser isn't running, exit Vidalia */ + vApp->quit(); +#endif +} + +/** Called when the web browser failed to start, for example, because the path + * specified to the web browser executable didn't lead to an executable. */ +void +MainWindow::onBrowserFailed(QString errmsg) +{ + Q_UNUSED(errmsg); + + /* Display an error message and see if the user wants some help */ + VMessageBox::warning(this, tr("Error starting web browser"), + tr("Vidalia was unable to start the configured web browser"), + VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape); +} + +/** Called when the IM client failed to start, for example, because the path + * specified to the IM client executable didn't lead to an executable. */ +void +MainWindow::onIMFailed(QString errmsg) +{ + Q_UNUSED(errmsg); + + /* Display an error message and see if the user wants some help */ + VMessageBox::warning(this, tr("Error starting IM client"), + tr("Vidalia was unable to start the configured IM client"), + VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape); +} + +/** Starts the proxy server, if appropriately configured */ +void +MainWindow::startProxy() +{ + VidaliaSettings settings; + QString executable = settings.getProxyExecutable(); + _proxyProcess->start(executable, settings.getProxyExecutableArguments()); +} + +/** Called when the proxy server fails to start, for example, because + * the path specified didn't lead to an executable. */ +void +MainWindow::onProxyFailed(QString errmsg) +{ + Q_UNUSED(errmsg); + + /* Display an error message and see if the user wants some help */ + VMessageBox::warning(this, tr("Error starting proxy server"), + tr("Vidalia was unable to start the configured proxy server"), + VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape); +} + +/** Start a web browser when given the directory containing the executable and profile */ +void +MainWindow::launchBrowserFromDirectory() +{ + VidaliaSettings settings; + + QString browserDirectory = settings.getBrowserDirectory(); + QString browserDirectoryFilename = settings.getBrowserExecutable(); + + /* Set TZ=UTC (to stop leaking timezone information) and + * MOZ_NO_REMOTE=1 (to allow multiple instances of Firefox */ + QStringList env = QProcess::systemEnvironment(); + env << "TZ=UTC"; + env << "MOZ_NO_REMOTE=1"; + _browserProcess->setEnvironment(env); + + /* The browser is in <browserDirectory>/App/Firefox/<browserDirectoryFilename> */ + QString browserExecutable = + QDir::toNativeSeparators(browserDirectory + "/App/Firefox/" + browserDirectoryFilename); + /* The profile is in <browserDirectory>/Data/profile */ + QString profileDir = + QDir::toNativeSeparators(browserDirectory + "/Data/profile"); + + /* Copy the profile directory if it's not already there */ + QDir browserDirObj = QDir(browserDirectory); + + /* Copy the profile directory if it's not already there */ + if (!browserDirObj.exists("Data/profile")) { + browserDirObj.mkdir("Data/profile"); + copy_dir(browserDirectory + "/App/DefaultData/profile", browserDirectory + "/Data/profile"); + } + + /* Copy the plugins directory if it's not already there */ + if (!browserDirObj.exists("Data/plugins")) { + browserDirObj.mkdir("Data/plugins"); + copy_dir(browserDirectory + "/App/DefaultData/plugins", browserDirectory + "/Data/plugins"); + } + + /* Build the command line arguments */ + QStringList commandLine; + // Is this better or worse than MOZ_NO_REMOTE? + //commandLine << "-no-remote"; + commandLine << "-profile"; + commandLine << profileDir; + + /* Launch the browser */ + _browserProcess->start(browserExecutable, commandLine); +} + +/** Starts the web browser and IM client, if appropriately configured */ +void +MainWindow::startSubprocesses() +{ + VidaliaSettings settings; + QString subprocess; + + /* Launch the web browser */ + if (!(subprocess = settings.getBrowserDirectory()).isEmpty()) { + /* The user has set BrowserDirectory; use this */ + launchBrowserFromDirectory(); + } else if (!(subprocess = settings.getBrowserExecutable()).isEmpty()) { + /* BrowserDirectory is not set, but BrowserExecutable is; use this */ + _browserProcess->setEnvironment(QProcess::systemEnvironment() << "TZ=UTC"); + _browserProcess->start(subprocess, QStringList()); + } + + /* Launch the IM client */ + subprocess = settings.getIMExecutable(); + + if (!subprocess.isEmpty()) + _imProcess->start(subprocess, QStringList()); +} + diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h index 20f5ef1..51722cb 100644 --- a/src/vidalia/MainWindow.h +++ b/src/vidalia/MainWindow.h @@ -24,6 +24,7 @@ #include "ConfigDialog.h" #include "MessageLog.h" #include "NetViewer.h" +#include "HelperProcess.h" #if defined(USE_AUTOUPDATE) #include "UpdateProcess.h" #include "UpdateProgressDialog.h" @@ -138,6 +139,18 @@ private slots: /** Deletes the tab at index if it exists and it isn't the Status tab */ void delTab(int index = -1); + /** Called when the web browser or IM client have stopped */ + void onSubprocessFinished(int exitCode, QProcess::ExitStatus exitStatus); + /** Called periodically to check if the browser is running. If it is not, + * exit Vidalia cleanly */ + void onCheckForBrowser(); + /** Called web the web browser failed to start */ + void onBrowserFailed(QString errmsg); + /** Called web the IM client failed to start */ + void onIMFailed(QString errmsg); + /** Called when the proxy server fails to start */ + void onProxyFailed(QString errmsg); + #if defined(USE_AUTOUPDATE) /** Called when the user clicks the 'Check Now' button in the General * settings page. */ @@ -240,6 +253,20 @@ private: /** The Vidalia icon that sits in the tray. */ QSystemTrayIcon _trayIcon; + /** Start a web browser when given the directory containing the executable and profile */ + void launchBrowserFromDirectory(); + /** Starts the web browser, if appropriately configured */ + void startSubprocesses(); + /** Starts the proxy server, if appropriately configured */ + void startProxy(); + + /** A HelperProcess object that manages the web browser */ + HelperProcess* _browserProcess; + /** A HelperProcess object that manages the IM client */ + HelperProcess* _imProcess; + /** A HelperProcess object that manages the proxy server */ + HelperProcess* _proxyProcess; + #if defined(USE_AUTOUPDATE) /** Timer used to remind us to check for software updates. */ QTimer _updateTimer;

1 0

[vidalia/master] Add torrc bootstrap option wrt ticket #2821
by chiiph＠torproject.org 03 May '11

03 May '11

commit 4c6c98407173d3823613ec662b026f6bfc8ea866 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Sun Apr 17 15:33:36 2011 -0300 Add torrc bootstrap option wrt ticket #2821 --- src/vidalia/MainWindow.cpp | 14 +++++++++++++- src/vidalia/config/TorSettings.cpp | 27 +++++++++++++++++++++++++++ src/vidalia/config/TorSettings.h | 9 +++++++++ 3 files changed, 49 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 3c5c789..29c1330 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1014,8 +1014,20 @@ MainWindow::start() } } - /* Make sure the torrc we want to use really exists. */ QString torrc = settings.getTorrc(); + + if(settings.bootstrap()) { + QString boottorrc = settings.bootstrapFrom(); + vNotice(tr("Bootstrapping torrc from %1 to %2") + .arg(boottorrc).arg(torrc)); + if(QFileInfo(boottorrc).exists()) { + if(QFile::copy(boottorrc, torrc)) { + settings.setBootstrap(false); + } + } + } + + /* Make sure the torrc we want to use really exists. */ if (!torrc.isEmpty()) { if (!QFileInfo(torrc).exists()) touch_file(torrc, true); diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp index 046ff72..068537f 100644 --- a/src/vidalia/config/TorSettings.cpp +++ b/src/vidalia/config/TorSettings.cpp @@ -42,6 +42,8 @@ #define SETTING_USE_RANDOM_PASSWORD "UseRandomPassword" #define SETTING_WARN_PLAINTEXT_PORTS "WarnPlaintextPorts" #define SETTING_REJECT_PLAINTEXT_PORTS "RejectPlaintextPorts" +#define SETTING_BOOTSTRAP "Bootstrap" +#define SETTING_BOOTSTRAP_FROM "BootstrapFrom" /** Default to using hashed password authentication */ #define DEFAULT_AUTH_METHOD PasswordAuth @@ -88,6 +90,8 @@ TorSettings::TorSettings(TorControl *torControl) setDefault(SETTING_WARN_PLAINTEXT_PORTS, QList<QVariant>() << 23 << 109 << 110 << 143); setDefault(SETTING_REJECT_PLAINTEXT_PORTS, QList<QVariant>()); + setDefault(SETTING_BOOTSTRAP, false); + setDefault(SETTING_BOOTSTRAP_FROM, ""); } /** Applies any changes to Tor's control port or authentication settings. */ @@ -423,3 +427,26 @@ TorSettings::hashPassword(const QString &password) .arg(base16_encode(key)); } +void +TorSettings::setBootstrap(bool enabled) +{ + setValue(SETTING_BOOTSTRAP, enabled); +} + +bool +TorSettings::bootstrap() const +{ + return value(SETTING_BOOTSTRAP).toBool(); +} + +void +TorSettings::setBootstrapFrom(const QString &from) +{ + setValue(SETTING_BOOTSTRAP_FROM, from); +} + +QString +TorSettings::bootstrapFrom() const +{ + return QDir::convertSeparators(value(SETTING_BOOTSTRAP_FROM).toString()); +} diff --git a/src/vidalia/config/TorSettings.h b/src/vidalia/config/TorSettings.h index a116c61..eb34b42 100644 --- a/src/vidalia/config/TorSettings.h +++ b/src/vidalia/config/TorSettings.h @@ -118,6 +118,15 @@ public: * "tor --hash-password foo". */ static QString hashPassword(const QString &password); + /** Returns true if Vidalia needs to bootstrap the torrc file */ + bool bootstrap() const; + /** Enables or disables bootstrap */ + void setBootstrap(bool enabled); + /** Returns the path of the bootstrap torrc file */ + QString bootstrapFrom() const; + /** Sets the location of the bootstrap torrc file */ + void setBootstrapFrom(const QString &from); + private: /** Returns the AuthenticationMethod enum value for the string * description of the authentication method given in <b>authMethod</b>. */

1 0

[vidalia/master] Merge branch 'bug2821_bootstrap'
by chiiph＠torproject.org 03 May '11

03 May '11

commit 8d691c7e292c1ac607b7dde1959ef3a70b8989fb Merge: 123643f 4c6c984 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Tue May 3 11:11:58 2011 -0300 Merge branch 'bug2821_bootstrap' src/vidalia/MainWindow.cpp | 14 +++++++++++++- src/vidalia/config/TorSettings.cpp | 27 +++++++++++++++++++++++++++ src/vidalia/config/TorSettings.h | 9 +++++++++ 3 files changed, 49 insertions(+), 1 deletions(-)

1 0

r24719: {projects} updating project txt files (projects/android/trunk/Orbot)
by Nathan Freitas 03 May '11

03 May '11

Author: n8fr8 Date: 2011-05-03 07:19:50 +0000 (Tue, 03 May 2011) New Revision: 24719 Modified: projects/android/trunk/Orbot/AUTHORS projects/android/trunk/Orbot/CHANGELOG Log: updating project txt files Modified: projects/android/trunk/Orbot/AUTHORS =================================================================== --- projects/android/trunk/Orbot/AUTHORS 2011-05-03 06:49:25 UTC (rev 24718) +++ projects/android/trunk/Orbot/AUTHORS 2011-05-03 07:19:50 UTC (rev 24719) @@ -30,4 +30,9 @@ Sathyanarayanan <gsathya.ceg(a)gmail.com> created a patch for the wizard which updated the icon and link for the secure chat app info to point to Gibberbot, and hopefully will continue to contribute useful patches. + +__sporkbomb <manuel(a)acanthephyra.net> implemented an updated set of logic +in TorTransProxy for handling the "transproxy all" mode of operation. Before +certain system processes were leaking traffic, and this was also detected +by his excellent auditing. Modified: projects/android/trunk/Orbot/CHANGELOG =================================================================== --- projects/android/trunk/Orbot/CHANGELOG 2011-05-03 06:49:25 UTC (rev 24718) +++ projects/android/trunk/Orbot/CHANGELOG 2011-05-03 07:19:50 UTC (rev 24719) @@ -1,6 +1,10 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ 1.0.5 +- updated to Tor 0.2.2.25-alpha binary +- moved back to single notification bar id to avoid double entries +- cleaned up progress dialog and alert handling to avoid leaky windows +- Merged __sporkbomb's patch for how transproxy all works; now does "everything but Tor" - Added new toolbar notifications and alerts for displaying notifications and Tor messages - Removed unused Socks client code from android.net package - Updated wizard to show link to Gibberbot (formerly OTRchat) chat app

1 0

r24718: {projects} small fixes to fix progress dialog and alert box glitches (projects/android/trunk/Orbot/src/org/torproject/android)
by Nathan Freitas 03 May '11

03 May '11

Author: n8fr8 Date: 2011-05-03 06:49:25 +0000 (Tue, 03 May 2011) New Revision: 24718 Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java Log: small fixes to fix progress dialog and alert box glitches Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2011-05-03 06:41:34 UTC (rev 24717) +++ projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2011-05-03 06:49:25 UTC (rev 24718) @@ -500,6 +500,7 @@ .show(); } + aDialog.setCanceledOnTouchOutside(true); } /* * Set the state of the running/not running graphic and label @@ -518,7 +519,6 @@ if (torStatus == STATUS_ON) { imgStatus.setImageResource(R.drawable.toron); - if (progressDialog != null) { @@ -559,11 +559,8 @@ { imgStatus.setImageResource(R.drawable.torstarting); - if (progressDialog == null) - { - progressDialog =ProgressDialog.show(this, "", getString(R.string.status_starting_up)); - } - else + + if (progressDialog != null) progressDialog.setMessage(torServiceMsg); if (mItemOnOff != null) @@ -594,7 +591,6 @@ progressDialog = null; } - imgStatus.setImageResource(R.drawable.toroff); lblStatus.setText(getString(R.string.status_disabled) + "\n" + getString(R.string.press_to_start)); @@ -725,11 +721,7 @@ break; case TorServiceConstants.ENABLE_TOR_MSG: - if (progressDialog == null) - { - progressDialog = ProgressDialog.show(Orbot.this, "", getString(R.string.status_starting_up)); - } - + createProgressDialog(getString(R.string.status_starting_up)); updateStatus((String)msg.getData().getString(HANDLER_TOR_MSG)); @@ -745,6 +737,17 @@ } } + private synchronized void createProgressDialog (String msg) + { + if (progressDialog == null) + { + progressDialog = ProgressDialog.show(Orbot.this, "", msg); + + progressDialog.setCancelable(true); + } + + } + };

1 0

r24717: {projects} fixed 'leaky' dialog box error (in projects/android/trunk/Orbot/src/org/torproject/android: . service)
by Nathan Freitas 03 May '11

03 May '11

Author: n8fr8 Date: 2011-05-03 06:41:34 +0000 (Tue, 03 May 2011) New Revision: 24717 Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java Log: fixed 'leaky' dialog box error Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2011-05-03 05:58:58 UTC (rev 24716) +++ projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2011-05-03 06:41:34 UTC (rev 24717) @@ -248,6 +248,12 @@ protected void onPause() { super.onPause(); + if (progressDialog != null) + { + progressDialog.dismiss(); + progressDialog = null; + } + } @@ -472,21 +478,18 @@ } } - private AlertDialog aDialog = null; - private void showAlert(String title, String msg, boolean button) { - if (aDialog != null) - aDialog.dismiss(); + AlertDialog aDialog = null; if (button) { - aDialog = new AlertDialog.Builder(this) - .setIcon(R.drawable.icon) - .setTitle(title) - .setMessage(msg) - .setPositiveButton(android.R.string.ok, null) - .show(); + aDialog = new AlertDialog.Builder(this) + .setIcon(R.drawable.icon) + .setTitle(title) + .setMessage(msg) + .setPositiveButton(android.R.string.ok, null) + .show(); } else { @@ -496,6 +499,7 @@ .setMessage(msg) .show(); } + } /* * Set the state of the running/not running graphic and label @@ -515,6 +519,7 @@ { imgStatus.setImageResource(R.drawable.toron); + if (progressDialog != null) { progressDialog.dismiss(); @@ -544,8 +549,10 @@ showAlert(getString(R.string.status_activated),getString(R.string.connect_first_time),true); } + if (mItemOnOff != null) mItemOnOff.setTitle(R.string.menu_stop); + } else if (torStatus == STATUS_CONNECTING) Modified: projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java 2011-05-03 05:58:58 UTC (rev 24716) +++ projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java 2011-05-03 06:41:34 UTC (rev 24717) @@ -600,14 +600,13 @@ else { TorTransProxy.purgeIptables(this); - showAlert("Status", "Transparent proxying DISABLED"); - + showAlert("Status", "Transparent proxying: DISABLED"); } } else { TorTransProxy.purgeIptables(this); - showAlert("Status", "Transparent proxying DISABLED"); + showAlert("Status", "Transparent proxying: DISABLED"); }

1 0

r24716: {projects} updating project files, including re-enabling onBoot mode fo (projects/android/trunk/Orbot)
by Nathan Freitas 03 May '11

03 May '11

Author: n8fr8 Date: 2011-05-03 05:58:58 +0000 (Tue, 03 May 2011) New Revision: 24716 Modified: projects/android/trunk/Orbot/AndroidManifest.xml projects/android/trunk/Orbot/AndroidManifest.xml.production projects/android/trunk/Orbot/CHANGELOG projects/android/trunk/Orbot/LICENSE Log: updating project files, including re-enabling onBoot mode for Orbot service Modified: projects/android/trunk/Orbot/AndroidManifest.xml =================================================================== --- projects/android/trunk/Orbot/AndroidManifest.xml 2011-05-03 05:58:19 UTC (rev 24715) +++ projects/android/trunk/Orbot/AndroidManifest.xml 2011-05-03 05:58:58 UTC (rev 24716) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.2.22-orbot-alpha-1.0.5-dev-debug" android:versionCode="11"> + package="org.torproject.android" android:versionName="0.2.2.22-orbot-alpha-1.0.5.20110503a-dev" android:versionCode="11"> <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false"> @@ -32,7 +33,10 @@ <activity android:name=".AppManager" android:label="@string/app_name"/> <activity android:name=".WizardActivity" android:label="@string/app_name"/> - <service android:name=".service.TorService" android:process=":remote"> + <service android:enabled="true" + android:name=".service.TorService" + android:exported="false" + > <intent-filter> <action android:name="org.torproject.android.service.ITorService" /> <action android:name="org.torproject.android.service.TOR_SERVICE" /> @@ -40,6 +44,13 @@ </service> + <receiver android:name=".OnBootReceiver"> + <intent-filter> + <action + android:name="android.intent.action.BOOT_COMPLETED" /> + <category android:name="android.intent.category.HOME" /> + </intent-filter> + </receiver> </application> Modified: projects/android/trunk/Orbot/AndroidManifest.xml.production =================================================================== --- projects/android/trunk/Orbot/AndroidManifest.xml.production 2011-05-03 05:58:19 UTC (rev 24715) +++ projects/android/trunk/Orbot/AndroidManifest.xml.production 2011-05-03 05:58:58 UTC (rev 24716) @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.2.14-orbot-alpha-1.0.3" android:versionCode="9"> + package="org.torproject.android" android:versionName="0.2.2.22-orbot-alpha-1.0.5.20110416a-dev" android:versionCode="11"> <uses-permission android:name="android.permission.INTERNET" /> - + <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false"> + <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true"> <activity android:name=".Orbot" android:theme="@android:style/Theme.NoTitleBar"> @@ -33,7 +33,10 @@ <activity android:name=".AppManager" android:label="@string/app_name"/> <activity android:name=".WizardActivity" android:label="@string/app_name"/> - <service android:name=".service.TorService" android:process=":remote"> + <service android:enabled="true" + android:name=".service.TorService" + android:exported="false" + > <intent-filter> <action android:name="org.torproject.android.service.ITorService" /> <action android:name="org.torproject.android.service.TOR_SERVICE" /> @@ -41,6 +44,13 @@ </service> + <receiver android:name=".OnBootReceiver"> + <intent-filter> + <action + android:name="android.intent.action.BOOT_COMPLETED" /> + <category android:name="android.intent.category.HOME" /> + </intent-filter> + </receiver> </application> Modified: projects/android/trunk/Orbot/CHANGELOG =================================================================== --- projects/android/trunk/Orbot/CHANGELOG 2011-05-03 05:58:19 UTC (rev 24715) +++ projects/android/trunk/Orbot/CHANGELOG 2011-05-03 05:58:58 UTC (rev 24716) @@ -1,6 +1,7 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ 1.0.5 +- Added new toolbar notifications and alerts for displaying notifications and Tor messages - Removed unused Socks client code from android.net package - Updated wizard to show link to Gibberbot (formerly OTRchat) chat app - Bundled iptables 1.4.7 for ARM instead of relying on installed version Modified: projects/android/trunk/Orbot/LICENSE =================================================================== --- projects/android/trunk/Orbot/LICENSE 2011-05-03 05:58:19 UTC (rev 24715) +++ projects/android/trunk/Orbot/LICENSE 2011-05-03 05:58:58 UTC (rev 24716) @@ -1,7 +1,8 @@ This file contains the license for Orbot, a free software project to provide anonymity on the Internet from a Google Android smartphone. -It also lists the licenses for other components used by Orbot. +It also lists the licenses for other components used by Orbot, including +Tor, Privoxy, and iptables. For more information about Orbot, see https://guardianproject.info/apps/orbot @@ -146,3 +147,14 @@ See the src/config/geoip file in particular. =============================================================================== +=============================================================================== +Orbot also uses iptables from the Netfilter.org project + +netfilter/iptables is - like all of the Linux Kernel - Free Software (sometimes +referred to as Open Source Software), distributed under the terms of the GNU GPLv2 +only. Please, note that some source code files might differ, and in that case it +is explicitely stated in the header of every file. + +The GPL also contains some obligations. If you distribute netfilter/iptables code +in binary form, you have to offer the source code, too. +===============================================================================

1 0

r24715: {projects} updating strings, layouts and drawables. removing unneeded b (in projects/android/trunk/Orbot/res: drawable layout raw values)
by Nathan Freitas 03 May '11

03 May '11

Author: n8fr8 Date: 2011-05-03 05:58:19 +0000 (Tue, 03 May 2011) New Revision: 24715 Added: projects/android/trunk/Orbot/res/drawable/tornotificationerr.png Removed: projects/android/trunk/Orbot/res/raw/busybox_g1 Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml projects/android/trunk/Orbot/res/values/strings.xml Log: updating strings, layouts and drawables. removing unneeded busybox binary. Added: projects/android/trunk/Orbot/res/drawable/tornotificationerr.png =================================================================== (Binary files differ) Property changes on: projects/android/trunk/Orbot/res/drawable/tornotificationerr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml =================================================================== --- projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-03 05:56:40 UTC (rev 24714) +++ projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-03 05:58:19 UTC (rev 24715) @@ -61,7 +61,7 @@ android:gravity="center_horizontal" android:textStyle="bold" android:width="330px" - android:height="125px" + android:height="75px" android:textColor="#ffffff" /> </TableRow> Deleted: projects/android/trunk/Orbot/res/raw/busybox_g1 =================================================================== (Binary files differ) Modified: projects/android/trunk/Orbot/res/values/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values/strings.xml 2011-05-03 05:56:40 UTC (rev 24714) +++ projects/android/trunk/Orbot/res/values/strings.xml 2011-05-03 05:58:19 UTC (rev 24715) @@ -34,6 +34,7 @@ <string name="menu_wizard">Wizard</string> + <string name="button_help">Help</string> <string name="button_close">Close</string> <string name="button_about">About</string>

1 0

r24714: {projects} general cleanup on detecting iptables status and startup/shu (in projects/android/trunk/Orbot/src/org/torproject/android: . service)
by Nathan Freitas 03 May '11

03 May '11

Author: n8fr8 Date: 2011-05-03 05:56:40 +0000 (Tue, 03 May 2011) New Revision: 24714 Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java projects/android/trunk/Orbot/src/org/torproject/android/WizardHelper.java projects/android/trunk/Orbot/src/org/torproject/android/service/ITorService.aidl projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceConstants.java projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceUtils.java Log: general cleanup on detecting iptables status and startup/shutdown calls Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2011-05-03 05:56:04 UTC (rev 24713) +++ projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2011-05-03 05:56:40 UTC (rev 24714) @@ -75,6 +75,12 @@ prefs = PreferenceManager.getDefaultSharedPreferences(this); + setContentView(R.layout.layout_main); + + lblStatus = (TextView)findViewById(R.id.lblStatus); + lblStatus.setOnLongClickListener(this); + imgStatus = (ImageView)findViewById(R.id.imgStatus); + imgStatus.setOnLongClickListener(this); } /* @@ -199,8 +205,8 @@ stopTor(); + stopService(new Intent(ITorService.class.getName())); - NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); mNotificationManager.cancelAll(); @@ -321,7 +327,6 @@ protected void onResume() { super.onResume(); - showMain(); updateStatus(""); if (getIntent() == null) @@ -427,21 +432,6 @@ /* - * Show the main form UI - */ - private void showMain () - { - - setContentView(R.layout.layout_main); - - lblStatus = (TextView)findViewById(R.id.lblStatus); - lblStatus.setOnLongClickListener(this); - imgStatus = (ImageView)findViewById(R.id.imgStatus); - imgStatus.setOnLongClickListener(this); - - } - - /* * Launch the system activity for Uri viewing with the provided url */ private void openBrowser(String url) @@ -482,11 +472,16 @@ } } + private AlertDialog aDialog = null; + private void showAlert(String title, String msg, boolean button) { + if (aDialog != null) + aDialog.dismiss(); + if (button) { - new AlertDialog.Builder(this) + aDialog = new AlertDialog.Builder(this) .setIcon(R.drawable.icon) .setTitle(title) .setMessage(msg) @@ -495,7 +490,7 @@ } else { - new AlertDialog.Builder(this) + aDialog = new AlertDialog.Builder(this) .setIcon(R.drawable.icon) .setTitle(title) .setMessage(msg) @@ -519,7 +514,7 @@ if (torStatus == STATUS_ON) { imgStatus.setImageResource(R.drawable.toron); - // imgStatus.clearAnimation(); + if (progressDialog != null) { progressDialog.dismiss(); @@ -535,8 +530,6 @@ if (torServiceMsg.length() > 0) showAlert("Update", torServiceMsg, false); - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - boolean showFirstTime = prefs.getBoolean("connect_first_time",true); if (showFirstTime) @@ -572,7 +565,7 @@ } else if (torStatus == STATUS_OFF) { - imgStatus.setImageResource(R.drawable.torstopping); + imgStatus.setImageResource(R.drawable.toroff); if (progressDialog != null) { @@ -615,10 +608,6 @@ private void startTor () throws RemoteException { - if (progressDialog == null) - { - progressDialog =ProgressDialog.show(this, "", getString(R.string.status_starting_up)); - } mService.setProfile(TorServiceConstants.PROFILE_ON); //this means turn on @@ -641,7 +630,7 @@ mHandler.sendMessage(msg); } - stopService(new Intent(ITorService.class.getName())); + // stopService(new Intent(ITorService.class.getName())); } @@ -720,8 +709,7 @@ String torServiceMsg = (String)msg.getData().getString(HANDLER_TOR_MSG); - if (torServiceMsg.length() > 0) - updateStatus(torServiceMsg); + updateStatus(torServiceMsg); break; case TorServiceConstants.LOG_MSG: @@ -730,10 +718,19 @@ break; case TorServiceConstants.ENABLE_TOR_MSG: + if (progressDialog == null) + { + progressDialog = ProgressDialog.show(Orbot.this, "", getString(R.string.status_starting_up)); + } + + updateStatus((String)msg.getData().getString(HANDLER_TOR_MSG)); + break; case TorServiceConstants.DISABLE_TOR_MSG: + updateStatus((String)msg.getData().getString(HANDLER_TOR_MSG)); + break; default: Modified: projects/android/trunk/Orbot/src/org/torproject/android/WizardHelper.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/WizardHelper.java 2011-05-03 05:56:04 UTC (rev 24713) +++ projects/android/trunk/Orbot/src/org/torproject/android/WizardHelper.java 2011-05-03 05:56:40 UTC (rev 24714) @@ -1,5 +1,6 @@ package org.torproject.android; +import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceUtils; import org.torproject.android.service.TorTransProxy; @@ -12,6 +13,7 @@ import android.content.SharedPreferences.Editor; import android.net.Uri; import android.preference.PreferenceManager; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -88,6 +90,26 @@ boolean hasRoot = TorServiceUtils.checkRootAccess(); + if (hasRoot) + { + try { + int resp = TorTransProxy.testOwnerModule(context); + + if (resp < 0) + { + hasRoot = false; + Toast.makeText(context, "ERROR: IPTables OWNER module not available", Toast.LENGTH_LONG).show(); + + Log.i(TorService.TAG,"ERROR: IPTables OWNER module not available"); + } + + } catch (Exception e) { + + hasRoot = false; + Log.d(TorService.TAG,"ERROR: IPTables OWNER module not available",e); + } + } + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); Editor pEdit = prefs.edit(); Modified: projects/android/trunk/Orbot/src/org/torproject/android/service/ITorService.aidl =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/service/ITorService.aidl 2011-05-03 05:56:04 UTC (rev 24713) +++ projects/android/trunk/Orbot/src/org/torproject/android/service/ITorService.aidl 2011-05-03 05:56:40 UTC (rev 24714) @@ -27,12 +27,7 @@ **/ void setProfile(int profile); - /** - * Update trans proxying - **/ - boolean updateTransProxy (); - /** * Set configuration **/ Modified: projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java 2011-05-03 05:56:04 UTC (rev 24713) +++ projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java 2011-05-03 05:56:40 UTC (rev 24714) @@ -43,9 +43,9 @@ public class TorService extends Service implements TorServiceConstants, Runnable, EventHandler { - private static boolean ENABLE_DEBUG_LOG = false; + public static boolean ENABLE_DEBUG_LOG = false; - private static int currentStatus = STATUS_READY; + private static int currentStatus = STATUS_OFF; private TorControlConnection conn = null; private Socket torConnSocket = null; @@ -53,7 +53,6 @@ private static TorService _torInstance; private static final int NOTIFY_ID = 1; - private static int NOTIFY_ID_ERROR = 2; private static final int MAX_START_TRIES = 3; @@ -213,7 +212,7 @@ } catch (Exception e) { logNotice("unable to find tor binaries: " + e.getMessage()); - showToolbarNotification(e.getMessage(), NOTIFY_ID_ERROR, R.drawable.tornotificationoff); + showToolbarNotification(e.getMessage(), NOTIFY_ID, R.drawable.tornotificationerr); Log.e(TAG, "error checking tor binaries", e); } @@ -248,7 +247,7 @@ catch (Exception e) { currentStatus = STATUS_OFF; - this.showToolbarNotification(getString(R.string.status_disabled), NOTIFY_ID_ERROR, R.drawable.tornotification); + this.showToolbarNotification(getString(R.string.status_disabled), NOTIFY_ID, R.drawable.tornotificationerr); Log.d(TAG,"Unable to start Tor: " + e.getMessage(),e); } } @@ -274,7 +273,7 @@ { killTorProcess (); - currentStatus = STATUS_READY; + currentStatus = STATUS_OFF; showToolbarNotification (getString(R.string.status_disabled),NOTIFY_ID,R.drawable.tornotificationoff); sendCallbackStatusMessage(getString(R.string.status_disabled)); @@ -314,170 +313,7 @@ }*/ - /* - private void loadTorSettingsFromPreferences () throws RemoteException - { - try - { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - - ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); - Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); - - boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); - - //boolean autoUpdateBridges = prefs.getBoolean(PREF_BRIDGES_UPDATED, false); - - boolean becomeRelay = prefs.getBoolean(TorConstants.PREF_OR, false); - - boolean ReachableAddresses = prefs.getBoolean(TorConstants.PREF_REACHABLE_ADDRESSES,false); - - boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false); - - boolean enableTransparentProxy = prefs.getBoolean(TorConstants.PREF_TRANSPARENT, false); - mBinder.updateTransProxy(); - - String bridgeList = prefs.getString(TorConstants.PREF_BRIDGES_LIST,""); - - if (useBridges) - { - if (bridgeList == null || bridgeList.length() == 0) - { - - showAlert("Bridge Error","In order to use the bridge feature, you must enter at least one bridge IP address." + - "Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account."); - - - return; - } - - - mBinder.updateConfiguration("UseBridges", "1", false); - - String bridgeDelim = "\n"; - - if (bridgeList.indexOf(",") != -1) - { - bridgeDelim = ","; - } - - StringTokenizer st = new StringTokenizer(bridgeList,bridgeDelim); - while (st.hasMoreTokens()) - { - - mBinder.updateConfiguration("bridge", st.nextToken(), false); - - } - - mBinder.updateConfiguration("UpdateBridgesFromAuthority", "0", false); - - } - else - { - mBinder.updateConfiguration("UseBridges", "0", false); - - } - - try - { - if (ReachableAddresses) - { - String ReachableAddressesPorts = - prefs.getString(TorConstants.PREF_REACHABLE_ADDRESSES_PORTS, "*:80,*:443"); - - mBinder.updateConfiguration("ReachableAddresses", ReachableAddressesPorts, false); - - } - else - { - mBinder.updateConfiguration("ReachableAddresses", "", false); - } - } - catch (Exception e) - { - showAlert("Config Error","Your ReachableAddresses settings caused an exception!"); - } - - try - { - if (becomeRelay && (!useBridges) && (!ReachableAddresses)) - { - int ORPort = Integer.parseInt(prefs.getString(TorConstants.PREF_OR_PORT, "9001")); - String nickname = prefs.getString(TorConstants.PREF_OR_NICKNAME, "Orbot"); - - mBinder.updateConfiguration("ORPort", ORPort + "", false); - mBinder.updateConfiguration("Nickname", nickname, false); - mBinder.updateConfiguration("ExitPolicy", "reject *:*", false); - - } - else - { - mBinder.updateConfiguration("ORPort", "", false); - mBinder.updateConfiguration("Nickname", "", false); - mBinder.updateConfiguration("ExitPolicy", "", false); - } - } - catch (Exception e) - { - showAlert("Uh-oh!","Your relay settings caused an exception!"); - - return; - } - - if (enableHiddenServices) - { - mBinder.updateConfiguration("HiddenServiceDir","/data/data/org.torproject.android/", false); - - String hsPorts = prefs.getString("pref_hs_ports",""); - - StringTokenizer st = new StringTokenizer (hsPorts,","); - String hsPortConfig = null; - - while (st.hasMoreTokens()) - { - hsPortConfig = st.nextToken(); - - if (hsPortConfig.indexOf(":")==-1) //setup the port to localhost if not specifed - { - hsPortConfig = hsPortConfig + " 127.0.0.1:" + hsPortConfig; - } - - mBinder.updateConfiguration("HiddenServicePort",hsPortConfig, false); - } - - //force save now so the hostname file gets generated - mBinder.saveConfiguration(); - - String onionHostname = getHiddenServiceHostname(); - - if (onionHostname != null) - { - - Editor pEdit = prefs.edit(); - pEdit.putString("pref_hs_hostname",onionHostname); - pEdit.commit(); - - } - } - else - { - mBinder.updateConfiguration("HiddenServiceDir","", false); - } - - mBinder.saveConfiguration(); - - } - catch (Exception e) - { - showAlert("Uh-oh!","There was an error updating your settings"); - - Log.w(TAG, "processSettings()", e); - - return; - } - - }*/ - + private void getHiddenServiceHostname () { @@ -493,7 +329,7 @@ { try { String onionHostname = Utils.readString(new FileInputStream(file)); - showToolbarNotification("hidden service on: " + onionHostname, NOTIFY_ID_ERROR, R.drawable.tornotification); + showToolbarNotification("hidden service on: " + onionHostname, NOTIFY_ID, R.drawable.tornotification); Editor pEdit = prefs.edit(); pEdit.putString("pref_hs_hostname",onionHostname); pEdit.commit(); @@ -501,13 +337,13 @@ } catch (FileNotFoundException e) { logException("unable to read onion hostname file",e); - showToolbarNotification("unable to read hidden service name", NOTIFY_ID_ERROR, R.drawable.tornotification); + showToolbarNotification("unable to read hidden service name", NOTIFY_ID, R.drawable.tornotificationerr); return; } } else { - showToolbarNotification("unable to read hidden service name", NOTIFY_ID_ERROR, R.drawable.tornotification); + showToolbarNotification("unable to read hidden service name", NOTIFY_ID, R.drawable.tornotificationerr); } @@ -664,9 +500,10 @@ try { + + setupTransProxy(true); runTorShellCmd(); runPrivoxyShellCmd(); - setupTransProxy(true); } catch (Exception e) { logException("Unable to start Tor: " + e.getMessage(),e); @@ -676,7 +513,12 @@ } - + /* + * activate means whether to apply the users preferences + * or clear them out + * + * the idea is that if Tor is off then transproxy is off + */ private boolean setupTransProxy (boolean activate) throws Exception { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); @@ -710,10 +552,36 @@ if (enableTransparentProxy) { - showAlert("Status", "Setting up transparent proxying..."); - - //TorTransProxy.setDNSProxying(); - int code = TorTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this),transProxyAll); + //TODO: Find a nice place for the next (commented) line + //TorTransProxy.setDNSProxying(); + + int code = 0; // Default state is "okay" + + if(transProxyPortFallback) + { + showAlert("Status", "Setting up port-based transparent proxying..."); + StringTokenizer st = new StringTokenizer(portProxyList, ","); + int status = code; + while (st.hasMoreTokens()) + { + status = TorTransProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken())); + if(status != 0) + code = status; + } + } + else + { + if(transProxyAll) + { + showAlert("Status", "Setting up full transparent proxying..."); + code = TorTransProxy.setTransparentProxyingAll(this); + } + else + { + showAlert("Status", "Setting up app-based transparent proxying..."); + code = TorTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this)); + } + } TorService.logMessage ("TorTransProxy resp code: " + code); @@ -725,17 +593,7 @@ { showAlert("Status", "WARNING: error starting transparent proxying!"); } - - //this is for Androids w/o owner module support as a circumvention only fallback - if (transProxyPortFallback) - { - StringTokenizer st = new StringTokenizer(portProxyList, ","); - - while (st.hasMoreTokens()) - TorTransProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken())); - - } - + return true; } @@ -827,7 +685,7 @@ int attempts = 0; - while (privoxyProcId == -1 && attempts < MAX_START_TRIES) + if (privoxyProcId == -1) { log = new StringBuilder(); @@ -838,20 +696,22 @@ logNotice (cmds[0]); - TorServiceUtils.doShellCommand(cmds, log, false, true); + boolean runAsRoot = false; + boolean waitFor = false; + TorServiceUtils.doShellCommand(cmds, log, runAsRoot, waitFor); + //wait one second to make sure it has started up Thread.sleep(1000); - privoxyProcId = TorServiceUtils.findProcessId(privoxyPath); - - if (privoxyProcId == -1) + while ((privoxyProcId = TorServiceUtils.findProcessId(privoxyPath)) == -1 && attempts < MAX_START_TRIES) { - logNotice("Couldn't start Privoxy process... retrying...\n" + log); + logNotice("Couldn't find Privoxy process... retrying...\n" + log); Thread.sleep(3000); attempts++; } + logNotice(log.toString()); } @@ -1066,7 +926,7 @@ .setPositiveButton(android.R.string.ok, null) .show(); */ - showToolbarNotification(msg, NOTIFY_ID_ERROR, R.drawable.tornotification); + showToolbarNotification(msg, NOTIFY_ID, R.drawable.tornotification); } public void newDescriptors(List<String> orList) { @@ -1168,7 +1028,7 @@ catch (Exception e) { logNotice("unable to find tor binaries: " + e.getMessage()); - showToolbarNotification(e.getMessage(), NOTIFY_ID_ERROR, R.drawable.tornotificationoff); + showToolbarNotification(e.getMessage(), NOTIFY_ID, R.drawable.tornotificationerr); Log.d(TAG,"Unable to check for Tor binaries",e); return null; @@ -1227,23 +1087,8 @@ } - public boolean updateTransProxy () - { - - //turn on - try - { - setupTransProxy(currentStatus == STATUS_ON); - return true; - } - catch (Exception e) - { - Log.d(TAG, "error enabling transproxy",e); - - return false; - } - } + public String getConfiguration (String name) { try @@ -1431,9 +1276,12 @@ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); + Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); + boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); - boolean autoUpdateBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_UPDATED, false); + //boolean autoUpdateBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_UPDATED, false); boolean becomeRelay = prefs.getBoolean(TorConstants.PREF_OR, false); @@ -1441,16 +1289,21 @@ boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false); - boolean enableTransparentProxy = prefs.getBoolean(TorConstants.PREF_TRANSPARENT, false); + //boolean enableTransparentProxy = prefs.getBoolean(TorConstants.PREF_TRANSPARENT, false); - try - { - setupTransProxy(currentStatus != STATUS_OFF); - } - catch (Exception e) - { - logException("unable to setup transproxy",e); - } + if (currentStatus == STATUS_ON) + { + //reset iptables rules in active mode + + try + { + setupTransProxy(true); + } + catch (Exception e) + { + logException("unable to setup transproxy",e); + } + } if (useBridges) { @@ -1575,6 +1428,6 @@ return true; } - + } Modified: projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceConstants.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceConstants.java 2011-05-03 05:56:04 UTC (rev 24713) +++ projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceConstants.java 2011-05-03 05:56:40 UTC (rev 24714) @@ -69,8 +69,8 @@ //control port public final static String TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE = "Bootstrapped 100%"; - public final static int STATUS_OFF = -1; - public final static int STATUS_READY = 0; + public final static int STATUS_OFF = 0; + // public final static int STATUS_READY = 0; public final static int STATUS_ON = 1; public final static int STATUS_CONNECTING = 2; Modified: projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceUtils.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceUtils.java 2011-05-03 05:56:04 UTC (rev 24713) +++ projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceUtils.java 2011-05-03 05:56:40 UTC (rev 24714) @@ -162,6 +162,7 @@ else proc = Runtime.getRuntime().exec("sh"); + OutputStreamWriter out = new OutputStreamWriter(proc.getOutputStream()); for (int i = 0; i < cmds.length; i++)

1 0

r24713: {projects} merged __sporkbomb's xclnt patch for fixing transproxy all m (projects/android/trunk/Orbot/src/org/torproject/android/service)
by Nathan Freitas 03 May '11

03 May '11

Author: n8fr8 Date: 2011-05-03 05:56:04 +0000 (Tue, 03 May 2011) New Revision: 24713 Modified: projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java Log: merged __sporkbomb's xclnt patch for fixing transproxy all mode Modified: projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java 2011-05-03 05:54:24 UTC (rev 24712) +++ projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java 2011-05-03 05:56:04 UTC (rev 24713) @@ -125,19 +125,52 @@ } */ - public static int setTransparentProxyingByApp(Context context, TorifiedApp[] apps, boolean forceAll) throws Exception + public static int testOwnerModule(Context context) throws Exception { boolean runRoot = true; boolean waitFor = true; - //android.os.Debug.waitForDebugger(); + //redirectDNSResolvConf(); //not working yet + int torUid = context.getApplicationInfo().uid; + + String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); + StringBuilder script = new StringBuilder(); + + StringBuilder res = new StringBuilder(); + int code = -1; + + // Allow everything for Tor + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(torUid); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + + String[] cmdAdd = {script.toString()}; + + code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); + String msg = res.toString(); + TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg); + + + return code; + } + + + + public static int setTransparentProxyingByApp(Context context, TorifiedApp[] apps) throws Exception + { + + boolean runRoot = true; + boolean waitFor = true; + //redirectDNSResolvConf(); //not working yet String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); - - boolean ipTablesOld = false; StringBuilder script = new StringBuilder(); @@ -145,14 +178,12 @@ int code = -1; purgeIptables(context); - - script = new StringBuilder(); - + //build up array of shell cmds to execute under one root context for (int i = 0; i < apps.length; i++) { - if (forceAll || apps[i].isTorified()) //if "Tor Everything" on or app is set to true + if (apps[i].isTorified()) //if app is set to true { if (apps[i].getUsername().equals(TorServiceConstants.TOR_APP_USERNAME)) @@ -170,14 +201,8 @@ script.append(" -m owner --uid-owner "); script.append(apps[i].getUid()); script.append(" -m tcp --syn"); - - if (ipTablesOld) - script.append(" -j DNAT --to 127.0.0.1:"); - else - script.append(" -j REDIRECT --to-ports "); - + script.append(" -j REDIRECT --to-ports "); script.append(TOR_TRANSPROXY_PORT); - script.append(" || exit\n"); //DNS @@ -187,57 +212,37 @@ script.append(apps[i].getUid()); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_DNS_PORT); + script.append(" || exit\n"); - if (ipTablesOld) - script.append(" -j DNAT --to 127.0.0.1:"); - else - script.append(" -j REDIRECT --to-ports "); + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT -p tcp"); + script.append(" -m owner --uid-owner "); + script.append(apps[i].getUid()); + script.append(" -m tcp --dport "); + script.append(TOR_TRANSPROXY_PORT); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT -p udp"); + script.append(" -m owner --uid-owner "); + script.append(apps[i].getUid()); + script.append(" -m udp --dport "); script.append(TOR_DNS_PORT); - + script.append(" -j ACCEPT"); script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -t filter -A OUTPUT -m owner --uid-owner "); + script.append(apps[i].getUid()); + script.append(" -j DROP"); //drop all other packets as Tor won't handle them + script.append(" || exit\n"); - if (ipTablesOld) //for some reason this doesn't work on iptables 1.3.7 - { - script.append(ipTablesPath); - script.append(" -t nat"); - script.append(" -A OUTPUT -m owner --uid-owner "); - script.append(apps[i].getUid()); - script.append(" -j DROP"); - script.append(" || exit\n"); - } - else - { - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT -p tcp"); - script.append(" -m owner --uid-owner "); - script.append(apps[i].getUid()); - script.append(" -m tcp --dport "); - script.append(TOR_TRANSPROXY_PORT); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT -p udp"); - script.append(" -m owner --uid-owner "); - script.append(apps[i].getUid()); - script.append(" -m udp --dport "); - script.append(TOR_DNS_PORT); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); - - script.append(ipTablesPath); - script.append(" -t filter -A OUTPUT -m owner --uid-owner "); - script.append(apps[i].getUid()); - script.append(" -j DROP"); //drop all other packets as Tor won't handle them - script.append(" || exit\n"); - - } - - } } @@ -260,20 +265,13 @@ //String baseDir = context.getDir("bin",0).getAbsolutePath() + '/'; String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); - - boolean ipTablesOld = false; StringBuilder script = new StringBuilder(); StringBuilder res = new StringBuilder(); int code = -1; - - String[] cmdFlush = {script.toString()}; - code = TorServiceUtils.doShellCommand(cmdFlush, res, true, true); - //String msg = res.toString(); //get stdout from command + purgeIptables(context); - script = new StringBuilder(); - //TCP //iptables -t nat -A PREROUTING -i eth0 -p tcp --dport $srcPortNumber -j REDIRECT --to-port $dstPortNumbe @@ -283,14 +281,8 @@ script.append(" --dport "); script.append(port); //script.append(" -m tcp --syn"); - - if (ipTablesOld) - script.append(" -j DNAT --to 127.0.0.1:"); - else - script.append(" -j REDIRECT --to-ports "); - + script.append(" -j REDIRECT --to-ports "); script.append(TOR_TRANSPROXY_PORT); - script.append(" || exit\n"); script.append(ipTablesPath); @@ -298,14 +290,8 @@ script.append(" -A OUTPUT -p udp"); script.append(" --dport "); script.append(port); - - if (ipTablesOld) - script.append(" -j DNAT --to 127.0.0.1:"); - else - script.append(" -j REDIRECT --to-ports "); - + script.append(" -j REDIRECT --to-ports "); script.append(TOR_TRANSPROXY_PORT); - script.append(" || exit\n"); //DNS @@ -314,24 +300,135 @@ script.append(" -A OUTPUT -p udp "); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_DNS_PORT); + script.append(" || exit\n"); - if (ipTablesOld) - script.append(" -j DNAT --to 127.0.0.1:"); - else - script.append(" -j REDIRECT --to-ports "); + + String[] cmdAdd = {script.toString()}; + code = TorServiceUtils.doShellCommand(cmdAdd, res, true, true); + String msg = res.toString(); + TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg); + return code; + } + + public static int setTransparentProxyingAll(Context context) throws Exception + { + boolean runRoot = true; + boolean waitFor = true; + + //redirectDNSResolvConf(); //not working yet + + String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); + + StringBuilder script = new StringBuilder(); + + StringBuilder res = new StringBuilder(); + int code = -1; + + purgeIptables(context); + + int torUid = context.getApplicationInfo().uid; + + // Set up port redirection + script.append(ipTablesPath); + script.append(" -t nat"); + script.append(" -A OUTPUT -p tcp"); + script.append(" -m owner ! --uid-owner "); + script.append(torUid); + script.append(" -m tcp --syn"); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_TRANSPROXY_PORT); + script.append(" || exit\n"); + + // Same for DNS + script.append(ipTablesPath); + script.append(" -t nat"); + script.append(" -A OUTPUT -p udp -m owner ! --uid-owner "); + script.append(torUid); + script.append(" -m udp --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); + script.append(" || exit\n"); + // Allow packets to localhost (contains all the port-redirected ones) + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -p tcp"); + script.append(" -d 127.0.0.1"); + script.append(" -j ACCEPT"); script.append(" || exit\n"); + // Allow loopback + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -p tcp"); + script.append(" -o lo"); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + + // Allow everything for Tor + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(torUid); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + + if (TorService.ENABLE_DEBUG_LOG) + { + //XXX: Comment the following rules for non-debug builds + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -p udp"); + script.append(" --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j LOG"); + script.append(" --log-prefix='ORBOT_DNSLEAK_PROTECTION'"); + script.append(" --log-uid"); + script.append(" || exit\n"); + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -p tcp"); + script.append(" -j LOG"); + script.append(" --log-prefix='ORBOT_TCPLEAK_PROTECTION'"); + script.append(" --log-uid"); + script.append(" || exit\n"); + } + + // Reject DNS that is not from Tor (order is important - first matched rule counts!) + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -p udp"); + script.append(" --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REJECT"); + script.append(" || exit\n"); + + // Reject all other outbound TCP packets + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -p tcp"); + script.append(" -j REJECT"); + script.append(" || exit\n"); + + String[] cmdAdd = {script.toString()}; - String[] cmdAdd = {script.toString()}; - code = TorServiceUtils.doShellCommand(cmdAdd, res, true, true); + code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); String msg = res.toString(); TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg); - return code; - } + return code; + } }

1 0