- tor-commits - lists.torproject.org

[vidalia/alpha] Add an autoconfiguration for ControlPort
by chiiph＠torproject.org 07 Sep '11

07 Sep '11

commit 438113de5bc9288fbaa25f5c11a8ba7af9d7f10f Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Wed Jun 29 16:02:37 2011 -0300 Add an autoconfiguration for ControlPort --- src/vidalia/MainWindow.cpp | 56 ++++++++++++++++++++++++++-------- src/vidalia/config/AdvancedPage.cpp | 12 +++++++ src/vidalia/config/AdvancedPage.h | 3 ++ src/vidalia/config/AdvancedPage.ui | 19 ++++++++---- src/vidalia/config/TorSettings.cpp | 14 +++++++++ src/vidalia/config/TorSettings.h | 7 ++++ 6 files changed, 92 insertions(+), 19 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 46cd0db..a6c9fa4 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -528,8 +528,8 @@ MainWindow::start() /* Check if Tor is already running separately */ if(settings.getControlMethod() == ControlMethod::Port) { - if (net_test_connect(settings.getControlAddress(), - settings.getControlPort())) { + if(!settings.autoControlPort() && net_test_connect(settings.getControlAddress(), + settings.getControlPort())) { started(); return; } @@ -562,14 +562,21 @@ MainWindow::start() /* Specify Tor's data directory, if different from the default */ QString dataDirectory = settings.getDataDirectory(); + QString expDataDirectory = expand_filename(dataDirectory); if (!dataDirectory.isEmpty()) - args << "DataDirectory" << expand_filename(dataDirectory); + args << "DataDirectory" << expDataDirectory; if(settings.getControlMethod() == ControlMethod::Port) { - /* Add the intended control port value */ - quint16 controlPort = settings.getControlPort(); - if (controlPort) - args << "ControlPort" << QString::number(controlPort); + if(settings.autoControlPort()) { + args << "ControlPort" << "auto"; + args << "SocksPort" << "auto"; + args << "ControlPortWriteToFile" << QString("%1/port.conf").arg(expDataDirectory); + } else { + /* Add the intended control port value */ + quint16 controlPort = settings.getControlPort(); + if (controlPort) + args << "ControlPort" << QString::number(controlPort); + } } else { QString path = settings.getSocketPath(); args << "ControlSocket" << path; @@ -622,12 +629,35 @@ MainWindow::started() _delayedShutdownStarted = false; /* Remember whether we started Tor or not */ _isVidaliaRunningTor = _torControl->isVidaliaRunningTor(); - /* Try to connect to Tor's control port */ - if(settings.getControlMethod() == ControlMethod::Port) - _torControl->connect(settings.getControlAddress(), - settings.getControlPort()); - else - _torControl->connect(settings.getSocketPath()); + + if(settings.autoControlPort()) { + QString dataDirectory = settings.getDataDirectory(); + QFile file(QString("%1/port.conf").arg(expand_filename(dataDirectory))); + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) + return; + + QTextStream in(&file); + if(!in.atEnd()) { + QString line = in.readLine(); + QStringList parts = line.split("="); + if(parts.size() != 2) return; + if(parts[0].trimmed() != "PORT") return; + + QStringList addrPort = parts[1].split(":"); + if(addrPort.size() != 2) return; + + QHostAddress addr(addrPort.at(0)); + quint16 port = addrPort.at(1).toInt(); + _torControl->connect(addr, port); + } + } else { + /* Try to connect to Tor's control port */ + if(settings.getControlMethod() == ControlMethod::Port) + _torControl->connect(settings.getControlAddress(), + settings.getControlPort()); + else + _torControl->connect(settings.getSocketPath()); + } setStartupProgress(STARTUP_PROGRESS_CONNECTING, tr("Connecting to Tor")); } diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp index a879ecc..4e7c3f6 100644 --- a/src/vidalia/config/AdvancedPage.cpp +++ b/src/vidalia/config/AdvancedPage.cpp @@ -64,6 +64,7 @@ AdvancedPage::AdvancedPage(QWidget *parent) this, SLOT(displayTorrcDialog())); connect(ui.rdoControlPort, SIGNAL(toggled(bool)), this, SLOT(toggleControl(bool))); connect(ui.btnBrowseSocketPath, SIGNAL(clicked()), this, SLOT(browseSocketPath())); + connect(ui.chkAuto, SIGNAL(toggled(bool)), this, SLOT(toggleAuto(bool))); /* Hide platform specific features */ #if defined(Q_WS_WIN) @@ -187,6 +188,7 @@ AdvancedPage::save(QString &errmsg) _settings->setControlAddress(controlAddress); _settings->setControlPort(ui.lineControlPort->text().toUShort()); _settings->setSocketPath(ui.lineSocketPath->text()); + _settings->setAutoControlPort(ui.chkAuto->isChecked()); _settings->setAuthenticationMethod(authMethod); _settings->setUseRandomPassword(ui.chkRandomPassword->isChecked()); @@ -212,6 +214,7 @@ AdvancedPage::load() ui.lineControlPort->setText(QString::number(_settings->getControlPort())); ui.lineTorConfig->setText(_settings->getTorrc()); ui.lineTorDataDirectory->setText(_settings->getDataDirectory()); + ui.chkAuto->setChecked(_settings->autoControlPort()); ui.cmbAuthMethod->setCurrentIndex( authMethodToIndex(_settings->getAuthenticationMethod())); @@ -402,3 +405,12 @@ AdvancedPage::toggleControl(bool) #endif } } + +void +AdvancedPage::toggleAuto(bool) +{ + ui.lblAddress->setEnabled(!ui.chkAuto->isChecked()); + ui.lineControlAddress->setEnabled(!ui.chkAuto->isChecked()); + ui.label->setEnabled(!ui.chkAuto->isChecked()); + ui.lineControlPort->setEnabled(!ui.chkAuto->isChecked()); +} diff --git a/src/vidalia/config/AdvancedPage.h b/src/vidalia/config/AdvancedPage.h index 4ba26cc..4510310 100644 --- a/src/vidalia/config/AdvancedPage.h +++ b/src/vidalia/config/AdvancedPage.h @@ -75,6 +75,9 @@ private slots: * a more advanced way */ void displayTorrcDialog(); + /** Called when the user checks "Configure ControlPort automatically" */ + void toggleAuto(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 ed17c1d..3600cbc 100644 --- a/src/vidalia/config/AdvancedPage.ui +++ b/src/vidalia/config/AdvancedPage.ui @@ -37,7 +37,7 @@ <property name="verticalSpacing"> <number>5</number> </property> - <item row="5" column="0"> + <item row="6" column="0"> <widget class="QLabel" name="lblAuth"> <property name="text"> <string>Authentication:</string> @@ -57,7 +57,7 @@ </property> </widget> </item> - <item row="5" column="2" colspan="3"> + <item row="6" column="2" colspan="3"> <layout class="QHBoxLayout"> <property name="spacing"> <number>2</number> @@ -197,7 +197,7 @@ </property> </widget> </item> - <item row="4" column="0"> + <item row="5" column="0"> <widget class="QLabel" name="lblPath"> <property name="enabled"> <bool>false</bool> @@ -210,14 +210,14 @@ </property> </widget> </item> - <item row="4" column="1" colspan="2"> + <item row="5" column="1" colspan="2"> <widget class="QLineEdit" name="lineSocketPath"> <property name="enabled"> <bool>false</bool> </property> </widget> </item> - <item row="3" column="2"> + <item row="4" column="2"> <widget class="QRadioButton" name="rdoControlSocket"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> @@ -230,7 +230,7 @@ </property> </widget> </item> - <item row="4" column="3"> + <item row="5" column="3"> <widget class="QPushButton" name="btnBrowseSocketPath"> <property name="enabled"> <bool>false</bool> @@ -240,6 +240,13 @@ </property> </widget> </item> + <item row="3" column="2"> + <widget class="QCheckBox" name="chkAuto"> + <property name="text"> + <string>Configure ControlPort automatically</string> + </property> + </widget> + </item> </layout> </item> </layout> diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp index b05b428..42e036f 100644 --- a/src/vidalia/config/TorSettings.cpp +++ b/src/vidalia/config/TorSettings.cpp @@ -44,6 +44,7 @@ #define SETTING_REJECT_PLAINTEXT_PORTS "RejectPlaintextPorts" #define SETTING_BOOTSTRAP "Bootstrap" #define SETTING_BOOTSTRAP_FROM "BootstrapFrom" +#define SETTING_AUTOCONTROL "AutoControl" /** Default to using hashed password authentication */ #define DEFAULT_AUTH_METHOD PasswordAuth @@ -92,6 +93,7 @@ TorSettings::TorSettings(TorControl *torControl) setDefault(SETTING_REJECT_PLAINTEXT_PORTS, QList<QVariant>()); setDefault(SETTING_BOOTSTRAP, false); setDefault(SETTING_BOOTSTRAP_FROM, ""); + setDefault(SETTING_AUTOCONTROL, true); } /** Applies any changes to Tor's control port or authentication settings. */ @@ -450,3 +452,15 @@ TorSettings::bootstrapFrom() const { return QDir::convertSeparators(value(SETTING_BOOTSTRAP_FROM).toString()); } + +bool +TorSettings::autoControlPort() const +{ + return value(SETTING_AUTOCONTROL).toBool(); +} + +void +TorSettings::setAutoControlPort(const bool autoControl) +{ + setValue(SETTING_AUTOCONTROL, autoControl); +} diff --git a/src/vidalia/config/TorSettings.h b/src/vidalia/config/TorSettings.h index a4f8ec9..5038c3d 100644 --- a/src/vidalia/config/TorSettings.h +++ b/src/vidalia/config/TorSettings.h @@ -72,6 +72,13 @@ public: /** Get the current control method */ ControlMethod::Method getControlMethod() const; + /** Returns true if Vidalia will get the ControlPort automatically from + * Tor */ + bool autoControlPort() const; + + /** Sets whether Vidalia should get the ControlPort from Tor */ + void setAutoControlPort(const bool auto); + /** Set the control method */ void setControlMethod(ControlMethod::Method method);

1 0

[vidalia/alpha] Improve how the advance settings behave with the autoport
by chiiph＠torproject.org 07 Sep '11

07 Sep '11

commit bd5b133def31530861d1bf0aa908b2c7ffced011 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Thu Jul 28 14:12:03 2011 -0300 Improve how the advance settings behave with the autoport Tries to avoid confusion by just not displaying what host and port is being used, so that it's completely transparent to the user. --- src/vidalia/config/AdvancedPage.cpp | 16 ++++++++++------ src/vidalia/config/AdvancedPage.ui | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp index 4e7c3f6..12842bc 100644 --- a/src/vidalia/config/AdvancedPage.cpp +++ b/src/vidalia/config/AdvancedPage.cpp @@ -185,8 +185,10 @@ AdvancedPage::save(QString &errmsg) _settings->setDataDirectory(dataDir); } - _settings->setControlAddress(controlAddress); - _settings->setControlPort(ui.lineControlPort->text().toUShort()); + if(!ui.chkAuto->isChecked()) { + _settings->setControlAddress(controlAddress); + _settings->setControlPort(ui.lineControlPort->text().toUShort()); + } _settings->setSocketPath(ui.lineSocketPath->text()); _settings->setAutoControlPort(ui.chkAuto->isChecked()); @@ -394,6 +396,7 @@ AdvancedPage::toggleControl(bool) ui.lblPath->setEnabled(false); ui.lineSocketPath->setEnabled(false); ui.btnBrowseSocketPath->setEnabled(false); + ui.chkAuto->setEnabled(true); } else { #if !defined(Q_OS_WIN32) ui.lblAddress->setEnabled(false); @@ -402,6 +405,7 @@ AdvancedPage::toggleControl(bool) ui.lblPath->setEnabled(true); ui.lineSocketPath->setEnabled(true); ui.btnBrowseSocketPath->setEnabled(true); + ui.chkAuto->setEnabled(false); #endif } } @@ -409,8 +413,8 @@ AdvancedPage::toggleControl(bool) void AdvancedPage::toggleAuto(bool) { - ui.lblAddress->setEnabled(!ui.chkAuto->isChecked()); - ui.lineControlAddress->setEnabled(!ui.chkAuto->isChecked()); - ui.label->setEnabled(!ui.chkAuto->isChecked()); - ui.lineControlPort->setEnabled(!ui.chkAuto->isChecked()); + ui.lblAddress->setVisible(!ui.chkAuto->isChecked()); + ui.lineControlAddress->setVisible(!ui.chkAuto->isChecked()); + ui.label->setVisible(!ui.chkAuto->isChecked()); + ui.lineControlPort->setVisible(!ui.chkAuto->isChecked()); } diff --git a/src/vidalia/config/AdvancedPage.ui b/src/vidalia/config/AdvancedPage.ui index 3600cbc..7776a18 100644 --- a/src/vidalia/config/AdvancedPage.ui +++ b/src/vidalia/config/AdvancedPage.ui @@ -240,7 +240,7 @@ </property> </widget> </item> - <item row="3" column="2"> + <item row="2" column="2"> <widget class="QCheckBox" name="chkAuto"> <property name="text"> <string>Configure ControlPort automatically</string>

1 0

[vidalia/alpha] Make Vidalia try 5 times before failing to autoconfigure
by chiiph＠torproject.org 07 Sep '11

07 Sep '11

commit 7025470cc2fb1b9a5262d26d7d29565c448f2c4e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Aug 23 13:58:03 2011 -0300 Make Vidalia try 5 times before failing to autoconfigure --- src/vidalia/MainWindow.cpp | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index a6c9fa4..37eca8c 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -596,6 +596,7 @@ MainWindow::start() } args << "HashedControlPassword" << TorSettings::hashPassword(_controlPassword); + break; case TorSettings::CookieAuth: args << "CookieAuthentication" << "1"; @@ -633,8 +634,20 @@ MainWindow::started() if(settings.autoControlPort()) { QString dataDirectory = settings.getDataDirectory(); QFile file(QString("%1/port.conf").arg(expand_filename(dataDirectory))); - if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) + int tries = 0, maxtries = 5; + while((!file.open(QIODevice::ReadOnly | QIODevice::Text)) and + (tries++ < maxtries)) { + vWarn(QString("This is try number: %1.").arg(tries)); + sleep(1); + } + + if(tries >= maxtries) { + vWarn("Couldn't read port.conf file"); + connectFailed(QString("Vidalia can't find out how to talk to Tor because it can't access this file: %1\n\nHere's the last error message:\n %2") + .arg(file.fileName()) + .arg(file.errorString())); return; + } QTextStream in(&file); if(!in.atEnd()) { @@ -650,6 +663,8 @@ MainWindow::started() quint16 port = addrPort.at(1).toInt(); _torControl->connect(addr, port); } + + file.close(); } else { /* Try to connect to Tor's control port */ if(settings.getControlMethod() == ControlMethod::Port) @@ -1220,6 +1235,10 @@ MainWindow::authenticate() TorSettings settings; _controlPassword = settings.getControlPassword(); } + + qputenv("TOR_CONTROL_PASSWD", + _controlPassword.toAscii().toHex()); + return _torControl->authenticate(_controlPassword); } /* No authentication. Send an empty password. */

1 0

[vidalia/alpha] Add more checks for the autoconfiguration
by chiiph＠torproject.org 07 Sep '11

07 Sep '11

commit 05681ccbd647d2e92143f19f747c39358e5c7d9a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Sep 1 19:24:47 2011 -0300 Add more checks for the autoconfiguration --- src/vidalia/MainWindow.cpp | 20 +++++++++++++++++--- src/vidalia/config/AdvancedPage.cpp | 15 ++++++++++++++- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 37eca8c..8dbf8ae 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -526,6 +526,15 @@ MainWindow::start() updateTorStatus(Starting); + // Disable autoconfiguration if there are missing config data + if(settings.autoControlPort()) { + if(settings.getDataDirectory().isEmpty()) { + vWarn("Disabling ControlPort autoconfiguration. DataDirectory is empty!"); + settings.setAutoControlPort(false); + } + } + + /* Check if Tor is already running separately */ if(settings.getControlMethod() == ControlMethod::Port) { if(!settings.autoControlPort() && net_test_connect(settings.getControlAddress(), @@ -643,9 +652,14 @@ MainWindow::started() if(tries >= maxtries) { vWarn("Couldn't read port.conf file"); - connectFailed(QString("Vidalia can't find out how to talk to Tor because it can't access this file: %1\n\nHere's the last error message:\n %2") - .arg(file.fileName()) - .arg(file.errorString())); + if(_torControl->isRunning()) { + connectFailed(tr("Vidalia can't find out how to talk to Tor because it can't access this file: %1\n\nHere's the last error message:\n%2") + .arg(file.fileName()) + .arg(file.errorString())); + } else { + vWarn("Tor isn't running!"); + connectFailed(tr("It seems Tor has stopped running since Vidalia started it.\n\nSee the Advanced Message Log for more information.")); + } return; } diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp index 12842bc..0f532e7 100644 --- a/src/vidalia/config/AdvancedPage.cpp +++ b/src/vidalia/config/AdvancedPage.cpp @@ -121,6 +121,16 @@ AdvancedPage::save(QString &errmsg) QHostAddress controlAddress(ui.lineControlAddress->text()); QString path(ui.lineSocketPath->text()); + if(ui.chkAuto->isChecked()) { + if(ui.lineTorDataDirectory->text().isEmpty()) { + errmsg = tr("You've checked the autoconfiguration option for the ControlPort, but" + " provided no Data Directory. Please add one, or uncheck the" + " \"Configure ControlPort automatically\" option."); + return false; + } + _settings->setAutoControlPort(true); + } + /* Validate the control settings */ if(ui.rdoControlPort->isChecked()) { if (controlAddress.isNull()) { @@ -190,7 +200,6 @@ AdvancedPage::save(QString &errmsg) _settings->setControlPort(ui.lineControlPort->text().toUShort()); } _settings->setSocketPath(ui.lineSocketPath->text()); - _settings->setAutoControlPort(ui.chkAuto->isChecked()); _settings->setAuthenticationMethod(authMethod); _settings->setUseRandomPassword(ui.chkRandomPassword->isChecked()); @@ -233,6 +242,10 @@ AdvancedPage::load() ui.chkUseService->setChecked(s.isInstalled()); #endif #endif + if(Vidalia::torControl()->getTorVersion() < 0x2021a) { // 0x2021a == 0.2.2.26 + ui.chkAuto->setChecked(false); + ui.chkAuto->setVisible(false); + } } /** Called when the user selects a different authentication method from the

1 0

[vidalia/alpha] We need to destroy the _engine before exiting
by chiiph＠torproject.org 07 Sep '11

07 Sep '11

commit 770ba619fad7c10f1d20da783df8f41e9bae08cc Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Sep 1 19:55:16 2011 -0300 We need to destroy the _engine before exiting --- src/vidalia/main.cpp | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/vidalia/main.cpp b/src/vidalia/main.cpp index 7e9ad28..cf87c84 100644 --- a/src/vidalia/main.cpp +++ b/src/vidalia/main.cpp @@ -204,11 +204,13 @@ main(int argc, char *argv[]) Vidalia::setQuitOnLastWindowClosed(false); /* Create an instance of the main window */ - MainWindow mainWin; + MainWindow *mainWin = new MainWindow(); /* Run Vidalia */ int ret = vidalia.run(); + delete mainWin;; + /* Vidalia exited, so cleanup our pidfile and return */ QFile::remove(pidfile); vNotice("Vidalia is exiting cleanly (return code %1).").arg(ret);

1 0

[vidalia/alpha] Merge branch 'bug3077_auto' into alpha
by chiiph＠torproject.org 07 Sep '11

07 Sep '11

commit 4393ba15d9f15459ba9d9b44f03bbb6de1caf360 Merge: 770ba61 05681cc Author: Tomás Touceda <chiiph(a)torproject.org> Date: Wed Sep 7 10:39:52 2011 -0300 Merge branch 'bug3077_auto' into alpha src/vidalia/MainWindow.cpp | 89 +++++++++++++++++++++++++++++----- src/vidalia/config/AdvancedPage.cpp | 33 ++++++++++++- src/vidalia/config/AdvancedPage.h | 3 + src/vidalia/config/AdvancedPage.ui | 19 +++++-- src/vidalia/config/TorSettings.cpp | 14 ++++++ src/vidalia/config/TorSettings.h | 7 +++ 6 files changed, 144 insertions(+), 21 deletions(-)

1 0

[metrics-web/master] Cut off current day of most graphs.
by karsten＠torproject.org 07 Sep '11

07 Sep '11

commit d07c2e3db5847718bb008e9b564667b5df4523ee Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 7 14:09:26 2011 +0200 Cut off current day of most graphs. Most graphs are based on daily averages. It's quite possible that the first half of a day has a different average than the whole day. In order to not confuse viewers, let's cut off the current day and only graph complete days in most graphs. --- rserve/graphs.R | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 5a89c96..959fd64 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -269,7 +269,8 @@ plot_networksize <- function(start, end, path, dpi) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, avg_running AS relays FROM network_size ", - "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, + "' AND date < (SELECT MAX(date) FROM network_size)", sep = "") rs <- dbSendQuery(con, q) relays <- fetch(rs, n = -1) q <- paste("SELECT date, avg_running AS bridges ", @@ -360,7 +361,8 @@ plot_versions <- function(start, end, path, dpi) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, version, relays FROM relay_versions ", - "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, + "' AND date < (SELECT MAX(date) FROM relay_versions)", sep = "") rs <- dbSendQuery(con, q) versions <- fetch(rs, n = -1) dbDisconnect(con) @@ -396,7 +398,8 @@ plot_platforms <- function(start, end, path, dpi) { con <- dbConnect(drv, user=dbuser, password=dbpassword, dbname=db) q <- paste("SELECT date, avg_linux, avg_darwin, avg_bsd, avg_windows, ", "avg_other FROM relay_platforms WHERE date >= '", start, - "' AND date <= '", end, "'", sep = "") + "' AND date <= '", end, + "' AND date < (SELECT MAX(date) FROM relay_platforms)", sep = "") rs <- dbSendQuery(con, q) platforms <- fetch(rs, n = -1) dbDisconnect(con) @@ -545,7 +548,8 @@ plot_relayflags <- function(start, end, flags, granularity, path, dpi) { if (granularity == 'day') { columns <- paste("avg_", tolower(flags), sep = "", collapse = ", ") q <- paste("SELECT date, ", columns, " FROM network_size ", - "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, + "' AND date < (SELECT MAX(date) FROM network_size)", sep = "") rs <- dbSendQuery(con, q) networksize <- fetch(rs, n = -1) dbDisconnect(con) @@ -667,7 +671,7 @@ plot_bridge_users <- function(start, end, country, path, dpi) { con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, users FROM bridge_stats ", "WHERE date >= '", start, "' AND date <= '", end, "' ", - "AND date < (SELECT MAX(date) FROM bridge_stats) ", + "AND date < (SELECT MAX(date) FROM bridge_stats) - 1", " AND country = '", ifelse(country == "all", "zy", country), "'", sep = "") rs <- dbSendQuery(con, q) @@ -707,7 +711,9 @@ plot_gettor <- function(start, end, bundle, path, dpi) { paste("LIKE 'tor-%browser-bundle_", tolower(bundle), "'", sep = "")) q <- paste("SELECT date, SUM(downloads) AS downloads ", "FROM gettor_stats WHERE bundle ", condition, " AND date >= '", - start, "' AND date <= '", end, "' GROUP BY date", sep = "") + start, "' AND date <= '", end, + "' AND date < (SELECT MAX(date) FROM gettor_stats) GROUP BY date", + sep = "") rs <- dbSendQuery(con, q) downloads <- fetch(rs, n = -1) dbDisconnect(con) @@ -743,7 +749,8 @@ plot_torperf <- function(start, end, source, filesize, path, dpi) { con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, q1, md, q3 FROM torperf_stats ", "WHERE source = '", paste(source, filesize, sep = "-"), - "' AND date >= '", start, "' AND date <= '", end, "'", sep = "") + "' AND date >= '", start, "' AND date <= '", end, + "' AND date < (SELECT MAX(date) FROM torperf_stats)", sep = "") rs <- dbSendQuery(con, q) torperf <- fetch(rs, n = -1) dbDisconnect(con) @@ -793,7 +800,8 @@ plot_torperf_failures <- function(start, end, source, filesize, path, q <- paste("SELECT date, timeouts, failures, requests ", "FROM torperf_stats WHERE source = '", paste(source, filesize, sep = "-"), - "' AND date >= '", start, "' AND date <= '", end, "'", sep = "") + "' AND date >= '", start, "' AND date <= '", end, + "' AND date < (SELECT MAX(date) FROM torperf_stats)", sep = "") rs <- dbSendQuery(con, q) torperf <- fetch(rs, n = -1) dbDisconnect(con) @@ -845,7 +853,8 @@ plot_connbidirect <- function(start, end, path, dpi) { con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT DATE(statsend) AS date, readnum, writenum, bothnum ", "FROM connbidirect WHERE DATE(statsend) >= '", start, - "' AND DATE(statsend) <= '", end, "'", sep = "") + "' AND DATE(statsend) <= '", end, "' AND DATE(statsend) < ", + "(SELECT MAX(DATE(statsend)) FROM connbidirect)", sep = "") rs <- dbSendQuery(con, q) c <- fetch(rs, n = -1) dbDisconnect(con)

1 0

[metrics-web/master] Update sitemap on error page.
by karsten＠torproject.org 07 Sep '11

07 Sep '11

commit 7ca14e45a490a3f1eda4c88b2f06a2c918875953 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 7 10:12:14 2011 +0200 Update sitemap on error page. --- web/WEB-INF/error.jsp | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/WEB-INF/error.jsp b/web/WEB-INF/error.jsp index 5737dc3..71544bb 100644 --- a/web/WEB-INF/error.jsp +++ b/web/WEB-INF/error.jsp @@ -52,10 +52,12 @@ Maybe you find what you're looking for on our sitemap: <ul> <li><a href="papers.html">Papers</a></li> <li><a href="data.html">Data</a></li> +<li><a href="formats.html">Formats</a></li> <li><a href="tools.html">Tools</a></li> </ul></li> <li><a href="status.html">Status</a> <ul> +<li><a href="networkstatus.html">Network Status</a></li> <li><a href="exonerator.html">ExoneraTor</a></li> <li><a href="relay-search.html">Relay Search</a></li> <li><a href="consensus-health.html">Consensus Health</a></li>

1 0

[metrics-web/master] Add new dirreq-stats.csv to help diagnose #3338.
by karsten＠torproject.org 07 Sep '11

07 Sep '11

commit 7de39e7d138ac25851bdf1e74b4e83ffb7f85f39 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 7 08:27:57 2011 +0200 Add new dirreq-stats.csv to help diagnose #3338. --- rserve/csv.R | 21 +++++++++++++++++++++ src/org/torproject/ernie/web/CsvServlet.java | 1 + 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/rserve/csv.R b/rserve/csv.R index 17a59c2..5693413 100644 --- a/rserve/csv.R +++ b/rserve/csv.R @@ -305,3 +305,24 @@ export_relays_monthly_snapshots <- function(path) { quote = FALSE, row.names = FALSE) } +export_dirreq_stats <- function(path) { + drv <- dbDriver("PostgreSQL") + con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) + q <- paste("SELECT date, r, bwp, brp, bwn, brn, bwr, brr ", + "FROM user_stats ", + "WHERE date < (SELECT MAX(date) FROM user_stats) - 1 ", + "AND country = 'zy' ORDER BY date", sep = "") + rs <- dbSendQuery(con, q) + u <- fetch(rs, n = -1) + dbDisconnect(con) + dbUnloadDriver(drv) + u <- data.frame(date = u$date, + requests = u$r, + fraction = (u$bwr * u$brn / u$bwn - u$brr) / + (u$bwp * u$brn / u$bwn - u$brp), + users = u$r * (u$bwp * u$brn / u$bwn - u$brp) / + (u$bwr * u$brn / u$bwn - u$brr) / 10) + write.csv(format(u, trim = TRUE, scientific = FALSE), path, + quote = FALSE, row.names = FALSE) +} + diff --git a/src/org/torproject/ernie/web/CsvServlet.java b/src/org/torproject/ernie/web/CsvServlet.java index 0140fa9..99dc63c 100644 --- a/src/org/torproject/ernie/web/CsvServlet.java +++ b/src/org/torproject/ernie/web/CsvServlet.java @@ -35,6 +35,7 @@ public class CsvServlet extends HttpServlet { this.availableCsvFiles.add("connbidirect"); this.availableCsvFiles.add("current-platform-strings"); this.availableCsvFiles.add("direct-users"); + this.availableCsvFiles.add("dirreq-stats"); this.availableCsvFiles.add("dirbytes"); this.availableCsvFiles.add("gettor"); this.availableCsvFiles.add("monthly-users-average");

1 0

[torbutton/master] Bug #3933: Don't touch app.update.auto in TBB
by mikeperry＠torproject.org 07 Sep '11

07 Sep '11

commit e495cc8de58c18f3d17b83d068689d40c65bd807 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Sep 6 20:56:50 2011 -0700 Bug #3933: Don't touch app.update.auto in TBB TBB must not autoupdate via Mozilla. Regression was caused by the initial toggle fix in #2338. --- src/chrome/content/torbutton.js | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5378467..b6f7f3b 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1655,10 +1655,13 @@ function torbutton_update_status(mode, force_update) { } else { torbutton_setBoolPref("extensions.update.enabled", "extension_update", true, mode, changed); - torbutton_setBoolPref("app.update.enabled", "app_update", + // In TBB, do not touch these two. They must remain off. + if (!m_tb_tbb) { + torbutton_setBoolPref("app.update.enabled", "app_update", true, mode, changed); - torbutton_setBoolPref("app.update.auto", "auto_update", + torbutton_setBoolPref("app.update.auto", "auto_update", true, mode, changed); + } torbutton_setBoolPref("browser.search.update", "search_update", true, mode, changed); }

1 0