- tor-commits - lists.torproject.org

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

23 Jan '12

commit a5ecfd445ecc89dcd9dac5c8753558528b7e4531 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:47:12 2012 -0300 Add a changes file --- changes/bug4048 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug4048 b/changes/bug4048 new file mode 100644 index 0000000..d138eb2 --- /dev/null +++ b/changes/bug4048 @@ -0,0 +1,2 @@ + o Attempt to remove port.conf file before using it to avoid a race + condition between tor and Vidalia. Fixes bug 4048. \ No newline at end of file

1 0

[vidalia/alpha] Merge branch 'bug4048_unlinkportconf' into alpha
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 44260099f728d9c5503955d1de8244accc97e9b7 Merge: f3d84d5 a5ecfd4 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:47:50 2012 -0300 Merge branch 'bug4048_unlinkportconf' into alpha changes/bug4048 | 2 ++ src/vidalia/MainWindow.cpp | 6 +++++- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

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

23 Jan '12

commit 6d73fdedc9091ffafbd9b1c96b8736f5edbcd364 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:49:20 2012 -0300 Add a changes file --- changes/bug4598 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug4598 b/changes/bug4598 new file mode 100644 index 0000000..89daf1d --- /dev/null +++ b/changes/bug4598 @@ -0,0 +1,2 @@ + o Explicitly disable SocksPort auto by setting it to its default + (9050). Fixes bug 4598. \ No newline at end of file

1 0

[vidalia/alpha] Merge branch 'bug4598_disableauto' into alpha
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 5883f5d2e894af1b5dbfdbb3830c51645599850a Merge: 4426009 6d73fde Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:50:11 2012 -0300 Merge branch 'bug4598_disableauto' into alpha changes/bug4598 | 2 ++ src/vidalia/config/AdvancedPage.ui | 2 +- src/vidalia/config/TorSettings.cpp | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletions(-)

1 0

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

23 Jan '12

commit 97685a654d7fae7b848d022e445c223773f12e22 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 12:31:54 2012 -0300 Add a changes file --- changes/bug4031 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug4031 b/changes/bug4031 new file mode 100644 index 0000000..8c57fd2 --- /dev/null +++ b/changes/bug4031 @@ -0,0 +1,2 @@ + o Remember the previously used random socks/control ports so Firefox + keeps working after restarting tor. Fixes bug 4031. \ No newline at end of file

1 0

[vidalia/alpha] Merge branch 'bug4031_rememberports' into alpha
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit ed2887ee31d01abe91289206251b05ac1df00772 Merge: 5883f5d 97685a6 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 12:33:38 2012 -0300 Merge branch 'bug4031_rememberports' into alpha Conflicts: src/vidalia/MainWindow.cpp changes/bug4031 | 2 + src/vidalia/MainWindow.cpp | 52 +++++++++++++++++++++++++++++++++++++++++-- src/vidalia/MainWindow.h | 4 +++ 3 files changed, 55 insertions(+), 3 deletions(-) diff --cc src/vidalia/MainWindow.cpp index 03f62a4,28786fc..89387c0 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@@ -617,13 -594,21 +619,25 @@@ 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" << portconf; + 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 */ quint16 controlPort = settings.getControlPort(); @@@ -869,11 -856,29 +892,34 @@@ voi MainWindow::connected() { authenticate(); + if(!_torControl->isVidaliaRunningTor()) { + QString err; + if(!_torControl->takeOwnership(&err)) + vWarn(err); + } + + 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

1 0

[vidalia/alpha] Add the option to exit from the Tor menu
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 845efa0601837ea0915d8bd9e235e13a78268025 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Jan 19 16:04:17 2012 -0300 Add the option to exit from the Tor menu --- src/vidalia/MainWindow.cpp | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 183e78f..a78b5fe 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -193,6 +193,8 @@ MainWindow::createMenuBar() #if !defined(Q_WS_WIN) torMenu->addAction(_actionReloadConfig); #endif + torMenu->addSeparator(); + torMenu->addAction(_actionExit); QMenu *actionsMenu = menu->addMenu(tr("Actions")); actionsMenu->addAction(_actionNewIdentity);

1 0

[vidalia/alpha] Adds a tray icon notification for the clock skewed problem
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 51f6a7714958ca5d636e9ede9c84d6cebc5157e6 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Jan 19 15:43:35 2012 -0300 Adds a tray icon notification for the clock skewed problem --- src/vidalia/MainWindow.cpp | 23 +++++++++++++++++++++++ src/vidalia/MainWindow.h | 3 +++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 183e78f..09b70ac 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -264,6 +264,27 @@ MainWindow::createTrayMenu() return menu; } +/** Called when tor detects a problem with the system clock */ +void +MainWindow::clockSkewed(int skew, const QString &source) +{ + if (source.startsWith("OR:", Qt::CaseInsensitive)) { + // Tor versions 0.2.1.19 and earlier, and 0.2.2.1 and earlier, throw + // this message a little too liberally in this case. + quint32 torVersion = Vidalia::torControl()->getTorVersion(); + if (torVersion <= 0x00020113) + return; + QString str = Vidalia::torControl()->getTorVersionString(); + if (str.startsWith("0.2.2.") && torVersion <= 0x00020201) + return; + } + + _trayIcon.showMessage(tr("Your clock is wrong"), + tr("Your computer's clock is wrong, tor may not work as " + "expected. Please check the Message Log for more information.")); +} + + /** Creates a tray icon with a context menu and adds it to the system * notification area. On Mac, we also set up an application menubar. */ void @@ -385,6 +406,8 @@ MainWindow::createConnections() connect(_torControl, SIGNAL(authenticated()), this, SLOT(authenticated())); connect(_torControl, SIGNAL(authenticationFailed(QString)), this, SLOT(authenticationFailed(QString))); + connect(_torControl, SIGNAL(clockSkewed(int, QString)), + this, SLOT(clockSkewed(int, QString))); _torControl->setEvent(TorEvents::GeneralStatus); connect(_torControl, SIGNAL(dangerousTorVersion(tc::TorVersionStatus, diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h index 834d6c1..5ffa794 100644 --- a/src/vidalia/MainWindow.h +++ b/src/vidalia/MainWindow.h @@ -159,6 +159,9 @@ private slots: /** Called when trying to close a tab that has been detached */ void handleAttachedClose(); + /** Called when tor detects a problem with the system clock */ + void clockSkewed(int skew, const QString &source); + #if defined(USE_AUTOUPDATE) /** Called when the user clicks the 'Check Now' button in the General * settings page. */

1 0

[vidalia/alpha] Don't write torrc on SIGHUP if SAVECONF fails
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 31428474593d283d1da951f05b71a2b7cad7f035 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 12:37:27 2012 -0300 Don't write torrc on SIGHUP if SAVECONF fails --- src/torcontrol/TorControl.cpp | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index 5d31023..6908c61 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -914,7 +914,14 @@ bool TorControl::saveConf(QString *errmsg) { ControlCommand cmd("SAVECONF"); - return send(cmd, errmsg); + bool ret = send(cmd, errmsg); + + if(!ret) { + QString err; + setConf("__ReloadTorrcOnSIGHUP", "0", &err); + } + + return ret; } /** Tells Tor to reset the given configuration keys back to defaults. */

1 0

[vidalia/alpha] Takes ownership of the tor process it controls
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 44bf61439a737908292e7da8ee44cabb49cf7e09 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 12:03:53 2012 -0300 Takes ownership of the tor process it controls If Vidalia fails, tor won't be running in the background with a random hashed password. --- src/torcontrol/TorControl.cpp | 7 +++++++ src/torcontrol/TorControl.h | 3 +++ src/vidalia/MainWindow.cpp | 7 +++++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index 5d31023..081438d 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -1131,3 +1131,10 @@ TorControl::ipToCountry(const QHostAddress &ip, QString *errmsg) return QString(); } +/** Takes ownership of the tor process it's communicating to */ +bool +TorControl::takeOwnership(QString *errmsg) +{ + ControlCommand cmd("TAKEOWNERSHIP"); + return send(cmd, errmsg); +} diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h index f3504f5..c16758c 100644 --- a/src/torcontrol/TorControl.h +++ b/src/torcontrol/TorControl.h @@ -209,6 +209,9 @@ public: * it's not NULL. */ QString ipToCountry(const QHostAddress &ip, QString *errmsg = 0); + /** Takes ownership of the tor process it's communicating to */ + bool takeOwnership(QString *errmsg); + public slots: /** Closes the circuit specified by <b>circId</b>. If <b>ifUnused</b> is * true, then the circuit will not be closed unless it is unused. */ diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 183e78f..bbf1478 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -605,6 +605,8 @@ MainWindow::start() QString path = settings.getSocketPath(); args << "ControlSocket" << path; } + + args << "__OwningControllerProcess" << QString::number(QCoreApplication::applicationPid()); /* Add the control port authentication arguments */ switch (settings.getAuthenticationMethod()) { @@ -833,6 +835,11 @@ void MainWindow::connected() { authenticate(); + if(!_torControl->isVidaliaRunningTor()) { + QString err; + if(!_torControl->takeOwnership(&err)) + vWarn(err); + } } /** Called when the connection to the control socket fails. The reason will be

1 0