January 2012 - tor-commits - lists.torproject.org

[vidalia/alpha] Adds a checkbox to VMessageLog::question to easily remember the answer
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 92d5fd3bffd1cee93532e4e3ee525af2328c9787 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 19:03:45 2012 -0300 Adds a checkbox to VMessageLog::question to easily remember the answer Also uses it for shutting down tor gracefully --- src/vidalia/MainWindow.cpp | 9 ++++- src/vidalia/VMessageBox.cpp | 55 ++++++++++++++++++++++++++----- src/vidalia/VMessageBox.h | 11 +++++- src/vidalia/config/VidaliaSettings.cpp | 13 +++++++ src/vidalia/config/VidaliaSettings.h | 8 +++++ 5 files changed, 83 insertions(+), 13 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 183e78f..0ba6dda 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -717,12 +717,15 @@ MainWindow::stop() QString errmsg; TorStatus prevStatus; bool rc; + VidaliaSettings settings; /* If we're running a server, give users the option of terminating * gracefully so clients have time to find new servers. */ if (server.isServerEnabled() && !_delayedShutdownStarted) { /* Ask the user if they want to shutdown nicely. */ - int response = VMessageBox::question(this, tr("Relaying is Enabled"), + int response = VMessageBox::Yes; + if(!settings.rememberShutdown()) { + response = VMessageBox::question(this, tr("Relaying is Enabled"), tr("You are currently running a relay. " "Terminating your relay will interrupt any " "open connections from clients.\n\n" @@ -730,7 +733,9 @@ MainWindow::stop() "give clients time to find a new relay?"), VMessageBox::Yes|VMessageBox::Default, VMessageBox::No, - VMessageBox::Cancel|VMessageBox::Escape); + VMessageBox::Cancel|VMessageBox::Escape, + "Remember this answer", &settings, SETTING_REMEMBER_SHUTDOWN); + } if (response == VMessageBox::Yes) _delayedShutdownStarted = true; else if (response == VMessageBox::Cancel) diff --git a/src/vidalia/VMessageBox.cpp b/src/vidalia/VMessageBox.cpp index 0dbf927..1600bc3 100644 --- a/src/vidalia/VMessageBox.cpp +++ b/src/vidalia/VMessageBox.cpp @@ -17,11 +17,19 @@ #include "html.h" +#include <QGridLayout> +#include <QCheckBox> +#include <QDialogButtonBox> +#include <QPushButton> /** Default constructor. */ VMessageBox::VMessageBox(QWidget *parent) : QMessageBox(parent) { + _chkRemember = new QCheckBox(""); + QGridLayout *gl = qobject_cast<QGridLayout *>(layout()); + gl->addWidget(_chkRemember, gl->rowCount() - 2, 1); + _chkRemember->setVisible(false); } /** Returns the button (0, 1, or 2) that is OR-ed with QMessageBox::Default, @@ -113,15 +121,45 @@ VMessageBox::critical(QWidget *parent, QString caption, QString text, * QMessageBox::Escape, respectively. */ int VMessageBox::question(QWidget *parent, QString caption, QString text, - int button0, int button1, int button2) + int button0, int button1, int button2, + QString remember, VSettings *settings, QString key) { - int ret = QMessageBox::question(parent, caption, p(text), - VMessageBox::buttonText(button0), - VMessageBox::buttonText(button1), - VMessageBox::buttonText(button2), - VMessageBox::defaultButton(button0, button1, button2), - VMessageBox::escapeButton(button0, button1, button2)); - return VMessageBox::selected(ret, button0, button1, button2); + VMessageBox messageBox(parent); + + messageBox.setIcon(QMessageBox::Question); + messageBox.setWindowTitle(caption); + messageBox.setText(text); + messageBox.setStandardButtons(QMessageBox::NoButton); + + if(settings) { + messageBox._chkRemember->setVisible(true); + messageBox._chkRemember->setText(remember); + } + + QString myButton0Text = VMessageBox::buttonText(button0); + if (myButton0Text.isEmpty()) + myButton0Text = QDialogButtonBox::tr("OK"); + messageBox.addButton(myButton0Text, QMessageBox::ActionRole); + + if (!VMessageBox::buttonText(button1).isEmpty()) + messageBox.addButton(VMessageBox::buttonText(button1), QMessageBox::ActionRole); + + if (!VMessageBox::buttonText(button2).isEmpty()) + messageBox.addButton(VMessageBox::buttonText(button2), QMessageBox::ActionRole); + + const QList<QAbstractButton *> &buttonList = messageBox.buttons(); + messageBox.setDefaultButton(qobject_cast<QPushButton *>(buttonList + .value(VMessageBox::defaultButton(button0, + button1, + button2)))); + messageBox.setEscapeButton(buttonList.value(VMessageBox::escapeButton(button0, button1, button2))); + int ret = messageBox.exec(); + + if(!settings) + return ret; + settings->setValue(key, messageBox._chkRemember->checkState() == Qt::Checked); + + return ret; } /** Displays an information message box with the given caption, message text, and @@ -157,4 +195,3 @@ VMessageBox::warning(QWidget *parent, QString caption, QString text, VMessageBox::escapeButton(button0, button1, button2)); return VMessageBox::selected(ret, button0, button1, button2); } - diff --git a/src/vidalia/VMessageBox.h b/src/vidalia/VMessageBox.h index fc96405..0dd3fe5 100644 --- a/src/vidalia/VMessageBox.h +++ b/src/vidalia/VMessageBox.h @@ -19,6 +19,9 @@ #include <QMessageBox> #include <QString> +#include "VSettings.h" + +class QCheckBox; class VMessageBox : public QMessageBox { @@ -72,8 +75,10 @@ public: * button, OR the Button enum value with QMessageBox::Default or * QMessageBox::Escape, respectively. */ static int question(QWidget *parent, QString caption, QString text, - int button0, int button1 = NoButton, - int button2 = NoButton); + int button0, int button1 = NoButton, + int button2 = NoButton, + QString remember = QString(), VSettings *settings = 0, + QString key = QString()); /** Converts a Button enum value to a translated string. */ static QString buttonText(int button); @@ -87,6 +92,8 @@ private: static int escapeButton(int button0, int button1, int button2); /** Returns the Button enum value from the given return value. */ static int selected(int ret, int button0, int button1, int button2); + + QCheckBox *_chkRemember; }; #endif diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp index 022c427..48cd051 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -87,6 +87,7 @@ VidaliaSettings::VidaliaSettings() setDefault(SETTING_PLUGIN_PATH, vApp->dataDirectory()); setDefault(SETTING_ICON_PREF, Both); + setDefault(SETTING_REMEMBER_SHUTDOWN, false); } /** Gets the currently preferred language code for Vidalia. */ @@ -370,3 +371,15 @@ VidaliaSettings::fromString(QString iconPref) return Both; } + +bool +VidaliaSettings::rememberShutdown() +{ + return value(SETTING_REMEMBER_SHUTDOWN).toBool(); +} + +void +VidaliaSettings::setRememberShutdown(bool val) +{ + setValue(SETTING_REMEMBER_SHUTDOWN, val); +} diff --git a/src/vidalia/config/VidaliaSettings.h b/src/vidalia/config/VidaliaSettings.h index bb6f1a0..3efbdb5 100644 --- a/src/vidalia/config/VidaliaSettings.h +++ b/src/vidalia/config/VidaliaSettings.h @@ -20,6 +20,8 @@ #include <QDateTime> +/** Public setting keys */ +#define SETTING_REMEMBER_SHUTDOWN "RememberShutdown" /** Handles saving and restoring Vidalia's settings, such as the * location of Tor, the control port, etc. @@ -144,6 +146,12 @@ public: void setIconPref(const IconPosition iconPref); QString toString(const IconPosition iconPref); IconPosition fromString(QString iconPref); + + /** Returns true if Vidalia should not ask if the user wants to shutdown + * tor gracefully */ + bool rememberShutdown(); + /** Sets RememberShutdown to val */ + void setRememberShutdown(bool val); }; #endif

1 0

[vidalia/alpha] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 7041eb8c1a6a6fde9e4f69ab8fdbd24f51c380de Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 10:48:01 2012 -0300 Add a changes file --- changes/bug3156 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug3156 b/changes/bug3156 new file mode 100644 index 0000000..287cbef --- /dev/null +++ b/changes/bug3156 @@ -0,0 +1,2 @@ + o Explicitly notifies the user that her clock is wrong and tor will + probably malfuntion because of it. Fixes bug 3156. \ No newline at end of file

1 0

[vidalia/alpha] Add a SkipVersionCheck config option for Tails
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 9f47030305d452d05bc799612ca98456a9017a87 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 14:57:30 2012 -0300 Add a SkipVersionCheck config option for Tails --- src/vidalia/MainWindow.cpp | 3 +++ src/vidalia/config/VidaliaSettings.cpp | 8 ++++++++ src/vidalia/config/VidaliaSettings.h | 3 +++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 183e78f..7e27bcf 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1319,6 +1319,9 @@ MainWindow::tryHashed() void MainWindow::checkTorVersion() { + VidaliaSettings settings; + if(settings.skipVersionCheck()) + return; QString status; if (_torControl->getInfo("status/version/current", status)) { if (!status.compare("old", Qt::CaseInsensitive) diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp index 022c427..ac15a63 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -40,6 +40,7 @@ #define SETTING_USE_LOCAL_GEOIP_DATABASE "UseLocalGeoIpDatabase" #define SETTING_LOCAL_GEOIP_DATABASE "LocalGeoIpDatabase" #define SETTING_PLUGIN_PATH "PluginPath" +#define SETTING_SKIP_VERSION_CHECK "SkipVersionCheck" #if defined(Q_OS_WIN32) #define STARTUP_REG_KEY "Software\\Microsoft\\Windows\\CurrentVersion\\Run" @@ -87,6 +88,7 @@ VidaliaSettings::VidaliaSettings() setDefault(SETTING_PLUGIN_PATH, vApp->dataDirectory()); setDefault(SETTING_ICON_PREF, Both); + setDefault(SETTING_SKIP_VERSION_CHECK, false); } /** Gets the currently preferred language code for Vidalia. */ @@ -370,3 +372,9 @@ VidaliaSettings::fromString(QString iconPref) return Both; } + +bool +VidaliaSettings::skipVersionCheck() const +{ + return value(SETTING_SKIP_VERSION_CHECK).toBool(); +} diff --git a/src/vidalia/config/VidaliaSettings.h b/src/vidalia/config/VidaliaSettings.h index bb6f1a0..99dfec9 100644 --- a/src/vidalia/config/VidaliaSettings.h +++ b/src/vidalia/config/VidaliaSettings.h @@ -144,6 +144,9 @@ public: void setIconPref(const IconPosition iconPref); QString toString(const IconPosition iconPref); IconPosition fromString(QString iconPref); + + /** Returns true if Vidalia should skip the version check for tor */ + bool skipVersionCheck() const; }; #endif

1 0

[vidalia/alpha] Remember ports used when using automatic port selection
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 3ae5eb998eb5edb39ac15e9ce11d89d5d5f9e255 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 19:54:56 2012 -0300 Remember ports used when using automatic port selection Tries to use the remembered ports if restarting in auto configuration and it didn't failed last time. --- src/vidalia/MainWindow.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++- src/vidalia/MainWindow.h | 4 +++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 183e78f..28786fc 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -105,6 +105,8 @@ void qt_mac_set_dock_menu(QMenu *menu); MainWindow::MainWindow() : VidaliaWindow("MainWindow") { + _startedWithPrevious = false; + /* Create a new TorControl object, used to communicate with Tor */ _torControl = Vidalia::torControl(); @@ -592,8 +594,20 @@ MainWindow::start() if(settings.getControlMethod() == ControlMethod::Port) { if(settings.autoControlPort()) { - args << "ControlPort" << "auto"; - args << "SocksPort" << "auto"; + QString control_str = "auto"; + QString socks_str = "auto"; + + if(!_previousControlPort.isEmpty()) { + control_str = _previousControlPort; + _startedWithPrevious = true; + } + if(!_previousSocksPort.isEmpty()) { + socks_str = _previousSocksPort; + _startedWithPrevious = true; + } + + args << "ControlPort" << control_str; + args << "SocksPort" << socks_str; args << "ControlPortWriteToFile" << QString("%1/port.conf").arg(expDataDirectory); } else { /* Add the intended control port value */ @@ -806,6 +820,15 @@ MainWindow::startFailed(QString errmsg) * that Qt gives us in this instance is almost always "Unknown Error". That * will make users sad. */ Q_UNUSED(errmsg); + + if(_startedWithPrevious) { + _startedWithPrevious = false; + _previousControlPort = ""; + _previousSocksPort = ""; + vWarn("Retrying with new ports"); + start(); + return; + } updateTorStatus(Stopped); @@ -833,6 +856,29 @@ void MainWindow::connected() { authenticate(); + + TorSettings settings; + if(settings.autoControlPort()) { + // We want to remember the ports if it's on auto + QString control_str = "", socks_str = ""; + if(_torControl->getInfo("net/listeners/control", control_str)) { + QStringList control_parts = control_str.split(":"); + if(control_parts.size() > 1) + control_str = control_parts[1]; + } + if(_torControl->getInfo("net/listeners/socks", socks_str)) { + QStringList socks_parts = socks_str.split(":"); + if(socks_parts.size() > 1) + socks_str = socks_parts[1]; + } + + _previousControlPort = control_str; + _previousSocksPort = socks_str; + } else { + // Otherwise we want to clear the remembered ports + _previousControlPort = ""; + _previousSocksPort = ""; + } } /** Called when the connection to the control socket fails. The reason will be diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h index 834d6c1..444c434 100644 --- a/src/vidalia/MainWindow.h +++ b/src/vidalia/MainWindow.h @@ -302,6 +302,10 @@ private: PluginEngine *_engine; QStringList _tabMap; /**< Map to handle opened tabs */ QStringList _detachedTabMap; /**< Map to handle detached tabs */ + + bool _startedWithPrevious; /**< True if Vidalia tried to start Tor with the previous ports */ + QString _previousControlPort; /**< Holds the previous controlport used */ + QString _previousSocksPort; /**< Holds the previous socksport used */ }; #endif

1 0

[vidalia/alpha] Try removing the port.conf file before using auto as *Port
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit c0d83963263e00a8b166bdb406ac60592cab9e2e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 19:59:51 2012 -0300 Try removing the port.conf file before using auto as *Port --- src/vidalia/MainWindow.cpp | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 183e78f..493f29e 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -592,9 +592,13 @@ MainWindow::start() if(settings.getControlMethod() == ControlMethod::Port) { if(settings.autoControlPort()) { + QString portconf = QString("%1/port.conf").arg(expDataDirectory); + if(!QFile::remove(portconf)) + vWarn(QString("Unable to remove %s, may be it didn't existed.").arg(portconf)); + args << "ControlPort" << "auto"; args << "SocksPort" << "auto"; - args << "ControlPortWriteToFile" << QString("%1/port.conf").arg(expDataDirectory); + args << "ControlPortWriteToFile" << portconf; } else { /* Add the intended control port value */ quint16 controlPort = settings.getControlPort();

1 0

[vidalia/alpha] Remove HttpProxy setting
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 4bf8136d18a15f98019f76a8be67b2dd6a48023a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 19:34:56 2012 -0300 Remove HttpProxy setting --- src/vidalia/config/NetworkPage.cpp | 1 - src/vidalia/config/NetworkSettings.cpp | 12 ------------ src/vidalia/config/NetworkSettings.h | 5 ++--- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index b40cbdd..8bfabb3 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -310,7 +310,6 @@ NetworkPage::load() proxyType = NetworkSettings::NoProxy; ui.chkUseProxy->setChecked(false); } - ui.cmboProxyType->addItem(tr("HTTP"), NetworkSettings::HttpProxy); ui.cmboProxyType->addItem(tr("HTTP / HTTPS"), NetworkSettings::HttpHttpsProxy); diff --git a/src/vidalia/config/NetworkSettings.cpp b/src/vidalia/config/NetworkSettings.cpp index de818f4..0229442 100644 --- a/src/vidalia/config/NetworkSettings.cpp +++ b/src/vidalia/config/NetworkSettings.cpp @@ -26,8 +26,6 @@ #define SETTING_PROXY_PASSWORD "ProxyPassword" /* Tor's proxy options */ -#define SETTING_HTTP_PROXY "HttpProxy" -#define SETTING_HTTP_PROXY_AUTH "HttpProxyAuthenticator" #define SETTING_HTTPS_PROXY "HttpsProxy" #define SETTING_HTTPS_PROXY_AUTH "HttpsProxyAuthenticator" #define SETTING_SOCKS4_PROXY "Socks4Proxy" @@ -90,9 +88,6 @@ NetworkSettings::apply(QString *errmsg) case Socks5Proxy: socks5 = addr; break; - case HttpProxy: - http = addr; - break; case HttpHttpsProxy: http = addr; https = http; @@ -107,9 +102,7 @@ NetworkSettings::apply(QString *errmsg) conf.insert(SETTING_SOCKS5_PASSWORD, pass); } - conf.insert(SETTING_HTTP_PROXY, http); conf.insert(SETTING_HTTPS_PROXY, https); - conf.insert(SETTING_HTTP_PROXY_AUTH, auth); conf.insert(SETTING_HTTPS_PROXY_AUTH, auth); if (getUseBridges()) { @@ -305,9 +298,6 @@ NetworkSettings::proxyTypeToString(ProxyType type) case Socks5Proxy: ret = "socks5"; break; - case HttpProxy: - ret = "http"; - break; case HttpHttpsProxy: ret = "httphttps"; break; @@ -330,8 +320,6 @@ NetworkSettings::proxyTypeFromString(const QString &type) return Socks4Proxy; if (str == "socks5") return Socks5Proxy; - if (str == "http") - return HttpProxy; if (str == "httphttps") return HttpHttpsProxy; diff --git a/src/vidalia/config/NetworkSettings.h b/src/vidalia/config/NetworkSettings.h index fe555e3..aa5d88a 100644 --- a/src/vidalia/config/NetworkSettings.h +++ b/src/vidalia/config/NetworkSettings.h @@ -33,9 +33,8 @@ public: NoProxy = -1, /**< Have Tor connect directly to the Internet. */ Socks4Proxy = 0, /**< Use a SOCKS 4 proxy for OR connections. */ Socks5Proxy = 1, /**< Use a SOCKS 5 proxy for OR connections. */ - HttpProxy = 2, /**< Use an HTTP proxy for non-tunneled dir fetches. */ - HttpHttpsProxy = 3, /**< Use HTTP proxy for both dir and OR connections. */ - ProxyTypeMax = 3 + HttpHttpsProxy = 2, /**< Use HTTP proxy for both dir and OR connections. */ + ProxyTypeMax = 2 }; public:

1 0

[vidalia/alpha] Explicitly disable SocksPort auto
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 582d997044e43cc6b55e2ce8efa871284365f690 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 20:56:45 2012 -0300 Explicitly disable SocksPort auto --- src/vidalia/config/TorSettings.cpp | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp index 42e036f..57e2440 100644 --- a/src/vidalia/config/TorSettings.cpp +++ b/src/vidalia/config/TorSettings.cpp @@ -59,6 +59,7 @@ #define TOR_ARG_DATA_DIRECTORY "DataDirectory" #define TOR_ARG_HASHED_PASSWORD "HashedControlPassword" #define TOR_ARG_COOKIE_AUTH "CookieAuthentication" +#define TOR_ARG_SOCKSPORT "SocksPort" /** Generate random control passwords of 16 characters */ #define PASSWORD_LEN 16 @@ -105,6 +106,11 @@ TorSettings::apply(QString *errmsg) conf.insert(SETTING_CONTROL_PORT, localValue(SETTING_CONTROL_PORT).toString()); + + if(localValue(SETTING_AUTOCONTROL).toBool()) + conf.insert(TOR_ARG_SOCKSPORT, "auto"); + else + conf.insert(TOR_ARG_SOCKSPORT, "9050"); AuthenticationMethod authMethod = toAuthenticationMethod(localValue(SETTING_AUTH_METHOD).toString());

1 0

[vidalia/alpha] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit f927240cec068fb55e4d9ecce04438a2488377df Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 10:56:05 2012 -0300 Add a changes file --- changes/bug3064 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug3064 b/changes/bug3064 new file mode 100644 index 0000000..fbe362c --- /dev/null +++ b/changes/bug3064 @@ -0,0 +1,2 @@ + o Displays a warning to notify users that the passphrase will be + stored as plaintext. Fixes bug 3064. \ No newline at end of file

1 0

[vidalia/alpha] Adds a warning regarding plaintext storage of the passphrase
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 500b509451890d203c2dfb9252e4b08c05ebb968 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Jan 19 15:40:11 2012 -0300 Adds a warning regarding plaintext storage of the passphrase --- src/vidalia/config/AdvancedPage.cpp | 11 +++++++++++ src/vidalia/config/AdvancedPage.h | 3 +++ src/vidalia/config/AdvancedPage.ui | 14 ++++++++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp index b4e5827..ebee44f 100644 --- a/src/vidalia/config/AdvancedPage.cpp +++ b/src/vidalia/config/AdvancedPage.cpp @@ -60,6 +60,8 @@ AdvancedPage::AdvancedPage(QWidget *parent) this, SLOT(authMethodChanged(int))); connect(ui.chkRandomPassword, SIGNAL(toggled(bool)), ui.linePassword, SLOT(setDisabled(bool))); + connect(ui.chkRandomPassword, SIGNAL(toggled(bool)), + this, SLOT(displayWarning(bool))); connect(ui.btnEditTorConfig, SIGNAL(clicked()), this, SLOT(displayTorrcDialog())); connect(ui.rdoControlPort, SIGNAL(toggled(bool)), this, SLOT(toggleControl(bool))); @@ -257,6 +259,7 @@ AdvancedPage::authMethodChanged(int index) bool usePassword = (indexToAuthMethod(index) == TorSettings::PasswordAuth); ui.linePassword->setEnabled(usePassword && !ui.chkRandomPassword->isChecked()); ui.chkRandomPassword->setEnabled(usePassword); + ui.lblWarn->setVisible((ui.chkRandomPassword->checkState() == Qt::Unchecked) and usePassword); } /** Returns the authentication method for the given <b>index</b>. */ @@ -432,3 +435,11 @@ AdvancedPage::toggleAuto(bool) ui.label->setVisible(!ui.chkAuto->isChecked()); ui.lineControlPort->setVisible(!ui.chkAuto->isChecked()); } + +void +AdvancedPage::displayWarning(bool checked) +{ + ui.lblWarn->setVisible(!checked and + indexToAuthMethod(ui.cmbAuthMethod->currentIndex()) == + TorSettings::PasswordAuth); +} diff --git a/src/vidalia/config/AdvancedPage.h b/src/vidalia/config/AdvancedPage.h index 4510310..df2587f 100644 --- a/src/vidalia/config/AdvancedPage.h +++ b/src/vidalia/config/AdvancedPage.h @@ -78,6 +78,9 @@ private slots: /** Called when the user checks "Configure ControlPort automatically" */ void toggleAuto(bool); + /** Called when the user checks "Randomly Generate" checkbox */ + void displayWarning(bool); + private: /** Returns the authentication method for the given <b>index</b>. */ TorSettings::AuthenticationMethod indexToAuthMethod(int index); diff --git a/src/vidalia/config/AdvancedPage.ui b/src/vidalia/config/AdvancedPage.ui index 7776a18..664d322 100644 --- a/src/vidalia/config/AdvancedPage.ui +++ b/src/vidalia/config/AdvancedPage.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>578</width> - <height>543</height> + <width>586</width> + <height>522</height> </rect> </property> <property name="contextMenuPolicy"> @@ -249,6 +249,16 @@ </item> </layout> </item> + <item> + <widget class="QLabel" name="lblWarn"> + <property name="text"> + <string>WARNING: If you hand pick the password it will be saved as plain text in Vidalia's configuration file. Using a random password is safer.</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> </layout> </widget> </item>

1 0

[vidalia/alpha] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 40156d7345188d1c5aac5d866b41f10c945733a8 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 10:59:18 2012 -0300 Add a changes file --- changes/bug3146 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug3146 b/changes/bug3146 new file mode 100644 index 0000000..5efbf87 --- /dev/null +++ b/changes/bug3146 @@ -0,0 +1,2 @@ + o Add an option in the Tor menu to exit the application. Fixes bug + 3146. \ No newline at end of file

1 0