- tor-commits - lists.torproject.org

[vidalia/alpha] Adds new controlpassword approach
by chiiph＠torproject.org 03 May '11

03 May '11

commit 20188bbd30299098a5f071d8aee3e6b4c736c3db Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Sat Apr 9 16:28:00 2011 -0300 Adds new controlpassword approach --- src/vidalia/ControlPasswordInputDialog.cpp | 32 +----- src/vidalia/ControlPasswordInputDialog.h | 15 --- src/vidalia/ControlPasswordInputDialog.ui | 149 +++++++++++++++------------ src/vidalia/MainWindow.cpp | 33 +------ 4 files changed, 92 insertions(+), 137 deletions(-) diff --git a/src/vidalia/ControlPasswordInputDialog.cpp b/src/vidalia/ControlPasswordInputDialog.cpp index 5cc4dec..dfa2a53 100644 --- a/src/vidalia/ControlPasswordInputDialog.cpp +++ b/src/vidalia/ControlPasswordInputDialog.cpp @@ -27,17 +27,11 @@ ControlPasswordInputDialog::ControlPasswordInputDialog(QWidget *parent) setAttribute(Qt::WA_DeleteOnClose, false); ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok - | QDialogButtonBox::Cancel | QDialogButtonBox::Reset | QDialogButtonBox::Help); connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(clicked(QAbstractButton*))); - connect(ui.linePassword, SIGNAL(textEdited(QString)), - this, SLOT(passwordEdited(QString))); - - /* The dialog starts with an empty password field */ - passwordEdited(QString()); } void @@ -46,32 +40,16 @@ ControlPasswordInputDialog::setResetEnabled(bool enabled) if (enabled) { ui.buttonBox->setStandardButtons(ui.buttonBox->standardButtons() | QDialogButtonBox::Reset); + ui.lblOptionOne->setVisible(false); + ui.lblOptionTwo->setVisible(true); } else { ui.buttonBox->setStandardButtons(ui.buttonBox->standardButtons() & ~QDialogButtonBox::Reset); + ui.lblOptionOne->setVisible(true); + ui.lblOptionTwo->setVisible(false); } } -QString -ControlPasswordInputDialog::password() const -{ - return ui.linePassword->text(); -} - -bool -ControlPasswordInputDialog::isSavePasswordChecked() const -{ - return ui.chkSavePassword->isChecked(); -} - -void -ControlPasswordInputDialog::passwordEdited(const QString &text) -{ - QPushButton *okButton = ui.buttonBox->button(QDialogButtonBox::Ok); - if (okButton) - okButton->setEnabled(! text.isEmpty()); -} - void ControlPasswordInputDialog::clicked(QAbstractButton *button) { @@ -96,7 +74,7 @@ void ControlPasswordInputDialog::setVisible(bool visible) { if (visible) - resize(minimumSizeHint()); + adjustSize(); QDialog::setVisible(visible); } diff --git a/src/vidalia/ControlPasswordInputDialog.h b/src/vidalia/ControlPasswordInputDialog.h index 9722062..47b24b0 100644 --- a/src/vidalia/ControlPasswordInputDialog.h +++ b/src/vidalia/ControlPasswordInputDialog.h @@ -32,16 +32,6 @@ public: */ ControlPasswordInputDialog(QWidget *parent = 0); - /** Returns the password entered in the dialog. If the dialog was dismissed - * with the "Cancel" button, then the returned QString will be empty. - */ - QString password() const; - - /** Returns true if the "Remember my password" checkbox was checked at the - * time the dialog was dismissed. - */ - bool isSavePasswordChecked() const; - /** If enabled is true, then the "Reset" button will be visible on * the password input dialog. Otherwise, the "Reset" button will be hidden. */ @@ -60,11 +50,6 @@ protected slots: */ void clicked(QAbstractButton *button); - /** Called when the user changes the password QLineEdit. If the password is - * empty, then the "Ok" button will be disabled. Otherwise, it is enabled. - */ - void passwordEdited(const QString &text); - protected: /** Adjusts the size of the input dialog when it is displayed. */ virtual void setVisible(bool visible); diff --git a/src/vidalia/ControlPasswordInputDialog.ui b/src/vidalia/ControlPasswordInputDialog.ui index 00b5002..0b51081 100644 --- a/src/vidalia/ControlPasswordInputDialog.ui +++ b/src/vidalia/ControlPasswordInputDialog.ui @@ -1,119 +1,136 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ControlPasswordInputDialog</class> - <widget class="QDialog" name="ControlPasswordInputDialog" > - <property name="windowModality" > + <widget class="QDialog" name="ControlPasswordInputDialog"> + <property name="windowModality"> <enum>Qt::WindowModal</enum> </property> - <property name="geometry" > + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>350</width> - <height>192</height> + <width>356</width> + <height>189</height> </rect> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>1</horstretch> + <verstretch>1</verstretch> </sizepolicy> </property> - <property name="minimumSize" > + <property name="minimumSize"> <size> <width>350</width> <height>0</height> </size> </property> - <property name="windowTitle" > - <string>Password Required</string> + <property name="windowTitle"> + <string>Problem connecting to Tor</string> </property> - <property name="windowIcon" > + <property name="windowIcon"> <iconset> <normaloff>:/images/32x32/dialog-password.png</normaloff>:/images/32x32/dialog-password.png</iconset> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>false</bool> </property> - <property name="modal" > + <property name="modal"> <bool>true</bool> </property> - <layout class="QGridLayout" name="gridLayout_2" > - <item row="0" column="0" > - <layout class="QGridLayout" name="gridLayout" > - <property name="sizeConstraint" > + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <layout class="QGridLayout" name="gridLayout"> + <property name="sizeConstraint"> <enum>QLayout::SetDefaultConstraint</enum> </property> - <item row="0" column="0" > - <widget class="QLabel" name="lblIcon" > - <property name="minimumSize" > - <size> - <width>48</width> - <height>48</height> - </size> - </property> - <property name="text" > - <string/> - </property> - <property name="pixmap" > - <pixmap resource="res/vidalia.qrc" >:/images/48x48/dialog-password.png</pixmap> - </property> - <property name="alignment" > - <set>Qt::AlignHCenter|Qt::AlignTop</set> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QLabel" name="lblPrompt" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <item row="0" column="1"> + <widget class="QLabel" name="lblPrompt"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>1</horstretch> <verstretch>1</verstretch> </sizepolicy> </property> - <property name="minimumSize" > + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="text" > - <string>Vidalia has connected to a running Tor process that requires a password. Please enter your control password: </string> + <property name="text"> + <string>Vidalia has detected that there is a Tor running, probably launched by another Vidalia instance.</string> </property> - <property name="textFormat" > + <property name="textFormat"> <enum>Qt::PlainText</enum> </property> - <property name="scaledContents" > + <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment" > - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> </item> - <item row="2" column="1" > - <widget class="QCheckBox" name="chkSavePassword" > - <property name="text" > - <string>Remember my password</string> + <item row="6" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set> </property> </widget> </item> - <item row="3" column="0" colspan="2" > - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> + <item row="1" column="1"> + <widget class="QLabel" name="lblOptionOne"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>1</horstretch> + <verstretch>1</verstretch> + </sizepolicy> </property> - <property name="standardButtons" > - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set> + <property name="lineWidth"> + <number>1</number> + </property> + <property name="text"> + <string>Vidalia is unable to connect to it. +You could: +* Exit Vidalia, and try to kill the running Tor instance.</string> + </property> + <property name="textFormat"> + <enum>Qt::AutoText</enum> + </property> + <property name="scaledContents"> + <bool>false</bool> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + <property name="openExternalLinks"> + <bool>false</bool> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QLineEdit" name="linePassword" > - <property name="echoMode" > - <enum>QLineEdit::Password</enum> + <item row="2" column="1"> + <widget class="QLabel" name="lblOptionTwo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>1</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Vidalia is unable to connect to it. +You could: +* Exit Vidalia, or +* Press Reset to try to restart Tor.</string> + </property> + <property name="wordWrap"> + <bool>true</bool> </property> </widget> </item> @@ -122,7 +139,7 @@ </layout> </widget> <resources> - <include location="res/vidalia.qrc" /> + <include location="res/vidalia.qrc"/> </resources> <connections/> </ui> diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index d61b5e8..84849b6 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -865,43 +865,18 @@ MainWindow::authenticationFailed(QString errmsg) #endif int ret = dlg.exec(); - if (ret == QDialogButtonBox::Ok) { - if (dlg.isSavePasswordChecked()) { - TorSettings settings; - settings.setAuthenticationMethod(TorSettings::PasswordAuth); - settings.setUseRandomPassword(false); - settings.setControlPassword(dlg.password()); - _useSavedPassword = true; - } else { - _controlPassword = dlg.password(); - _useSavedPassword = false; - } - retry = true; - } else if (ret == QDialogButtonBox::Reset) { + if (ret == QDialogButtonBox::Reset) { if (! process_kill(torPid)) { VMessageBox::warning(this, tr("Password Reset Failed"), - p(tr("Vidalia tried to reset Tor's control password, but was not " - "able to restart the Tor software. Please check your Task " - "Manager to ensure there are no other Tor processes running.")), + p(tr("Vidalia tried to restart Tor, but was not " + "able to. Please check your Task Manager to " + "ensure there are no other Tor processes running.")), VMessageBox::Ok|VMessageBox::Default); } else { retry = true; } } - } else { - /* Something else went wrong */ - int ret = VMessageBox::warning(this, - tr("Authentication Error"), - p(tr("Vidalia was unable to authenticate to the Tor software. " - "(%1)").arg(errmsg)) + - p(tr("Please check your control port authentication " - "settings.")), - VMessageBox::ShowSettings|VMessageBox::Default, - VMessageBox::Cancel|VMessageBox::Escape); - - if (ret == VMessageBox::ShowSettings) - showConfigDialog(ConfigDialog::Advanced); } if (_torControl->isRunning())

1 0

[vidalia/alpha] Another approach to the Control Password problem
by chiiph＠torproject.org 03 May '11

03 May '11

commit e428847150a282aa107b0ba173f3956453810eb4 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Fri Apr 22 01:02:21 2011 -0300 Another approach to the Control Password problem - Tries kills only the tor process that's listening to the ControlPort specified in the config. - Doesn't ask for password anymore. Now it displays nice messages, courtesy of nickm (thanks!). - Fixes problem with saving advanced settings when Vidalia isn't running Tor because the instance got "zombied" in another Vidalia run&crash. --- src/common/procutil.cpp | 66 ++++++++++++++++++++++++++--- src/common/procutil.h | 3 +- src/vidalia/ControlPasswordInputDialog.ui | 15 +++---- src/vidalia/MainWindow.cpp | 10 ++--- src/vidalia/config/AdvancedPage.cpp | 3 +- 5 files changed, 74 insertions(+), 23 deletions(-) diff --git a/src/common/procutil.cpp b/src/common/procutil.cpp index c2fbbc4..cad0add 100644 --- a/src/common/procutil.cpp +++ b/src/common/procutil.cpp @@ -21,6 +21,11 @@ #include <QFileInfo> #include <QTextStream> #include <QApplication> +#include <QProcess> + +#if !defined(Q_OS_WIN) +#include <signal.h> +#endif /** Returns the PID of the current process. */ @@ -104,13 +109,9 @@ read_pidfile(const QString &pidFileName, QString *errmsg) } QHash<qint64, QString> -process_list() +process_list(quint16 port) { -#if defined(Q_OS_WIN32) - return win32_process_list(); -#else - return QHash<qint64, QString>(); -#endif + return universal_process_list(port); } bool @@ -127,7 +128,60 @@ process_kill(qint64 pid) return (ret != FALSE); #else + if(!kill(pid, 15)) + return true; return false; #endif } +QHash<qint64, QString> +universal_process_list(quint16 port) +{ + QHash<qint64, QString> pl; + + QProcess ps; + QStringList args; +#if defined(Q_OS_LINUX) + args << "-npl"; +#else + args << "-no"; +#endif + + ps.start("netstat", args, QIODevice::ReadOnly); + while(!ps.waitForFinished()); + + QString flt = QString("127.0.0.1:%1").arg(port); + QStringList lines = QString(ps.readAllStandardOutput()).split("\n"); + QStringList filtered = lines.filter(flt); + +#if defined(Q_OS_WIN) + filtered = filtered.filter("LISTENING"); +#endif + + if(filtered.length() == 0) + return QHash<qint64, QString>(); + + qint64 pid = 0; + QString proc = ""; +#if defined(Q_OS_LINUX) + foreach(QString line, lines) { + QStringList items = line.trimmed().split(" "); + if(items.length() < 1) + continue; + items = items.last().trimmed().split("/"); + if(items.length() < 2) + continue; + + pid = items[0].toLong(); + proc = items[1]; + + pl.insert(pid, proc); + } +#else + pid = filtered[0].split(" ").last().trimmed().toLong(); + proc = "tor"; + pl.insert(pid, proc); +#endif + + return pl; +} diff --git a/src/common/procutil.h b/src/common/procutil.h index 7e9b7dc..537fda0 100644 --- a/src/common/procutil.h +++ b/src/common/procutil.h @@ -45,7 +45,8 @@ qint64 read_pidfile(const QString &pidfile, QString *errmsg = 0); /** Return a list of all currently running PIDs and their associated process * names. */ -QHash<qint64, QString> process_list(); +QHash<qint64, QString> process_list(quint16 port = 0); +QHash<qint64, QString> universal_process_list(quint16 port); /** Attempt to kill process pid. Return true if the specified process * was successfully terminated. Otherwise, return false. */ diff --git a/src/vidalia/ControlPasswordInputDialog.ui b/src/vidalia/ControlPasswordInputDialog.ui index 0b51081..07b761c 100644 --- a/src/vidalia/ControlPasswordInputDialog.ui +++ b/src/vidalia/ControlPasswordInputDialog.ui @@ -9,7 +9,7 @@ <rect> <x>0</x> <y>0</y> - <width>356</width> + <width>470</width> <height>189</height> </rect> </property> @@ -59,7 +59,9 @@ </size> </property> <property name="text"> - <string>Vidalia has detected that there is a Tor running, probably launched by another Vidalia instance.</string> + <string>Tor is already running, but Vidalia can't connect to it. + +This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor.</string> </property> <property name="textFormat"> <enum>Qt::PlainText</enum> @@ -97,9 +99,7 @@ <number>1</number> </property> <property name="text"> - <string>Vidalia is unable to connect to it. -You could: -* Exit Vidalia, and try to kill the running Tor instance.</string> + <string>You will need to shut down the Tor process before Vidalia can launch a new one. </string> </property> <property name="textFormat"> <enum>Qt::AutoText</enum> @@ -124,10 +124,7 @@ You could: </sizepolicy> </property> <property name="text"> - <string>Vidalia is unable to connect to it. -You could: -* Exit Vidalia, or -* Press Reset to try to restart Tor.</string> + <string>Vidalia can try to restart Tor for you. Doing so will close all currently active connections through your Tor process.</string> </property> <property name="wordWrap"> <bool>true</bool> diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 84849b6..db28916 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -851,18 +851,16 @@ MainWindow::authenticationFailed(QString errmsg) qint64 torPid = 0; -#if defined(Q_OS_WIN32) - QHash<qint64, QString> procs = process_list(); + TorSettings settings; + QHash<qint64, QString> procs = process_list(settings.getControlPort()); foreach (qint64 pid, procs.keys()) { - if (! procs.value(pid).compare("tor.exe", Qt::CaseInsensitive)) { + if (! procs.value(pid).compare("tor", Qt::CaseInsensitive)) { torPid = pid; break; } } + dlg.setResetEnabled(torPid > 0); -#else - dlg.setResetEnabled(false); -#endif int ret = dlg.exec(); if (ret == QDialogButtonBox::Reset) { diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp index 94c0308..3f0fc2b 100644 --- a/src/vidalia/config/AdvancedPage.cpp +++ b/src/vidalia/config/AdvancedPage.cpp @@ -165,7 +165,8 @@ AdvancedPage::save(QString &errmsg) /* Only remember the torrc and datadir values if Vidalia started Tor, or * if the user changed the displayed values. */ - if (Vidalia::torControl()->isVidaliaRunningTor()) { + if (Vidalia::torControl()->isVidaliaRunningTor() or + not Vidalia::torControl()->isRunning()) { QString torrc = ui.lineTorConfig->text(); if (torrc != _settings->getTorrc()) { _settings->setTorrc(torrc);

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 authMethod. */

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