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

[ooni-probe/master] Add a list of things TODO
by art＠torproject.org 08 Mar '12

08 Mar '12

commit 70def2b8642b3b0f2c9a697f5bcadf7e99a18981 Author: Arturo Filastò <hellais(a)gmail.com> Date: Wed Mar 7 21:04:02 2012 -0800 Add a list of things TODO --- TODO | 40 ++++++++++++++++++++++++++++++++++++++++ plugoo/__init__.py | 27 +++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 0 deletions(-) diff --git a/TODO b/TODO new file mode 100644 index 0000000..803ee5b --- /dev/null +++ b/TODO @@ -0,0 +1,40 @@ +This is a list of things to be done on ooni-probe. + +Once you have completed something you should add a +note to this file stating what you have done under +the item. + +Migrate code from old +--------------------- + +Migrate all the interesting parts of the old code to the new. + +It's important to make the new code asych and based on gevent. +It should respect the design goals of the new ooni-probe model. + +* All the parts related to HTTP and Squid (old/ooni/http.py) +effort: low, skill: medium + +* All the captive portal detection tests (old/ooni/http.py + and old/ooni/dnsooni.py) +effort: low, skill: low + +* All the DNS censorship detection tests (old/ooni/dnsooni.py) +effort: medium, skill: medium + +* Misc scripts to detect censorship that are not written in any + version of OONI. +effort: low-medium, skill: low-medium + +New things to develop +--------------------- + +These are either components specific to the new refactor of ooni +or that we haven't yet figured out how they should work. + +* Design and implement the Worker and the Unit of Work classes + +* Design and implement the Node Factory + +* Design and implement the Network Node and the Code Exec node classes + diff --git a/plugoo/__init__.py b/plugoo/__init__.py index 1bd4446..384c128 100644 --- a/plugoo/__init__.py +++ b/plugoo/__init__.py @@ -27,6 +27,33 @@ import logging import itertools import gevent +def gen_headers(self, options="common"): + """ + Returns a set of headers to be used when generating + HTTP requests. + + :options specify what rules should be used for + generating the headers. + "common": choose a very common header set (default) + "random": make the headers random + """ + if options == "common": + headers = [('Accept', 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'), + ('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.3'), + ('Accept-Encoding', 'gzip,deflate,sdch'), + ('Accept-Language', 'en,en-US;q=0.8,it;q=0.6'), + ('Cache-Control', 'max-age=0') + ('User-Agent', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11')] + elif options == "random": + # XXX not implemented + return False + else: + print "Error, unrecognized header generation options.." + return False + + return headers + + class torify(object): """This is the torify decorator. It should be used to decorate functions that should use to for connecting to

1 0

[bridgedb/master] 5258 - make SMTP server configurable
by arma＠torproject.org 08 Mar '12

08 Mar '12

commit 1b1cc25325eca7aa3095889c21f6289b39acd757 Author: aagbsn <aagbsn(a)extc.org> Date: Tue Feb 28 05:57:43 2012 -0800 5258 - make SMTP server configurable --- bridgedb.conf | 2 ++ lib/bridgedb/Main.py | 2 ++ lib/bridgedb/Server.py | 5 ++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index e5d7314..5d5dbad 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -102,6 +102,8 @@ EMAIL_SHARE=10 # the MAIL FROM header in outgoing SMTP. EMAIL_FROM_ADDR = "bridges(a)torproject.org" EMAIL_SMTP_FROM_ADDR = "bridges(a)torproject.org" +EMAIL_SMTP_HOST = "127.0.0.1" +EMAIL_SMTP_PORT = 25 # Reject any RCPT TO lines that aren't to this user. EMAIL_USERNAME = "bridges" diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 55f2956..648accd 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -94,6 +94,8 @@ CONFIG = Conf( EMAIL_PORT=6725, EMAIL_N_BRIDGES_PER_ANSWER=2, EMAIL_INCLUDE_FINGERPRINTS = False, + EMAIL_SMTP_HOST="127.0.0.1", + EMAIL_SMTP_PORT=25, RESERVED_SHARE=2, diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py index 57f49a1..a1b837a 100644 --- a/lib/bridgedb/Server.py +++ b/lib/bridgedb/Server.py @@ -514,9 +514,8 @@ class MailContext: # Reject any mail longer than this. self.maximumSize = 32*1024 # Use this server for outgoing mail. -# self.smtpServer = "127.0.0.1" # XXX should make configurable - self.smtpServer = "172.22.121.1" - self.smtpPort = 25 + self.smtpServer = (cfg.EMAIL_SMTP_HOST or "127.0.0.1") + self.smtpPort = (cfg.EMAIL_SMTP_PORT or 25) # Use this address in the MAIL FROM line for outgoing mail. self.smtpFromAddr = (cfg.EMAIL_SMTP_FROM_ADDR or "bridges(a)torproject.org")

1 0

[tor/master] Remove misleading function comment (bug 5324)
by arma＠torproject.org 08 Mar '12

08 Mar '12

commit b5a8c3aa00e4acca031ada547a2ac716217832b3 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Mar 7 21:07:30 2012 -0500 Remove misleading function comment (bug 5324) In the distant past, connection_handle_read() could be called when there are pending bytes in the TLS object during the main loop. The design since then has been to always read all pending bytes immediately, so read events only trigger when the socket actually has bytes to read. Resolves bug 5324. --- src/or/connection.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 06a7562..cbc6091 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2595,10 +2595,6 @@ connection_consider_empty_read_buckets(connection_t *conn) /** Read bytes from conn-\>s and process them. * - * This function gets called from conn_read() in main.c, either - * when poll() has declared that conn wants to read, or (for OR conns) - * when there are pending TLS bytes. - * * It calls connection_read_to_buf() to bring in any new bytes, * and then calls connection_process_inbuf() to process them. *

1 0

[vidalia/alpha] Add accounting options to ServerPage and ServerSettings
by chiiph＠torproject.org 07 Mar '12

07 Mar '12

commit ae18cd4f362b5a215ef76f8e8953552cdc5bde35 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Wed Mar 7 16:44:23 2012 -0300 Add accounting options to ServerPage and ServerSettings --- changes/bug2944 | 2 + src/vidalia/config/ServerPage.cpp | 69 ++++++++ src/vidalia/config/ServerPage.h | 5 + src/vidalia/config/ServerPage.ui | 281 ++++++++++++++++++++++++++++----- src/vidalia/config/ServerSettings.cpp | 108 +++++++++++++- src/vidalia/config/ServerSettings.h | 20 +++ 6 files changed, 445 insertions(+), 40 deletions(-) diff --git a/changes/bug2944 b/changes/bug2944 new file mode 100644 index 0000000..968befb --- /dev/null +++ b/changes/bug2944 @@ -0,0 +1,2 @@ + o Add accounting options to the relay configuration panel. Fixes bug + 2944. \ No newline at end of file diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp index 51514ca..eb23c0b 100644 --- a/src/vidalia/config/ServerPage.cpp +++ b/src/vidalia/config/ServerPage.cpp @@ -106,6 +106,11 @@ ServerPage::ServerPage(QWidget *parent) connect(ui.lblWhatsThis, SIGNAL(linkActivated(QString)), this, SLOT(linkActivated(QString))); + connect(ui.chkAccounting, SIGNAL(stateChanged(int)), + this, SLOT(toggleAccounting(int))); + connect(ui.cmbTime, SIGNAL(currentIndexChanged(const QString &)), + this, SLOT(toggleDisplayDay(const QString &))); + /* Set validators for address, mask and various port number fields */ ui.lineServerNickname->setValidator(new NicknameValidator(this)); ui.lineServerPort->setValidator(new QIntValidator(1, 65535, this)); @@ -338,6 +343,16 @@ ServerPage::save(QString &errmsg) saveBandwidthLimits(); saveExitPolicies(); + if(ui.chkAccounting->checkState() != Qt::Checked) + _settings->disableAccounting(); + else { + _settings->setAccountingMax(ui.spnAmount->value(), + ui.cmbUnit->currentText()); + _settings->setAccountingStart(ui.cmbTime->currentText(), + ui.spnDay->value(), + ui.spnTime->text()); + } + #if defined(USE_MINIUPNPC) _settings->setUpnpEnabled(ui.chkEnableUpnp->isChecked()); #endif @@ -377,6 +392,19 @@ ServerPage::load() loadExitPolicies(); loadBridgeIdentity(); + ui.chkAccounting->setCheckState(Qt::Unchecked); + toggleAccounting(Qt::Unchecked); + + if(_settings->isAccountingEnabled()) { + ui.chkAccounting->setCheckState(Qt::Checked); + ui.spnAmount->setValue(_settings->accountingMaxAmount()); + ui.cmbUnit->setCurrentIndex(ui.cmbUnit->findText(_settings->accountingMaxUnit())); + ui.cmbTime->setCurrentIndex(ui.cmbTime->findText(_settings->accountingStartDwm())); + if(ui.spnDay->isVisible()) + ui.spnDay->setValue(_settings->accountingStartDay()); + ui.spnTime->setTime(QTime::fromString(_settings->accountingStartTime(), "h:mm")); + } + #if defined(USE_MINIUPNPC) ui.chkEnableUpnp->setChecked(_settings->isUpnpEnabled()); #endif @@ -681,3 +709,44 @@ err: dlg.exec(); } +void +ServerPage::toggleAccounting(int state) +{ + if(state == Qt::Checked) { + ui.lblPush->setVisible(true); + ui.spnAmount->setVisible(true); + ui.cmbUnit->setVisible(true); + ui.lblPer->setVisible(true); + ui.cmbTime->setVisible(true); + if(ui.cmbTime->currentText() == "month" or + ui.cmbTime->currentText() == "week") { + ui.spnDay->setVisible(true); + ui.lblDay->setVisible(true); + } + ui.lblAt->setVisible(true); + ui.spnTime->setVisible(true); + ui.lblTime->setVisible(true); + } else { + ui.lblPush->setVisible(false); + ui.spnAmount->setVisible(false); + ui.cmbUnit->setVisible(false); + ui.lblPer->setVisible(false); + ui.cmbTime->setVisible(false); + ui.spnDay->setVisible(false); + ui.lblDay->setVisible(false); + ui.lblTime->setVisible(false); + ui.lblAt->setVisible(false); + ui.spnTime->setVisible(false); + } +} + +void +ServerPage::toggleDisplayDay(const QString &str) +{ + ui.spnDay->setVisible(str == "month" or str == "week"); + ui.spnDay->setMinimum(1); + if(str == "month") + ui.spnDay->setMaximum(28); + else + ui.spnDay->setMaximum(7); +} diff --git a/src/vidalia/config/ServerPage.h b/src/vidalia/config/ServerPage.h index 54549a2..46b38af 100644 --- a/src/vidalia/config/ServerPage.h +++ b/src/vidalia/config/ServerPage.h @@ -82,6 +82,11 @@ private slots: /** Called when the user clicks on a QLabel containing a hyperlink. */ void linkActivated(const QString &url); + /** Called when the user toggles the Enable Accounting checkbox */ + void toggleAccounting(int state); + /** Called when the user selects a new item from cmbTime */ + void toggleDisplayDay(const QString &str); + private: /** Index values of rate values in the bandwidth limits dropdown box. */ enum BwRateIndex { diff --git a/src/vidalia/config/ServerPage.ui b/src/vidalia/config/ServerPage.ui index ec277f7..f26f7e4 100644 --- a/src/vidalia/config/ServerPage.ui +++ b/src/vidalia/config/ServerPage.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>658</width> - <height>578</height> + <width>704</width> + <height>688</height> </rect> </property> <property name="contextMenuPolicy"> @@ -547,26 +547,32 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st </widget> </item> <item row="1" column="0"> - <layout class="QHBoxLayout"> - <item> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="2" colspan="6"> <layout class="QVBoxLayout"> <item> - <widget class="QLabel" name="label_2"> + <widget class="QLabel" name="label_5"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="maximumSize"> + <size> + <width>100</width> + <height>20</height> + </size> + </property> <property name="text"> - <string>Average Rate</string> + <string>Maximum Rate</string> </property> </widget> </item> <item> <layout class="QHBoxLayout"> <item> - <widget class="QLineEdit" name="lineAvgRateLimit"> + <widget class="QLineEdit" name="lineMaxRateLimit"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -576,11 +582,11 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="maximumSize"> <size> <width>60</width> - <height>22</height> + <height>20</height> </size> </property> <property name="toolTip"> - <string>Long-term average bandwidth limit</string> + <string>Peak bandwidth rate limit</string> </property> <property name="maxLength"> <number>12</number> @@ -591,41 +597,51 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st </widget> </item> <item> - <widget class="QLabel" name="label_6"> + <widget class="QLabel" name="label_7"> <property name="text"> <string>KB/s</string> </property> </widget> </item> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>71</width> + <height>20</height> + </size> + </property> + </spacer> + </item> </layout> </item> </layout> </item> - <item> + <item row="0" column="0" colspan="2"> <layout class="QVBoxLayout"> <item> - <widget class="QLabel" name="label_5"> + <widget class="QLabel" name="label_2"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> - <size> - <width>100</width> - <height>20</height> - </size> - </property> <property name="text"> - <string>Maximum Rate</string> + <string>Average Rate</string> </property> </widget> </item> <item> <layout class="QHBoxLayout"> <item> - <widget class="QLineEdit" name="lineMaxRateLimit"> + <widget class="QLineEdit" name="lineAvgRateLimit"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -635,11 +651,11 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="maximumSize"> <size> <width>60</width> - <height>20</height> + <height>22</height> </size> </property> <property name="toolTip"> - <string>Peak bandwidth rate limit</string> + <string>Long-term average bandwidth limit</string> </property> <property name="maxLength"> <number>12</number> @@ -650,28 +666,12 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st </widget> </item> <item> - <widget class="QLabel" name="label_7"> + <widget class="QLabel" name="label_6"> <property name="text"> <string>KB/s</string> </property> </widget> </item> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>71</width> - <height>20</height> - </size> - </property> - </spacer> - </item> </layout> </item> </layout> @@ -682,6 +682,209 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st </widget> </item> <item> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="1" column="4"> + <widget class="QComboBox" name="cmbTime"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>80</width> + <height>16777215</height> + </size> + </property> + <item> + <property name="text"> + <string>day</string> + </property> + </item> + <item> + <property name="text"> + <string>week</string> + </property> + </item> + <item> + <property name="text"> + <string>month</string> + </property> + </item> + </widget> + </item> + <item row="0" column="0" colspan="2"> + <widget class="QCheckBox" name="chkAccounting"> + <property name="text"> + <string>Enable accounting</string> + </property> + </widget> + </item> + <item row="1" column="9"> + <widget class="QTimeEdit" name="spnTime"> + <property name="maximumSize"> + <size> + <width>60</width> + <height>16777215</height> + </size> + </property> + <property name="displayFormat"> + <string>h:mm</string> + </property> + </widget> + </item> + <item row="1" column="5"> + <widget class="QLabel" name="lblAt"> + <property name="maximumSize"> + <size> + <width>20</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string>at</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="QLabel" name="lblPer"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>40</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string>per</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item row="1" column="7"> + <widget class="QSpinBox" name="spnDay"> + <property name="maximumSize"> + <size> + <width>40</width> + <height>16777215</height> + </size> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>31</number> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QComboBox" name="cmbUnit"> + <property name="maximumSize"> + <size> + <width>80</width> + <height>16777215</height> + </size> + </property> + <item> + <property name="text"> + <string>bytes</string> + </property> + </item> + <item> + <property name="text"> + <string>KB</string> + </property> + </item> + <item> + <property name="text"> + <string>MB</string> + </property> + </item> + <item> + <property name="text"> + <string>GB</string> + </property> + </item> + <item> + <property name="text"> + <string>TB</string> + </property> + </item> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="lblPush"> + <property name="text"> + <string>Push no more than</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + </item> + <item row="1" column="8"> + <widget class="QLabel" name="lblTime"> + <property name="text"> + <string>time</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item row="1" column="6"> + <widget class="QLabel" name="lblDay"> + <property name="maximumSize"> + <size> + <width>50</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string>day</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item row="1" column="10"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="spnAmount"> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>999999</number> + </property> + </widget> + </item> + </layout> + </item> + <item> <spacer> <property name="orientation"> <enum>Qt::Vertical</enum> diff --git a/src/vidalia/config/ServerSettings.cpp b/src/vidalia/config/ServerSettings.cpp index 2876d7a..2593dda 100644 --- a/src/vidalia/config/ServerSettings.cpp +++ b/src/vidalia/config/ServerSettings.cpp @@ -49,7 +49,8 @@ #define SETTING_RELAY_BANDWIDTH_RATE "RelayBandwidthRate" #define SETTING_RELAY_BANDWIDTH_BURST "RelayBandwidthBurst" #define SETTING_PUBLISH_SERVER_DESCRIPTOR "PublishServerDescriptor" - +#define SETTING_ACCOUNTING_MAX "AccountingMax" +#define SETTING_ACCOUNTING_START "AccountingStart" /** Constructor. * \param torControl a TorControl object used to read and apply the server @@ -137,6 +138,9 @@ ServerSettings::apply(QString *errmsg) torrc->setValue(SETTING_BRIDGE_RELAY, "0"); torrc->setValue(SETTING_PUBLISH_SERVER_DESCRIPTOR, "1"); } + + torrc->setValue(SETTING_ACCOUNTING_MAX, volatileValue(SETTING_ACCOUNTING_MAX).toString()); + torrc->setValue(SETTING_ACCOUNTING_START, volatileValue(SETTING_ACCOUNTING_START).toString()); } else { QStringList resetKeys; quint32 torVersion = torControl()->getTorVersion(); @@ -479,3 +483,105 @@ ServerSettings::setUpnpEnabled(bool enabled) #endif } +bool +ServerSettings::isAccountingEnabled() +{ + with_torrc_value(SETTING_ACCOUNTING_MAX) { + return true; + } + + return false; +} + +void +ServerSettings::disableAccounting() +{ + Vidalia::torrc()->clear(QStringList() << SETTING_ACCOUNTING_MAX); +} + +void +ServerSettings::setAccountingMax(int amount, const QString &unit) +{ + setVolatileValue(SETTING_ACCOUNTING_MAX, QString("%1 %2").arg(amount).arg(unit)); +} + +void +ServerSettings::setAccountingStart(const QString &dwm, + int day, + const QString &time) +{ + if(dwm == "month" or dwm == "week") + setVolatileValue(SETTING_ACCOUNTING_START, + QString("%1 %2 %3").arg(dwm) + .arg(day).arg(time)); + else + setVolatileValue(SETTING_ACCOUNTING_START, + QString("%1 %2").arg(dwm).arg(time)); +} + +int +ServerSettings::accountingMaxAmount() +{ + with_torrc_value(SETTING_ACCOUNTING_MAX) { + QStringList parts = ret.at(0).split(" "); + if(parts.size() < 2) + return 0; + return parts.at(0).trimmed().toInt(); + } + + return 0; +} + +const QString +ServerSettings::accountingMaxUnit() +{ + with_torrc_value(SETTING_ACCOUNTING_MAX) { + QStringList parts = ret.at(0).split(" "); + if(parts.size() < 2) + return QString(); + return parts.at(1).trimmed(); + } + + return QString(); +} + +const QString +ServerSettings::accountingStartDwm() +{ + with_torrc_value(SETTING_ACCOUNTING_START) { + QStringList parts = ret.at(0).split(" "); + if(parts.size() < 2) + return QString(); + return parts.at(0).trimmed(); + } + + return QString(); +} + +int +ServerSettings::accountingStartDay() +{ + with_torrc_value(SETTING_ACCOUNTING_START) { + QStringList parts = ret.at(0).split(" "); + if(parts.size() < 3) + return 1; + return parts.at(1).trimmed().toInt(); + } + + return 1; +} + +const QString +ServerSettings::accountingStartTime() +{ + with_torrc_value(SETTING_ACCOUNTING_START) { + QStringList parts = ret.at(0).split(" "); + if(parts.size() < 2) + return QString(); + if(parts.size() == 3) + return parts.at(2).trimmed(); + return parts.at(1).trimmed(); + } + + return QString(); +} diff --git a/src/vidalia/config/ServerSettings.h b/src/vidalia/config/ServerSettings.h index 023d250..9f7831d 100644 --- a/src/vidalia/config/ServerSettings.h +++ b/src/vidalia/config/ServerSettings.h @@ -106,6 +106,26 @@ public: /** Sets whether Vidalia should try to configure port forwarding using UPnP. */ void setUpnpEnabled(bool enabled); + /** Returns true if accounting is enabled */ + bool isAccountingEnabled(); + /** Disables accounting options */ + void disableAccounting(); + /** Sets AccountingMax to amount unit */ + void setAccountingMax(int amount, const QString &unit); + /** Sets AccountingStart for dwm (day/week/month) day and time */ + void setAccountingStart(const QString &dwm, int day, const QString &time); + + /** Returns the max amount of bytes/KB/etc for accounting */ + int accountingMaxAmount(); + /** Returns the unit for the max amount */ + const QString accountingMaxUnit(); + /** Returns the configured AccountingStart (day/week/month) */ + const QString accountingStartDwm(); + /** Returns the day of the week/month for AccountingStart */ + int accountingStartDay(); + /** Returns the time of day for AccountingStart */ + const QString accountingStartTime(); + protected: /** Virtual method called when we retrieve a server-related setting from Tor. * Currently this just translates BandwidthFoo to RelayBandwidthFoo when

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 07 Mar '12

07 Mar '12

commit 5d9f6f5ebe41297f0d74e2ff7be275fbebb724ba Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 7 18:45:13 2012 +0000 Update translations for vidalia_completed --- eu/vidalia_eu.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 7d58a13..889f737 100644 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-07 16:59+0000\n" +"PO-Revision-Date: 2012-03-07 18:39+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2128,7 +2128,7 @@ msgstr "Erregistro Fitxategiaren izena beharrezkoa" msgctxt "MessageLog" msgid "You must enter a filename to be able to save log messages to a file." -msgstr "Fitxategi izen bat idatzi behar duzu erregistor mezuak fitxategi batean gordetzeko." +msgstr "Fitxategi izen bat idatzi behar duzu erregistro mezuak fitxategi batean gordetzeko." msgctxt "MessageLog" msgid "Select Log File"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 07 Mar '12

07 Mar '12

commit c6e277d061b42986dc41ce2131bd6963d9c74f88 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 7 18:45:09 2012 +0000 Update translations for vidalia --- eu/vidalia_eu.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 7d58a13..889f737 100755 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-07 16:59+0000\n" +"PO-Revision-Date: 2012-03-07 18:39+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2128,7 +2128,7 @@ msgstr "Erregistro Fitxategiaren izena beharrezkoa" msgctxt "MessageLog" msgid "You must enter a filename to be able to save log messages to a file." -msgstr "Fitxategi izen bat idatzi behar duzu erregistor mezuak fitxategi batean gordetzeko." +msgstr "Fitxategi izen bat idatzi behar duzu erregistro mezuak fitxategi batean gordetzeko." msgctxt "MessageLog" msgid "Select Log File"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 07 Mar '12

07 Mar '12

commit 645ac2395865249f9e00ab8de6b13f0cd6044aa1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 7 17:15:24 2012 +0000 Update translations for vidalia_help --- el/troubleshooting.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/el/troubleshooting.po b/el/troubleshooting.po index c467709..69935bd 100644 --- a/el/troubleshooting.po +++ b/el/troubleshooting.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2012-02-29 14:50+0000\n" +"PO-Revision-Date: 2012-03-07 16:58+0000\n" "Last-Translator: isv31 <ix4svs(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -168,7 +168,7 @@ msgid "" "login and start up Vidalia. Vidalia attempts to talk to the already running " "Tor. Vidalia generates a random password, but it is different than the saved" " password in the Tor service." -msgstr "" +msgstr "Είχατε ρυθμίσει το Tor ως υπηρεσία. Με αυτή τη ρύθμιση το Tor ξεκινάει όποτε ανοίγετε τον υπολογιστή σας. Αν έχετε ρυθμίσει το Tor ως υπηρεσία ρυθμίσατε τις παραμέτρους" # type: Content of: <html><body><ul><li><p> #: en/troubleshooting.html:114

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 07 Mar '12

07 Mar '12

commit b27d8dd1b01584a512afccc2dbd083a38c247d77 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 7 17:15:15 2012 +0000 Update translations for vidalia_completed --- eu/vidalia_eu.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 41d356d..7d58a13 100644 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-02 23:43+0000\n" +"PO-Revision-Date: 2012-03-07 16:59+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1109,7 +1109,7 @@ msgstr "Ukrainia" msgctxt "CountryInfo" msgid "United Arab Emirates" -msgstr "Arabiar Emirerri Batuek" +msgstr "Arabiar Emirerri Batuak" msgctxt "CountryInfo" msgid "United Kingdom"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 07 Mar '12

07 Mar '12

commit 31100918fcef4a312fd308af3b9246b971a6f43c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 7 17:15:10 2012 +0000 Update translations for vidalia --- eu/vidalia_eu.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 41d356d..7d58a13 100755 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-02 23:43+0000\n" +"PO-Revision-Date: 2012-03-07 16:59+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1109,7 +1109,7 @@ msgstr "Ukrainia" msgctxt "CountryInfo" msgid "United Arab Emirates" -msgstr "Arabiar Emirerri Batuek" +msgstr "Arabiar Emirerri Batuak" msgctxt "CountryInfo" msgid "United Kingdom"

1 0

[vidalia/master] Flash Message Log button when a warn status event happens
by chiiph＠torproject.org 07 Mar '12

07 Mar '12

commit b61cca2c672532ff2bc8f54df06ac35d85f623c4 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Wed Mar 7 12:44:48 2012 -0300 Flash Message Log button when a warn status event happens --- changes/bug3957 | 2 ++ src/vidalia/MainWindow.cpp | 31 +++++++++++++++++++++++++++++++ src/vidalia/MainWindow.h | 9 +++++++++ src/vidalia/VClickLabel.cpp | 25 +++++++++++++++++++++++++ src/vidalia/VClickLabel.h | 7 +++++++ 5 files changed, 74 insertions(+), 0 deletions(-) diff --git a/changes/bug3957 b/changes/bug3957 new file mode 100644 index 0000000..36e3d61 --- /dev/null +++ b/changes/bug3957 @@ -0,0 +1,2 @@ + o Notify users that a warning status event has appeared by flashing + the Message Log button. Fixes bug 3957. \ No newline at end of file diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index a23478e..e45919d 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -105,6 +105,8 @@ MainWindow::MainWindow() ui.setupUi(this); + _warnTimer = new QTimer(); + /* Pressing 'Esc' or 'Ctrl+W' will close the window */ Vidalia::createShortcut("Ctrl+W", this, ui.btnHide, SLOT(click())); Vidalia::createShortcut("Esc", this, ui.btnHide, SLOT(click())); @@ -162,6 +164,8 @@ MainWindow::MainWindow() this, SLOT(circuitEstablished())); connect(_torControl, SIGNAL(dangerousPort(quint16, bool)), this, SLOT(warnDangerousPort(quint16, bool))); + connect(_torControl, SIGNAL(logMessage(tc::Severity, QString)), + this, SLOT(log(tc::Severity, QString))); /* Create a new HelperProcess object, used to start the web browser */ _browserProcess = new HelperProcess(this); @@ -186,6 +190,8 @@ MainWindow::MainWindow() connect(vApp, SIGNAL(running()), this, SLOT(running())); connect(vApp, SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit())); + connect(_warnTimer, SIGNAL(timeout()), this, SLOT(warnButton())); + #if defined(USE_AUTOUPDATE) /* Create a timer used to remind us to check for software updates */ connect(&_updateTimer, SIGNAL(timeout()), this, SLOT(checkForUpdates())); @@ -229,6 +235,8 @@ MainWindow::MainWindow() /* Vidalia launched in background (LSUIElement=true). Bring to foreground. */ VidaliaWindow::setVisible(true); #endif + + _flashToggle = false; } /** Destructor. */ @@ -439,6 +447,10 @@ MainWindow::createActions() _messageLog, SLOT(showWindow())); connect(ui.lblMessageLog, SIGNAL(clicked()), _messageLog, SLOT(showWindow())); + connect(ui.lblMessageLog, SIGNAL(clicked()), + _warnTimer, SLOT(stop())); + connect(ui.lblMessageLog, SIGNAL(clicked()), + ui.lblMessageLog, SLOT(disableFlashing())); _actionShowNetworkMap = new QAction(tr("Network Map"), this); connect(_actionShowNetworkMap, SIGNAL(triggered()), @@ -2122,3 +2134,22 @@ MainWindow::updateBrowserEnv() { return env; } + +void +MainWindow::log(tc::Severity type, const QString &message) +{ + if(type == tc::WarnSeverity) + _warnTimer->start(1000); +} + +void +MainWindow::warnButton() +{ + if(_flashToggle) { + ui.lblMessageLog->enableFlashing(); + } else { + ui.lblMessageLog->disableFlashing(); + } + + _flashToggle = !_flashToggle; +} diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h index dc251e1..f13fee8 100644 --- a/src/vidalia/MainWindow.h +++ b/src/vidalia/MainWindow.h @@ -143,6 +143,11 @@ private slots: const QString &version, const QStringList &recommended); + /** Called when torControl emits logMessage() */ + void log(tc::Severity type, const QString &message); + /** Toggles the color for the Message Log button */ + void warnButton(); + #if defined(USE_AUTOUPDATE) /** Called when the user clicks the 'Check Now' button in the General * settings page. */ @@ -290,6 +295,10 @@ private: quint16 _autoControlPort; + /** Timer and bool used to flash buttons with a different color */ + QTimer *_warnTimer; + bool _flashToggle; + Ui::MainWindow ui; /**< Qt Designer generated object. */ }; diff --git a/src/vidalia/VClickLabel.cpp b/src/vidalia/VClickLabel.cpp index 9691a52..3166ee2 100644 --- a/src/vidalia/VClickLabel.cpp +++ b/src/vidalia/VClickLabel.cpp @@ -24,6 +24,7 @@ VClickLabel::VClickLabel(QWidget *parent) : QWidget(parent) { setCursor(Qt::PointingHandCursor); + _flashToggle = false; } /** Returns the current size hint for this widget's current contents. */ @@ -49,6 +50,17 @@ VClickLabel::paintEvent(QPaintEvent *e) QPainter p(this); QRect rect = this->rect(); + if(_flashToggle) { + p.setBrush(QColor(150,150,150)); + rect.setX(rect.x()+1); + rect.setY(rect.y()+1); + rect.setWidth(rect.width()); + rect.setHeight(rect.height()); + p.drawRect(rect); + } + + rect = this->rect(); + if (vApp->isLeftToRight()) { if (!_pixmap.isNull()) p.drawPixmap(0, qMax((rect.height()-_pixmap.height())/2, 0), _pixmap); @@ -93,3 +105,16 @@ VClickLabel::setPixmap(const QPixmap &pixmap) update(); } +void +VClickLabel::enableFlashing() +{ + _flashToggle = true; + repaint(); +} + +void +VClickLabel::disableFlashing() +{ + _flashToggle = false; + repaint(); +} diff --git a/src/vidalia/VClickLabel.h b/src/vidalia/VClickLabel.h index 2f3e677..23a2b74 100644 --- a/src/vidalia/VClickLabel.h +++ b/src/vidalia/VClickLabel.h @@ -46,6 +46,12 @@ public: Q_PROPERTY(QString text READ text WRITE setText USER true); Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap USER true); +public slots: + /** Enables painting a different background color for this label */ + void enableFlashing(); + /** Disables the background color modification */ + void disableFlashing(); + signals: /** Emitted when the widget is left-clicked. */ void clicked(); @@ -59,6 +65,7 @@ protected: private: QString _text; /**< Text label to display in the widget. */ QPixmap _pixmap; /**< Image to display in the widget. */ + bool _flashToggle;/**< Bool toggle for flashing the button. */ }; #endif

1 0