- tor-commits - lists.torproject.org

[stem/master] Couple fixes for prior controller changes
by atagar＠torproject.org 12 Jun '12

12 Jun '12

commit b8f4d3c75f0d4c085dcba02f47f4808c301e235a Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 12 08:49:01 2012 -0700 Couple fixes for prior controller changes Two minor bugs... - our version parsing was broken for versions without a space in them - we were quoting the runner password constant rather than using it, breaking the RUN_PASSWORD target Also some minor whitespace tweaks and moving imports to the start of the file (we're only doing method level imports if doing otherwise would break things). We might change our import style later to resolve our circular imports, but that'll be a project-wide change. --- stem/control.py | 13 ++++++++----- test/integ/control/controller.py | 17 +++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/stem/control.py b/stem/control.py index 9ceb630..f20451b 100644 --- a/stem/control.py +++ b/stem/control.py @@ -35,8 +35,10 @@ import time import Queue import threading +import stem.connection import stem.response import stem.socket +import stem.version import stem.util.log as log # state changes a control socket can have @@ -492,9 +494,11 @@ class Controller(BaseController): * ValueError if unable to parse the version """ - import stem.version - raw_str = self.get_info("version") - version_str = raw_str[:raw_str.find(' ')] + version_str = self.get_info("version") + + if " " in version_str: + version_str = version_str[:version_str.find(' ')] + return stem.version.Version(version_str) def authenticate(self, *args, **kwargs): @@ -506,7 +510,6 @@ class Controller(BaseController): :raises: see :func:`stem.connection.authenticate` """ - import stem.connection stem.connection.authenticate(self, *args, **kwargs) def protocolinfo(self): @@ -520,5 +523,5 @@ class Controller(BaseController): * :class:`stem.socket.SocketError` if problems arise in establishing or using the socket """ - import stem.connection return stem.connection.get_protocolinfo(self) + diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 4ebce5b..55a86ec 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -74,7 +74,7 @@ class TestController(unittest.TestCase): self.assertEqual({}, controller.get_info([])) self.assertEqual({}, controller.get_info([], {})) - + def test_get_version(self): """ Test that the convenient method get_version() works. @@ -85,7 +85,7 @@ class TestController(unittest.TestCase): version = controller.get_version() self.assertTrue(isinstance(version, stem.version.Version)) self.assertEqual(version, runner.get_tor_version()) - + def test_authenticate(self): """ Test that the convenient method authenticate() works. @@ -93,9 +93,9 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller(False) as controller: - controller.authenticate("test.runner.CONTROL_PASSWORD") + controller.authenticate(test.runner.CONTROL_PASSWORD) test.runner.exercise_controller(self, controller) - + def test_protocolinfo(self): """ Test that the convenient method protocolinfo() works. @@ -104,7 +104,6 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller(False) as controller: - protocolinfo = controller.protocolinfo() self.assertTrue(isinstance(protocolinfo, stem.response.protocolinfo.ProtocolInfoResponse)) @@ -115,13 +114,15 @@ class TestController(unittest.TestCase): if test.runner.Torrc.COOKIE in tor_options: auth_methods.append(stem.response.protocolinfo.AuthMethod.COOKIE) + if tor_version.meets_requirements(stem.version.Requirement.AUTH_SAFECOOKIE): auth_methods.append(stem.response.protocolinfo.AuthMethod.SAFECOOKIE) - + if test.runner.Torrc.PASSWORD in tor_options: auth_methods.append(stem.response.protocolinfo.AuthMethod.PASSWORD) - + if not auth_methods: auth_methods.append(stem.response.protocolinfo.AuthMethod.NONE) - + self.assertEqual(tuple(auth_methods), protocolinfo.auth_methods) +

1 0

[stem/master] Fixed indentation errors.
by atagar＠torproject.org 12 Jun '12

12 Jun '12

commit 843f5568d42d4568459d0a4597e078380d5fa76a Author: Beck <csybeck(a)gmail.com> Date: Tue Jun 12 16:41:12 2012 +0800 Fixed indentation errors. --- stem/control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index 6ba39d0..9ceb630 100644 --- a/stem/control.py +++ b/stem/control.py @@ -484,9 +484,9 @@ class Controller(BaseController): """ A convenience method to get tor version that current controller is connected to. - + :returns: :class:`stem.version.Version` - + :raises: * :class:`stem.socket.ControllerError` if unable to query the version * ValueError if unable to parse the version

1 0

[stem/master] Move all convenience functions to Controller class, and minor changes on them
by atagar＠torproject.org 12 Jun '12

12 Jun '12

commit 1d8ee15ef127073c384021c81e0ea07951d2c2fe Author: Beck <csybeck(a)gmail.com> Date: Fri Jun 8 00:31:56 2012 +0800 Move all convenience functions to Controller class, and minor changes on them --- stem/control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index 9ceb630..6ba39d0 100644 --- a/stem/control.py +++ b/stem/control.py @@ -484,9 +484,9 @@ class Controller(BaseController): """ A convenience method to get tor version that current controller is connected to. - + :returns: :class:`stem.version.Version` - + :raises: * :class:`stem.socket.ControllerError` if unable to query the version * ValueError if unable to parse the version

1 0

[stem/master] Added integ tests for convenience methods.
by atagar＠torproject.org 12 Jun '12

12 Jun '12

commit c4c242f589b39519ec7d71841fd4679ecac498af Author: Beck <csybeck(a)gmail.com> Date: Tue Jun 12 16:03:46 2012 +0800 Added integ tests for convenience methods. --- test/integ/control/controller.py | 54 +++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index b3eb523..4ebce5b 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -8,6 +8,8 @@ import unittest import stem.control import stem.socket +import stem.version +import stem.response.protocolinfo import test.runner class TestController(unittest.TestCase): @@ -72,4 +74,54 @@ class TestController(unittest.TestCase): self.assertEqual({}, controller.get_info([])) self.assertEqual({}, controller.get_info([], {})) - + + def test_get_version(self): + """ + Test that the convenient method get_version() works. + """ + + runner = test.runner.get_runner() + with runner.get_tor_controller() as controller: + version = controller.get_version() + self.assertTrue(isinstance(version, stem.version.Version)) + self.assertEqual(version, runner.get_tor_version()) + + def test_authenticate(self): + """ + Test that the convenient method authenticate() works. + """ + + runner = test.runner.get_runner() + with runner.get_tor_controller(False) as controller: + controller.authenticate("test.runner.CONTROL_PASSWORD") + test.runner.exercise_controller(self, controller) + + def test_protocolinfo(self): + """ + Test that the convenient method protocolinfo() works. + """ + + runner = test.runner.get_runner() + + with runner.get_tor_controller(False) as controller: + + protocolinfo = controller.protocolinfo() + self.assertTrue(isinstance(protocolinfo, stem.response.protocolinfo.ProtocolInfoResponse)) + + # Doing a sanity test on the ProtocolInfoResponse instance returned. + tor_options = runner.get_options() + tor_version = runner.get_tor_version() + auth_methods = [] + + if test.runner.Torrc.COOKIE in tor_options: + auth_methods.append(stem.response.protocolinfo.AuthMethod.COOKIE) + if tor_version.meets_requirements(stem.version.Requirement.AUTH_SAFECOOKIE): + auth_methods.append(stem.response.protocolinfo.AuthMethod.SAFECOOKIE) + + if test.runner.Torrc.PASSWORD in tor_options: + auth_methods.append(stem.response.protocolinfo.AuthMethod.PASSWORD) + + if not auth_methods: + auth_methods.append(stem.response.protocolinfo.AuthMethod.NONE) + + self.assertEqual(tuple(auth_methods), protocolinfo.auth_methods)

1 0

[vidalia/alpha] Bump version to 0.3.3-git
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit 8aacca7aa060d8e21c637ea9ab4afdbb16cf050e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 13:45:32 2012 -0300 Bump version to 0.3.3-git --- CMakeLists.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a9783c..a16b20d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ set(VER_MAJOR "0") set(VER_MINOR "3") -set(VER_PATCH "2") -set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-alpha") +set(VER_PATCH "3") +set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia)

1 0

[vidalia/alpha] Fix return value for VMessageBox::question
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit 16d73ec1bf6e1449031fee3337dea866c910262c Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 12:59:49 2012 -0300 Fix return value for VMessageBox::question --- src/vidalia/VMessageBox.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vidalia/VMessageBox.cpp b/src/vidalia/VMessageBox.cpp index 786f026..15fc553 100644 --- a/src/vidalia/VMessageBox.cpp +++ b/src/vidalia/VMessageBox.cpp @@ -159,7 +159,7 @@ VMessageBox::question(QWidget *parent, QString caption, QString text, return ret; settings->setValue(key, messageBox._chkRemember->checkState() == Qt::Checked); - return ret; + return VMessageBox::selected(ret, button0, button1, button2); } /** Displays an information message box with the given caption, message text, and

1 0

[vidalia/alpha] Move macros to external file
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit fe83b46396a9f069710f64a5e0cfd2b13406a92b Author: Feroze Naina <ferozenaina(a)gmail.com> Date: Tue May 29 23:41:05 2012 +0530 Move macros to external file --- changes/external-prototype-macros | 3 + .../plugin/prototypes/TorControlPrototype.cpp | 51 +------------------- src/vidalia/plugin/prototypes/prototypemacros.h | 49 +++++++++++++++++++ 3 files changed, 53 insertions(+), 50 deletions(-) diff --git a/changes/external-prototype-macros b/changes/external-prototype-macros new file mode 100644 index 0000000..6ae144b --- /dev/null +++ b/changes/external-prototype-macros @@ -0,0 +1,3 @@ + Internal cleanups and improvements: + o Created prototypemacros.h to store the preprocessor macros + used by TorControlPrototype diff --git a/src/vidalia/plugin/prototypes/TorControlPrototype.cpp b/src/vidalia/plugin/prototypes/TorControlPrototype.cpp index c963645..ec7799e 100644 --- a/src/vidalia/plugin/prototypes/TorControlPrototype.cpp +++ b/src/vidalia/plugin/prototypes/TorControlPrototype.cpp @@ -14,56 +14,7 @@ */ #include "TorControlPrototype.h" - -#define GET_AND_CALL(type, func, res) \ - type obj = qscriptvalue_cast<type>(thisObject()); \ - if(obj) \ - res = obj->func; - -#define MERGE2(result, errmsg) \ - QVariant(QList<QVariant>() << result << errmsg); - -#define DEF_TYPE0(type, retType, func, call) \ -retType \ -type##Prototype::func \ -{ \ - type *obj = qscriptvalue_cast<type *>(thisObject()); \ - if(obj) \ - return obj->call; \ -} - -#define DEF_TYPE1(type, resType, func, call) \ -QVariant \ -type##Prototype::func \ -{ \ - resType res; \ - QString errmsg; \ -\ - type *obj = qscriptvalue_cast<type *>(thisObject()); \ - if(obj) \ - res = obj->call; \ - QList<QVariant> vals; \ - vals << res << QVariant(errmsg); \ -\ - return vals; \ -} - -#define DEF_TYPE2(type, resType, ansType, func, call) \ -QVariant \ -type##Prototype::func \ -{ \ - resType res; \ - ansType ans; \ - QString errmsg; \ -\ - type *obj = qscriptvalue_cast<type *>(thisObject()); \ - if(obj) \ - res = obj->call; \ - QList<QVariant> vals; \ - vals << QVariant(ans) << res << QVariant(errmsg); \ -\ - return vals; \ -} +#include "prototypemacros.h" TorControlPrototype::TorControlPrototype() : QObject(), QScriptable() {} diff --git a/src/vidalia/plugin/prototypes/prototypemacros.h b/src/vidalia/plugin/prototypes/prototypemacros.h new file mode 100644 index 0000000..907ea60 --- /dev/null +++ b/src/vidalia/plugin/prototypes/prototypemacros.h @@ -0,0 +1,49 @@ +#define GET_AND_CALL(type, func, res) \ + type obj = qscriptvalue_cast<type>(thisObject()); \ + if(obj) \ + res = obj->func; + +#define MERGE2(result, errmsg) \ + QVariant(QList<QVariant>() << result << errmsg); + +#define DEF_TYPE0(type, retType, func, call) \ +retType \ +type##Prototype::func \ +{ \ + type *obj = qscriptvalue_cast<type *>(thisObject()); \ + if(obj) \ + return obj->call; \ +} + +#define DEF_TYPE1(type, resType, func, call) \ +QVariant \ +type##Prototype::func \ +{ \ + resType res; \ + QString errmsg; \ +\ + type *obj = qscriptvalue_cast<type *>(thisObject()); \ + if(obj) \ + res = obj->call; \ + QList<QVariant> vals; \ + vals << res << QVariant(errmsg); \ +\ + return vals; \ +} + +#define DEF_TYPE2(type, resType, ansType, func, call) \ +QVariant \ +type##Prototype::func \ +{ \ + resType res; \ + ansType ans; \ + QString errmsg; \ +\ + type *obj = qscriptvalue_cast<type *>(thisObject()); \ + if(obj) \ + res = obj->call; \ + QList<QVariant> vals; \ + vals << QVariant(ans) << res << QVariant(errmsg); \ +\ + return vals; \ +}

1 0

[vidalia/alpha] Add TorrcPrototype
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit cfdacb216c2954abdcfd9bb7328a8ce81bf8cba4 Author: Feroze Naina <ferozenaina(a)gmail.com> Date: Tue Jun 5 16:39:46 2012 +0530 Add TorrcPrototype --- changes/TorrcPrototype | 3 + src/vidalia/CMakeLists.txt | 2 + src/vidalia/plugin/PluginEngine.cpp | 2 + src/vidalia/plugin/PluginEngine.h | 1 + src/vidalia/plugin/prototypes/TorrcPrototype.cpp | 71 ++++++++++++++++++++++ src/vidalia/plugin/prototypes/TorrcPrototype.h | 63 +++++++++++++++++++ 6 files changed, 142 insertions(+), 0 deletions(-) diff --git a/changes/TorrcPrototype b/changes/TorrcPrototype new file mode 100644 index 0000000..3851322 --- /dev/null +++ b/changes/TorrcPrototype @@ -0,0 +1,3 @@ + New features: + o Added plugin prototype for Torrc class. This allows plugins to + modify the .torrc configuration file. diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt index 41e5aa8..23b5464 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -91,6 +91,7 @@ set(vidalia_SRCS ${vidalia_SRCS} plugin/prototypes/VidaliaTabPrototype.cpp plugin/prototypes/HelperProcessPrototype.cpp plugin/prototypes/TorControlPrototype.cpp + plugin/prototypes/TorrcPrototype.cpp ) qt4_wrap_cpp(vidalia_SRCS plugin/PluginEngine.h @@ -99,6 +100,7 @@ qt4_wrap_cpp(vidalia_SRCS plugin/prototypes/VidaliaTabPrototype.h plugin/prototypes/HelperProcessPrototype.h plugin/prototypes/TorControlPrototype.h + plugin/prototypes/TorrcPrototype.h ) ## Configuration dialog sources diff --git a/src/vidalia/plugin/PluginEngine.cpp b/src/vidalia/plugin/PluginEngine.cpp index 097ed1e..0c9e75a 100644 --- a/src/vidalia/plugin/PluginEngine.cpp +++ b/src/vidalia/plugin/PluginEngine.cpp @@ -28,8 +28,10 @@ PluginEngine::PluginEngine(QObject *parent) ADD_PROTOTYPE(HelperProcessPrototype) MAKE_CREATABLE(HelperProcessPrototype) ADD_PROTOTYPE(TorControlPrototype) + ADD_PROTOTYPE(TorrcPrototype) globalObject().setProperty("torControl", newQObject(Vidalia::torControl())); + globalObject().setProperty("torrc", newQObject(Vidalia::torrc())); globalObject().setProperty("vidaliaApp", newQObject(vApp)); // globalObject().setProperty("include", newFunction(includeScript)); diff --git a/src/vidalia/plugin/PluginEngine.h b/src/vidalia/plugin/PluginEngine.h index debede3..83a3d6f 100644 --- a/src/vidalia/plugin/PluginEngine.h +++ b/src/vidalia/plugin/PluginEngine.h @@ -22,6 +22,7 @@ #include "VidaliaTabPrototype.h" #include "HelperProcessPrototype.h" #include "TorControlPrototype.h" +#include "TorrcPrototype.h" class PluginWrapper; diff --git a/src/vidalia/plugin/prototypes/TorrcPrototype.cpp b/src/vidalia/plugin/prototypes/TorrcPrototype.cpp new file mode 100644 index 0000000..e2cbad1 --- /dev/null +++ b/src/vidalia/plugin/prototypes/TorrcPrototype.cpp @@ -0,0 +1,71 @@ +/* +** This file is part of Vidalia, and is subject to the license terms in the +** LICENSE file, found in the top level directory of this distribution. If you +** did not receive the LICENSE file with this file, you may obtain it from the +** Vidalia source package distributed by the Vidalia Project at +** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +** including this file, may be copied, modified, propagated, or distributed +** except according to the terms described in the LICENSE file. +*/ + +/* +** \file TorrcPrototype.cpp +** \brief Prototype for Torrc class +*/ + +#include "TorrcPrototype.h" +#include "prototypemacros.h" + +TorrcPrototype::TorrcPrototype() + : QObject(), QScriptable() {} + +int +TorrcPrototype::metaTypeId() +{ + return qMetaTypeId<Torrc *>(); +} + +DEF_TYPE0(Torrc, void, + load(const QString &torrcPath, const QString &defaultsPath = ""), + load(torrcPath, defaultsPath)) + +bool +TorrcPrototype::apply(TorControl *tc, QString *errmsg){ + Torrc *obj = qscriptvalue_cast<Torrc *>(thisObject()); + + if(obj) + return obj->apply(tc, errmsg); +} + +DEF_TYPE0(Torrc, void, + clear(QStringList keys), + clear(keys)) + +DEF_TYPE0(Torrc, void, + clearAll(), + clearAll()) + +DEF_TYPE0(Torrc, QStringList, + value(const QString &key) const, + value(key)) + +DEF_TYPE0(Torrc, void, + setValue(const QString &key, const QString &value, const QString &comment), + setValue(key, value, comment)) + +DEF_TYPE0(Torrc, QString, + getTorrcPath() const, + getTorrcPath()) + +DEF_TYPE0(Torrc, bool, + isValid(const QString &key, const QString &value), + isValid(key, value)) + + +bool +TorrcPrototype::setRawContents(const QString &contents, QString *errmsg, TorControl *tc){ + Torrc *obj = qscriptvalue_cast<Torrc *>(thisObject()); + + if(obj) + return obj->setRawContents(contents, errmsg, tc); +} diff --git a/src/vidalia/plugin/prototypes/TorrcPrototype.h b/src/vidalia/plugin/prototypes/TorrcPrototype.h new file mode 100644 index 0000000..cf6f9fd --- /dev/null +++ b/src/vidalia/plugin/prototypes/TorrcPrototype.h @@ -0,0 +1,63 @@ +/* +** This file is part of Vidalia, and is subject to the license terms in the +** LICENSE file, found in the top level directory of this distribution. If you +** did not receive the LICENSE file with this file, you may obtain it from the +** Vidalia source package distributed by the Vidalia Project at +** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +** including this file, may be copied, modified, propagated, or distributed +** except according to the terms described in the LICENSE file. +*/ + +/* +** \file TorrcPrototype.h +** \brief Object for interacting with Torrc file +*/ + +#ifndef _TORRCPROTO_H +#define _TORRCPROTO_H + +#include <QtGui> +#include <QtScript> + +#include "Torrc.h" + +class TorrcPrototype : public QObject, QScriptable +{ + Q_OBJECT + +public: + TorrcPrototype(); + + static int metaTypeId(); + static QString name(); + + /** Loads the torrc from the path provided and its defaults if provided */ + Q_INVOKABLE void load(const QString &torrcPath, const QString &defaultsPath); + /** Applies the changes in configuration to the torrc file */ + Q_INVOKABLE bool apply(TorControl *tc = 0, QString *errmsg = 0); + + /** Clears the keys provided in the list */ + Q_INVOKABLE void clear(QStringList keys); + /** Clears the _torrcMap and _lines values */ + Q_INVOKABLE void clearAll(); + + /** Returns a list of values associated with the given key */ + Q_INVOKABLE QStringList value(const QString &key) const; + /** Sets the value to the given key with a optional + * comment that will appear in the file */ + Q_INVOKABLE void setValue(const QString &key, const QString &value, const QString &comment = ""); + + /** Returns the used torrc path */ + Q_INVOKABLE QString getTorrcPath() const; + + /** Returns true if the key=value is a valid config option */ + Q_INVOKABLE bool isValid(const QString &key, const QString &value); + + /** Resets the config values as if the torrc file contained the + * string in contents, and applies it. */ + Q_INVOKABLE bool setRawContents(const QString &contents, QString *errmsg, TorControl *tc = 0); +}; + +Q_DECLARE_METATYPE(Torrc *); + +#endif

1 0

[vidalia/alpha] Add a way to set and unset routers from the list as Exit nodes
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit 944e2d63e6b510b85b9c6895dfa31629e305326c Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 13:08:05 2012 -0300 Add a way to set and unset routers from the list as Exit nodes Display routers in different colors in the list based on wether they are exit, or they are an explicit selected exit or they are a different kind of nodes. Also, add a way to display the router info dialog when not using Marble. --- src/vidalia/network/NetViewer.cpp | 2 + src/vidalia/network/RouterListItem.cpp | 57 ++++++++++++++++++++++++ src/vidalia/network/RouterListItem.h | 13 ++++++ src/vidalia/network/RouterListWidget.cpp | 70 +++++++++++++++++++++++++++++- src/vidalia/network/RouterListWidget.h | 7 +++ 5 files changed, 148 insertions(+), 1 deletions(-) diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp index 1571de1..eb39ac8 100644 --- a/src/vidalia/network/NetViewer.cpp +++ b/src/vidalia/network/NetViewer.cpp @@ -161,6 +161,8 @@ NetViewer::NetViewer(QWidget *parent) this, SLOT(onRouterSearch())); connect(ui.lineRouterSearch, SIGNAL(textChanged(QString)), ui.treeRouterList, SLOT(onRouterSearch(QString))); + connect(ui.treeRouterList, SIGNAL(displayRouterInfo(QString)), + this, SLOT(displayRouterInfo(QString))); setupGeoIpResolver(); diff --git a/src/vidalia/network/RouterListItem.cpp b/src/vidalia/network/RouterListItem.cpp index e26cb94..3a961b4 100644 --- a/src/vidalia/network/RouterListItem.cpp +++ b/src/vidalia/network/RouterListItem.cpp @@ -16,12 +16,19 @@ #include "RouterListItem.h" #include "RouterListWidget.h" +#include "TorSettings.h" +#include "Vidalia.h" + #include <QHeaderView> #define STATUS_COLUMN (RouterListWidget::StatusColumn) #define COUNTRY_COLUMN (RouterListWidget::CountryColumn) #define NAME_COLUMN (RouterListWidget::NameColumn) +#define NONEXIT_COLOR (Qt::white) +#define EXIT_COLOR (QColor::fromRgb(169, 207, 84)) +#define CANBEEXIT_COLOR (QColor::fromRgb(172, 209, 233)) + #define IMG_NODE_OFFLINE ":/images/icons/node-unresponsive.png" #define IMG_NODE_SLEEPING ":/images/icons/node-hibernating.png" #define IMG_NODE_NO_BW ":/images/icons/node-bw-none.png" @@ -39,6 +46,7 @@ RouterListItem::RouterListItem(RouterListWidget *list, RouterDescriptor rd) _rd = 0; _countryCode = "~"; /* Force items with no country to the bottom */ setIcon(COUNTRY_COLUMN, QIcon(IMG_FLAG_UNKNOWN)); + _selectedExit = false; update(rd); } @@ -151,3 +159,52 @@ RouterListItem::operator<(const QTreeWidgetItem &other) const return QTreeWidgetItem::operator<(other); } +/** Sets the whole line to the given brush */ +void +RouterListItem::setBackground(const QBrush &brush) +{ + QTreeWidgetItem::setBackground(STATUS_COLUMN, brush); + QTreeWidgetItem::setBackground(COUNTRY_COLUMN, brush); + QTreeWidgetItem::setBackground(NAME_COLUMN, brush); +} + +/** Sets this item's background to selected exit color if exit is true */ +void +RouterListItem::showAsSelectedExit(bool exit) +{ + _selectedExit = exit; + TorSettings settings; + QStringList exitNodes = settings.exitNodes(); + bool changed = false; + + if (exit) { + setBackground(EXIT_COLOR); + + if (exitNodes.indexOf(id()) == -1) { + exitNodes << id(); + settings.setExitNodes(exitNodes); + changed = true; + } + } else { + setBackground(CANBEEXIT_COLOR); + exitNodes.removeAll(id()); + settings.setExitNodes(exitNodes); + changed = true; + } + + QString errmsg; + if (changed && !settings.apply(&errmsg)) { + vWarn(errmsg); + } +} + +/** Sets this item's background to exit color if exit is true */ +void +RouterListItem::showAsExit(bool exit) +{ + if (exit) { + setBackground(CANBEEXIT_COLOR); + } else { + setBackground(NONEXIT_COLOR); + } +} diff --git a/src/vidalia/network/RouterListItem.h b/src/vidalia/network/RouterListItem.h index 4397947..65904dd 100644 --- a/src/vidalia/network/RouterListItem.h +++ b/src/vidalia/network/RouterListItem.h @@ -53,12 +53,25 @@ public: /** Overload the comparison operator. */ virtual bool operator<(const QTreeWidgetItem &other) const; + /** Sets this item's background to selected exit color if exit is true */ + void showAsSelectedExit(bool exit); + /** Sets this item's background to exit color if exit is true */ + void showAsExit(bool exit); + + /** Returns true if this item has been selected as exit */ + bool selectedExit() const { return _selectedExit; } + private: RouterDescriptor* _rd; /**< Descriptor for this router item. */ RouterListWidget* _list; /**< The list for this list item. */ qint64 _statusValue; /**< Value used to sort items by status. */ GeoIpRecord _location; /**< Location information for this router. */ QString _countryCode; + + bool _selectedExit; /**< True if this router has been selected for exit */ + + /** Sets the whole line to the given brush */ + void setBackground(const QBrush &brush); }; #endif diff --git a/src/vidalia/network/RouterListWidget.cpp b/src/vidalia/network/RouterListWidget.cpp index 50a1d0c..b9a76b7 100644 --- a/src/vidalia/network/RouterListWidget.cpp +++ b/src/vidalia/network/RouterListWidget.cpp @@ -16,6 +16,8 @@ #include "RouterListWidget.h" #include "RouterListItem.h" #include "Vidalia.h" +#include "VidaliaSettings.h" +#include "VMessageBox.h" #include <QHeaderView> #include <QClipboard> @@ -55,7 +57,7 @@ RouterListWidget::retranslateUi() void RouterListWidget::contextMenuEvent(QContextMenuEvent *event) { - QAction *action; + QAction *action, *routerInfoAction, *useAsExit; QMenu *menu, *copyMenu; QList<QTreeWidgetItem *> selected; @@ -77,6 +79,24 @@ RouterListWidget::contextMenuEvent(QContextMenuEvent *event) else connect(action, SIGNAL(triggered()), this, SLOT(zoomToSelectedRelay())); + routerInfoAction = menu->addAction(tr("Router Info")); + connect(routerInfoAction, SIGNAL(triggered()), this, SLOT(displayRouterInfo())); + + RouterListItem *item = static_cast<RouterListItem*>(selected.first()); + + useAsExit = menu->addAction(tr("Use as Exit node")); + if (selected.size() > 1) { + useAsExit->setEnabled(false); + } else if (item->descriptor().exitPolicy().isEmpty()) { + useAsExit->setEnabled(false); + } else { + if (item->selectedExit()) { + useAsExit->setText(tr("Do not use as Exit node")); + } + + connect(useAsExit, SIGNAL(triggered()), this, SLOT(useAsExit())); + } + menu->exec(event->globalPos()); delete menu; } @@ -245,7 +265,15 @@ RouterListWidget::addRouter(const RouterDescriptor &rd) if (item) { item->update(rd); } else { + TorSettings settings; + QStringList exitNodes = settings.exitNodes(); + item = new RouterListItem(this, rd); + if (exitNodes.indexOf(id) == -1) + item->showAsExit(rd.exitPolicy().length() != 0); + else + item->showAsSelectedExit(true); + addTopLevelItem(item); _idmap.insert(id, item); } @@ -273,3 +301,43 @@ RouterListWidget::onSelectionChanged() emit routerSelected(descriptors); } +/** Called when the Display router info menu action is selected */ +void +RouterListWidget::displayRouterInfo() +{ + foreach (QTreeWidgetItem *item, selectedItems()) { + RouterListItem *relay = dynamic_cast<RouterListItem *>(item); + if (relay) + emit displayRouterInfo(relay->id()); + break; + } +} + +/** Called when the Use as Exit node menu action is selected */ +void +RouterListWidget::useAsExit() +{ + foreach (QTreeWidgetItem *item, selectedItems()) { + RouterListItem *relay = dynamic_cast<RouterListItem *>(item); + if (relay->descriptor().exitPolicy().length() != 0) { + VidaliaSettings settings; + if (!settings.dontWarnExitNodes()) { + int res = VMessageBox::question(this, tr("You are about to set a fixed Exit node"), + tr("You need to understand that by doing this you might be " + "putting your anonymity at risk and/or limiting the " + "services you have available through Tor.\n\n" + "Do you still want to set this node as Exit?"), + VMessageBox::Yes, + VMessageBox::No|VMessageBox::Default, + VMessageBox::Cancel|VMessageBox::Escape, + "I know what I'm doing, do not remind me", &settings, + SETTING_REMEMBER_DONTWARNEXIT); + + if (res == VMessageBox::Yes) + relay->showAsSelectedExit(!relay->selectedExit()); + } else { + relay->showAsSelectedExit(!relay->selectedExit()); + } + } + } +} diff --git a/src/vidalia/network/RouterListWidget.h b/src/vidalia/network/RouterListWidget.h index e16646e..5b5be3c 100644 --- a/src/vidalia/network/RouterListWidget.h +++ b/src/vidalia/network/RouterListWidget.h @@ -62,6 +62,9 @@ signals: void routerSelected(QList<RouterDescriptor> rd); /** Emitted when the user selects a router to zoom in on. */ void zoomToRouter(QString id); + /** Emitted when the user selects a router to display more + * information about */ + void displayRouterInfo(QString id); public slots: /** Clears the list of router items. */ @@ -84,6 +87,10 @@ private slots: /** Emits a zoomToRouter() signal containing the fingerprint of the * currently selected relay. */ void zoomToSelectedRelay(); + /** Called when the Display router info menu action is selected */ + void displayRouterInfo(); + /** Called when the Use as Exit node menu action is selected */ + void useAsExit(); protected: /** Called when the user presses a key while the list has focus. */

1 0

[vidalia/alpha] Return regular descriptor in case the relay did not publish the microdesc
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit d0328c34eea2e3ae15b8e294ec3d6bb8a279ee37 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 13:00:33 2012 -0300 Return regular descriptor in case the relay did not publish the microdesc --- src/torcontrol/TorControl.cpp | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index 84de11f..c9893ce 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -1066,8 +1066,11 @@ TorControl::useMicrodescriptors(QString *errmsg) QStringList TorControl::getRouterDescriptorText(const QString &id, QString *errmsg) { - if(useMicrodescriptors(errmsg)) - return getInfo("md/id/" + id, errmsg).toStringList(); + if(useMicrodescriptors(errmsg)) { + QStringList res = getInfo("md/id/" + id, errmsg).toStringList(); + if(!res.isEmpty()) + return res; + } return getInfo("desc/id/" + id, errmsg).toStringList(); }

1 0