- tor-commits - lists.torproject.org

[vidalia/alpha] Migrate Server settings to the new structure
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 349b6ee0e175391131538817f53816140391b3f9 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Feb 3 22:23:00 2012 -0300 Migrate Server settings to the new structure --- src/vidalia/config/ServerSettings.cpp | 228 ++++++++++++++++++++------------- src/vidalia/config/ServerSettings.h | 6 +- 2 files changed, 139 insertions(+), 95 deletions(-) diff --git a/src/vidalia/config/ServerSettings.cpp b/src/vidalia/config/ServerSettings.cpp index 309d712..2876d7a 100644 --- a/src/vidalia/config/ServerSettings.cpp +++ b/src/vidalia/config/ServerSettings.cpp @@ -20,6 +20,7 @@ #ifdef USE_MINIUPNPC #include "UPNPControl.h" #endif +#include "Vidalia.h" #include "net.h" #include "stringutil.h" @@ -78,75 +79,65 @@ ServerSettings::ServerSettings(TorControl *torControl) setDefault(SETTING_PUBLISH_SERVER_DESCRIPTOR, "1"); } -/** Returns a QHash of Tor-recognizable configuratin keys to their current - * values. */ -QHash<QString, QString> -ServerSettings::confValues() -{ - QHash<QString, QString> conf; - quint32 torVersion = torControl()->getTorVersion(); - - /* Server Nickname */ - conf.insert(SETTING_NICKNAME, - (isServerEnabled() ? localValue(SETTING_NICKNAME).toString() - : "")); - /* Server ORPort */ - conf.insert(SETTING_ORPORT, - (isServerEnabled() ? localValue(SETTING_ORPORT).toString() - : "0")); - /* Server DirPort */ - conf.insert(SETTING_DIRPORT, - (isDirectoryMirror() ? localValue(SETTING_DIRPORT).toString() - : "0")); - /* Server Exit Policy */ - conf.insert(SETTING_EXITPOLICY, - ((isBridgeEnabled() || isNonExitEnabled()) ? "reject *:*" - : localValue(SETTING_EXITPOLICY).toString())); - - /* Server bandwidth settings */ - conf.insert((torVersion >= 0x020001 ? SETTING_RELAY_BANDWIDTH_RATE - : SETTING_BANDWIDTH_RATE), - QString::number(localValue(SETTING_BANDWIDTH_RATE).toUInt()) + " bytes"); - conf.insert((torVersion >= 0x020001 ? SETTING_RELAY_BANDWIDTH_BURST - : SETTING_BANDWIDTH_BURST), - QString::number(localValue(SETTING_BANDWIDTH_BURST).toUInt()) + " bytes"); - - /* Server Contact Information */ - QString contact = - localValue(SETTING_CONTACT).toString().trimmed(); - QString defaultContact = defaultValue(SETTING_CONTACT).toString(); - if ((contact == defaultContact) || - (contact == scrub_email_addr(defaultContact))) { - /* Only set the contact info if they put something non-default there */ - contact = ""; - } - conf.insert(SETTING_CONTACT, scrub_email_addr(contact)); - - /* Set if we're a bridge relay */ - if (isBridgeEnabled()) { - conf.insert(SETTING_BRIDGE_RELAY, "1"); - conf.insert(SETTING_PUBLISH_SERVER_DESCRIPTOR, - publishServerDescriptor() ? "1" : "0"); - } else { - conf.insert(SETTING_BRIDGE_RELAY, "0"); - conf.insert(SETTING_PUBLISH_SERVER_DESCRIPTOR, "1"); - } - return conf; -} - /** Applies the current server configuration settings to Tor. If errmsg * is specified and an error occurs while applying the settings, it will be * set to a string describing the error. */ bool ServerSettings::apply(QString *errmsg) { - bool rc; + Torrc *torrc = Vidalia::torrc(); configurePortForwarding(); - if (isServerEnabled()) { - rc = torControl()->setConf(confValues(), errmsg); - } else { + if (volatileValue(SETTING_ENABLED).toBool()) { + quint32 torVersion = torControl()->getTorVersion(); + + /* Server Nickname */ + torrc->setValue(SETTING_NICKNAME, + volatileValue(SETTING_NICKNAME).toString()); + /* Server ORPort */ + torrc->setValue(SETTING_ORPORT, + volatileValue(SETTING_ORPORT).toString()); + /* Server DirPort */ + torrc->setValue(SETTING_DIRPORT, + volatileValue(SETTING_DIRPORT).toString()); + /* Server Exit Policy */ + torrc->clear(QStringList() << SETTING_EXITPOLICY); + if(volatileValue(SETTING_BRIDGE_RELAY).toBool() || + volatileValue(SETTING_NONEXIT_RELAY).toBool()) { + torrc->setValue(SETTING_EXITPOLICY, "reject *:*"); + } else { + torrc->setValue(SETTING_EXITPOLICY, volatileValue(SETTING_EXITPOLICY).toString()); + } + /* Server bandwidth settings */ + torrc->setValue((torVersion >= 0x020001 ? SETTING_RELAY_BANDWIDTH_RATE + : SETTING_BANDWIDTH_RATE), + QString::number(volatileValue(SETTING_BANDWIDTH_RATE).toUInt()) + " bytes"); + torrc->setValue((torVersion >= 0x020001 ? SETTING_RELAY_BANDWIDTH_BURST + : SETTING_BANDWIDTH_BURST), + QString::number(volatileValue(SETTING_BANDWIDTH_BURST).toUInt()) + " bytes"); + + /* Server Contact Information */ + QString contact = + volatileValue(SETTING_CONTACT).toString().trimmed(); + QString defaultContact = defaultValue(SETTING_CONTACT).toString(); + if ((contact == defaultContact) || + (contact == scrub_email_addr(defaultContact))) { + /* Only set the contact info if they put something non-default there */ + contact = ""; + } + torrc->setValue(SETTING_CONTACT, scrub_email_addr(contact)); + + /* Set if we're a bridge relay */ + if (volatileValue(SETTING_BRIDGE_RELAY).toBool()) { + torrc->setValue(SETTING_BRIDGE_RELAY, "1"); + torrc->setValue(SETTING_PUBLISH_SERVER_DESCRIPTOR, + publishServerDescriptor() ? "1" : "0"); + } else { + torrc->setValue(SETTING_BRIDGE_RELAY, "0"); + torrc->setValue(SETTING_PUBLISH_SERVER_DESCRIPTOR, "1"); + } + } else { QStringList resetKeys; quint32 torVersion = torControl()->getTorVersion(); resetKeys << SETTING_ORPORT @@ -163,9 +154,9 @@ ServerSettings::apply(QString *errmsg) resetKeys << SETTING_BANDWIDTH_RATE << SETTING_BANDWIDTH_BURST; } - rc = torControl()->resetConf(resetKeys, errmsg); + torrc->clear(resetKeys); } - return rc; + return torrc->apply(torControl(), errmsg); } /* TODO: We should call this periodically, in case the router gets rebooted or forgets its UPnP settings */ @@ -227,7 +218,7 @@ ServerSettings::torValue(const QString &key) const void ServerSettings::setServerEnabled(bool enable) { - setValue(SETTING_ENABLED, enable); + setVolatileValue(SETTING_ENABLED, enable); } /** Returns true if Tor is currently configured to run as a Tor server. If Tor @@ -241,7 +232,11 @@ ServerSettings::isServerEnabled() if (torControl()->getConf(SETTING_ORPORT, orPort)) return (orPort.toUInt() > 0); } - return localValue(SETTING_ENABLED).toBool(); + + with_torrc_value(SETTING_ORPORT) { + return ret.at(0).toUInt() > 0; + } + return false; } /** Sets to enabled whether Tor should be a bridge node when acting as @@ -249,14 +244,17 @@ ServerSettings::isServerEnabled() void ServerSettings::setBridgeEnabled(bool enabled) { - setValue(SETTING_BRIDGE_RELAY, enabled); + setVolatileValue(SETTING_BRIDGE_RELAY, enabled); } /** Returns true if Tor is configured to act as a bridge node. */ bool ServerSettings::isBridgeEnabled() { - return value(SETTING_BRIDGE_RELAY).toBool() && isServerEnabled(); + with_torrc_value(SETTING_BRIDGE_RELAY) { + return (ret.at(0) == "1") && isServerEnabled(); + } + return false; } /** Sets to enabled whether Tor should be a non-exit node when acting as @@ -264,56 +262,77 @@ ServerSettings::isBridgeEnabled() void ServerSettings::setNonExitEnabled(bool enabled) { - setValue(SETTING_NONEXIT_RELAY, enabled); + setVolatileValue(SETTING_NONEXIT_RELAY, enabled); } /** Returns true if Tor is configured to act as a non-exit node. */ bool ServerSettings::isNonExitEnabled() { - return value(SETTING_NONEXIT_RELAY).toBool() && isServerEnabled(); + with_torrc_value(SETTING_EXITPOLICY) { + return ret.size() == 1 and ret.at(0) == "reject *:*" and isServerEnabled(); + } + return false; } /** Sets the server's ORPort. */ void ServerSettings::setORPort(quint16 orPort) { - setValue(SETTING_ORPORT, orPort); + setVolatileValue(SETTING_ORPORT, orPort); } /** Gets the server's current ORPort setting. */ quint16 ServerSettings::getORPort() { - return (quint16)value(SETTING_ORPORT).toUInt(); + quint16 val = 0; + with_torrc_value(SETTING_ORPORT) { + val = (quint16)ret.at(0).toUInt(); + } else { + val = (quint16)defaultValue(SETTING_ORPORT).toUInt(); + } + + return val; } /** Sets the server's current DirPort. */ void ServerSettings::setDirPort(quint16 dirPort) { - setValue(SETTING_DIRPORT, dirPort); + setVolatileValue(SETTING_DIRPORT, dirPort); } /** Gets the server's current DirPort. */ quint16 ServerSettings::getDirPort() { - return (quint16)value(SETTING_DIRPORT).toUInt(); + quint16 val = 0; + with_torrc_value(SETTING_DIRPORT) { + val = (quint16)ret.at(0).toUInt(); + } else { + val = (quint16)defaultValue(SETTING_DIRPORT).toUInt(); + } + return val; } /** Sets the server's nickname. */ void ServerSettings::setNickname(QString nickname) { - setValue(SETTING_NICKNAME, nickname); + setVolatileValue(SETTING_NICKNAME, nickname); } /** Gets the server's nickname. */ QString ServerSettings::getNickname() { - QString nickname = value(SETTING_NICKNAME).toString(); + QString nickname = "<Unnamed>"; + with_torrc_value(SETTING_NICKNAME) { + nickname = ret.at(0); + } else { + nickname = defaultValue(SETTING_NICKNAME).toString(); + } /* Ensure the nickname contains only valid characters and is not too long. */ return ensure_valid_chars(nickname, VALID_NICKNAME_CHARS).left(MAX_NICKNAME_LEN); @@ -323,70 +342,97 @@ ServerSettings::getNickname() void ServerSettings::setContactInfo(QString contact) { - setValue(SETTING_CONTACT, contact); + setVolatileValue(SETTING_CONTACT, contact); } /** Gets the server's contact information. */ QString ServerSettings::getContactInfo() { - return value(SETTING_CONTACT).toString(); + QString contact; + with_torrc_value(SETTING_CONTACT) { + contact = ret.at(0); + } else { + contact = defaultValue(SETTING_CONTACT).toString(); + } + return contact; } /** Returns whether this server will act as a directory mirror or not. */ bool ServerSettings::isDirectoryMirror() { - return localValue(SETTING_DIRMIRROR).toBool(); + return getDirPort() > 0; } /** Sets whether this server will act as a directory mirror. */ void ServerSettings::setDirectoryMirror(bool mirror) { - setValue(SETTING_DIRMIRROR, mirror); + setVolatileValue(SETTING_DIRMIRROR, mirror); } /** Returns the exit policy for this server. */ ExitPolicy ServerSettings::getExitPolicy() { - return ExitPolicy(value(SETTING_EXITPOLICY).toString()); + QString val = ""; + with_torrc_value(SETTING_EXITPOLICY) { + foreach(QString ep, ret) { + val = ep + "," + val; + } + } else { + val = defaultValue(SETTING_EXITPOLICY).toString(); + } + return ExitPolicy(val); } /** Sets the exit policy for this server. */ void ServerSettings::setExitPolicy(ExitPolicy &exitPolicy) { - setValue(SETTING_EXITPOLICY, exitPolicy.toString()); + setVolatileValue(SETTING_EXITPOLICY, exitPolicy.toString()); } /** Returns the long-term average bandwidth rate (in KB/s) for this server. */ quint32 ServerSettings::getBandwidthAvgRate() { - return value(SETTING_BANDWIDTH_RATE).toUInt(); + quint32 val = 0; + with_torrc_value(SETTING_BANDWIDTH_RATE) { + val = ret.at(0).trimmed().split(" ").at(0).toUInt(); + } else { + val = defaultValue(SETTING_BANDWIDTH_RATE).toUInt(); + } + + return val; } /** Sets the long-term average bandwidth rate (in KB/s) for this server. */ void ServerSettings::setBandwidthAvgRate(quint32 rate) { - setValue(SETTING_BANDWIDTH_RATE, rate); + setVolatileValue(SETTING_BANDWIDTH_RATE, rate); } /** Returns the maximum bandwidth burst rate (in KB/s) for this server. */ quint32 ServerSettings::getBandwidthBurstRate() { - return value(SETTING_BANDWIDTH_BURST).toUInt(); + quint32 val = 0; + with_torrc_value(SETTING_BANDWIDTH_BURST) { + val = ret.at(0).trimmed().split(" ").at(0).toUInt(); + } else { + val = defaultValue(SETTING_BANDWIDTH_BURST).toUInt(); + } + return val; } /** Sets the maximum bandwidth burst rate (in KB/s) for this server. */ void ServerSettings::setBandwidthBurstRate(quint32 rate) { - setValue(SETTING_BANDWIDTH_BURST, rate); + setVolatileValue(SETTING_BANDWIDTH_BURST, rate); } /** Sets whether the user's server descriptor will be published or not. @@ -396,18 +442,20 @@ ServerSettings::setBandwidthBurstRate(quint32 rate) void ServerSettings::setPublishServerDescriptor(bool publish) { - if (publish) - setValue(SETTING_PUBLISH_SERVER_DESCRIPTOR, "1"); - else - setValue(SETTING_PUBLISH_SERVER_DESCRIPTOR, "0"); + setVolatileValue(SETTING_PUBLISH_SERVER_DESCRIPTOR, publish?"1":"0"); } /** Returns true if the user's server descriptor will be published to the * appropriate authorities. */ bool -ServerSettings::publishServerDescriptor() const +ServerSettings::publishServerDescriptor() { - return (value(SETTING_PUBLISH_SERVER_DESCRIPTOR).toString() != "0"); + with_torrc_value(SETTING_PUBLISH_SERVER_DESCRIPTOR) { + return ret.at(0) != "0"; + } else { + return defaultValue(SETTING_PUBLISH_SERVER_DESCRIPTOR).toBool(); + } + return false; } /** Returns true if UPnP support is available and enabled. */ diff --git a/src/vidalia/config/ServerSettings.h b/src/vidalia/config/ServerSettings.h index 9479c5a..023d250 100644 --- a/src/vidalia/config/ServerSettings.h +++ b/src/vidalia/config/ServerSettings.h @@ -94,7 +94,7 @@ public: void setPublishServerDescriptor(bool publish); /** Returns true if the user's server descriptor will be published to * the appropriate authorities. */ - bool publishServerDescriptor() const; + bool publishServerDescriptor(); /** Configure port forwarding. */ void configurePortForwarding(); @@ -111,10 +111,6 @@ protected: * Currently this just translates BandwidthFoo to RelayBandwidthFoo when * appropriate. */ virtual QVariant torValue(const QString &key) const; - -private: - /** Returns Tor-recognizable configuration keys and current values. */ - QHash<QString,QString> confValues(); }; #endif

1 0

[vidalia/alpha] Migrate NetworkSettings to the new structure
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 0bfbe9dd538b6d00bb0f751af9665595cb82b147 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Feb 3 22:14:35 2012 -0300 Migrate NetworkSettings to the new structure --- src/vidalia/config/NetworkSettings.cpp | 109 +++++++++++++++++++++----------- 1 files changed, 72 insertions(+), 37 deletions(-) diff --git a/src/vidalia/config/NetworkSettings.cpp b/src/vidalia/config/NetworkSettings.cpp index 0229442..4f56432 100644 --- a/src/vidalia/config/NetworkSettings.cpp +++ b/src/vidalia/config/NetworkSettings.cpp @@ -15,6 +15,8 @@ #include "NetworkSettings.h" #include "TorControl.h" +#include "Torrc.h" +#include "Vidalia.h" #define SETTING_FASCIST_FIREWALL "FascistFirewall" #define SETTING_REACHABLE_ADDRESSES "ReachableAddresses" @@ -62,13 +64,19 @@ NetworkSettings::NetworkSettings(TorControl *torControl) bool NetworkSettings::apply(QString *errmsg) { - QMultiHash<QString, QString> conf; quint32 torVersion = torControl()->getTorVersion(); + Torrc *torrc = Vidalia::torrc(); + QStringList clearKeys; + + if(volatileValue(SETTING_FASCIST_FIREWALL).toBool()) { + torrc->setValue(SETTING_FASCIST_FIREWALL, "1"); + torrc->setValue(SETTING_REACHABLE_ADDRESSES, + volatileValue(SETTING_REACHABLE_ADDRESSES).toStringList().join(",")); + } else { + torrc->setValue(SETTING_FASCIST_FIREWALL, "0"); + clearKeys << SETTING_REACHABLE_ADDRESSES; + } - conf.insert(SETTING_REACHABLE_ADDRESSES, - (getFascistFirewall() ? - localValue(SETTING_REACHABLE_ADDRESSES).toStringList().join(",") : "")); - QString socks4, socks5, http, https; QString addr, user, pass, auth; @@ -94,45 +102,58 @@ NetworkSettings::apply(QString *errmsg) break; } - if (torVersion >= 0x020201) { - /* SOCKS support was implemented in 0.2.2.1 */ - conf.insert(SETTING_SOCKS4_PROXY, socks4); - conf.insert(SETTING_SOCKS5_PROXY, socks5); - conf.insert(SETTING_SOCKS5_USERNAME, user); - conf.insert(SETTING_SOCKS5_PASSWORD, pass); + if(getProxyType() != NoProxy) { + if (torVersion >= 0x020201) { + /* SOCKS support was implemented in 0.2.2.1 */ + torrc->setValue(SETTING_SOCKS4_PROXY, socks4); + torrc->setValue(SETTING_SOCKS5_PROXY, socks5); + torrc->setValue(SETTING_SOCKS5_USERNAME, user); + torrc->setValue(SETTING_SOCKS5_PASSWORD, pass); + } + + torrc->setValue(SETTING_HTTPS_PROXY, https); + torrc->setValue(SETTING_HTTPS_PROXY_AUTH, auth); + } else { + clearKeys << SETTING_SOCKS4_PROXY + << SETTING_SOCKS5_PROXY + << SETTING_SOCKS5_USERNAME + << SETTING_SOCKS5_PASSWORD + << SETTING_HTTPS_PROXY + << SETTING_HTTPS_PROXY_AUTH; } - conf.insert(SETTING_HTTPS_PROXY, https); - conf.insert(SETTING_HTTPS_PROXY_AUTH, auth); - - if (getUseBridges()) { + bool useBridges = volatileValue(SETTING_USE_BRIDGES, false).toBool(); + if (useBridges) { /* We want to always enable TunnelDirConns and friends when using * bridge relays. */ - conf.insert(SETTING_TUNNEL_DIR_CONNS, "1"); - conf.insert(SETTING_PREFER_TUNNELED_DIR_CONNS, "1"); + torrc->setValue(SETTING_TUNNEL_DIR_CONNS, "1"); + torrc->setValue(SETTING_PREFER_TUNNELED_DIR_CONNS, "1"); } else if (torVersion <= 0x020021) { /* TunnelDirConns is enabled by default on Tor >= 0.2.0.22-rc, so don't * disable it if our Tor is recent enough. */ - conf.insert(SETTING_TUNNEL_DIR_CONNS, "0"); - conf.insert(SETTING_PREFER_TUNNELED_DIR_CONNS, "0"); + torrc->setValue(SETTING_TUNNEL_DIR_CONNS, "0"); + torrc->setValue(SETTING_PREFER_TUNNELED_DIR_CONNS, "0"); } if (torVersion >= 0x020003) { /* Do the bridge stuff only on Tor >= 0.2.0.3-alpha */ - QStringList bridges = localValue(SETTING_BRIDGE_LIST).toStringList(); - if (getUseBridges() && !bridges.isEmpty()) { - conf.insert(SETTING_USE_BRIDGES, "1"); - conf.insert(SETTING_UPDATE_BRIDGES, "1"); + QStringList bridges = volatileValue(SETTING_BRIDGE_LIST).toStringList(); + if (useBridges && !bridges.isEmpty()) { + torrc->setValue(SETTING_USE_BRIDGES, "1"); + torrc->setValue(SETTING_UPDATE_BRIDGES, "1"); foreach (QString bridge, bridges) { - conf.insert(SETTING_BRIDGE_LIST, bridge); + torrc->setValue(SETTING_BRIDGE_LIST, bridge); } } else { - conf.insert(SETTING_USE_BRIDGES, "0"); - conf.insert(SETTING_BRIDGE_LIST, ""); - conf.insert(SETTING_UPDATE_BRIDGES, "0"); + torrc->setValue(SETTING_USE_BRIDGES, "0"); + torrc->setValue(SETTING_UPDATE_BRIDGES, "0"); + clearKeys << SETTING_BRIDGE_LIST; } } - return torControl()->setConf(conf, errmsg); + + torrc->clear(clearKeys); + + return torrc->apply(torControl(), errmsg); } /** Returns true if we need to set ReachableAddresses because we're behind a @@ -140,7 +161,12 @@ NetworkSettings::apply(QString *errmsg) bool NetworkSettings::getFascistFirewall() { - return localValue(SETTING_FASCIST_FIREWALL).toBool(); + QStringList ret = Vidalia::torrc()->value(SETTING_FASCIST_FIREWALL); + bool val = false; + + if(ret.size() > 0) + val = ret.at(0) == "1"; + return val; } /** Sets to fascistFirewall whether Tor should only create outgoing @@ -149,7 +175,7 @@ NetworkSettings::getFascistFirewall() void NetworkSettings::setFascistFirewall(bool fascistFirewall) { - setValue(SETTING_FASCIST_FIREWALL, fascistFirewall); + setVolatileValue(SETTING_FASCIST_FIREWALL, QVariant(fascistFirewall)); } /** Returns a list of ports to be specified in ReachableAddresses. */ @@ -160,7 +186,8 @@ NetworkSettings::getReachablePorts() QStringList lineList; bool ok; - lineList = value(SETTING_REACHABLE_ADDRESSES).toStringList(); + lineList = Vidalia::torrc()->value(SETTING_REACHABLE_ADDRESSES); + foreach (QString line, lineList) { foreach (QString address, line.split(",", QString::SkipEmptyParts)) { QStringList parts = address.split(":"); @@ -184,7 +211,7 @@ NetworkSettings::setReachablePorts(const QList<quint16> &reachablePorts) foreach (quint16 port, reachablePorts) { portList << "*:" + QString::number(port); } - setValue(SETTING_REACHABLE_ADDRESSES, portList); + setVolatileValue(SETTING_REACHABLE_ADDRESSES, portList); } } @@ -251,7 +278,11 @@ NetworkSettings::setProxyPassword(const QString &pass) bool NetworkSettings::getUseBridges() { - return value(SETTING_USE_BRIDGES).toBool(); + QStringList ret = Vidalia::torrc()->value(SETTING_USE_BRIDGES); + bool val = false; + if(ret.size() > 0) + val = ret.at(0) == "1"; + return val; } /** Sets to useBridges whether Tor should try to use bridge nodes @@ -259,21 +290,21 @@ NetworkSettings::getUseBridges() void NetworkSettings::setUseBridges(bool useBridges) { - setValue(SETTING_USE_BRIDGES, useBridges); + setVolatileValue(SETTING_USE_BRIDGES, useBridges); } /** Returns a list of bridge nodes Tor should use. */ QStringList NetworkSettings::getBridgeList() { - return value(SETTING_BRIDGE_LIST).toStringList(); + return Vidalia::torrc()->value(SETTING_BRIDGE_LIST); } /** Sets to bridgeList the list of bridge nodes Tor should use. */ void NetworkSettings::setBridgeList(const QStringList &bridgeList) { - setValue(SETTING_BRIDGE_LIST, bridgeList); + setVolatileValue(SETTING_BRIDGE_LIST, bridgeList); } /** Returns true if Tor is configured to try to tunnel its directory @@ -281,7 +312,11 @@ NetworkSettings::setBridgeList(const QStringList &bridgeList) bool NetworkSettings::getTunnelDirConns() { - return value(SETTING_TUNNEL_DIR_CONNS).toBool(); + QStringList ret = Vidalia::torrc()->value(SETTING_TUNNEL_DIR_CONNS); + bool val = true; + if(ret.size() > 0) + val = ret.at(0) == "1"; + return val; } /** Converts the ProxyType type to a string to store in the

1 0

[vidalia/alpha] Statically provide Torrc access from the Vidalia namespace
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 69dea1a8901c1e5ecdd6b389bdad732651e6434d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Feb 3 17:31:07 2012 -0300 Statically provide Torrc access from the Vidalia namespace Just like it is done with the TorControl object. --- src/vidalia/Vidalia.cpp | 8 +++++++- src/vidalia/Vidalia.h | 5 +++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/vidalia/Vidalia.cpp b/src/vidalia/Vidalia.cpp index 53b41c9..a053e6f 100644 --- a/src/vidalia/Vidalia.cpp +++ b/src/vidalia/Vidalia.cpp @@ -56,6 +56,7 @@ QMap<QString, QString> Vidalia::_args; /**< List of command-line arguments. */ QString Vidalia::_style; /**< The current GUI style. */ QString Vidalia::_language; /**< The current language. */ TorControl* Vidalia::_torControl = 0; /**< Main TorControl object. */ +Torrc* Vidalia::_torrc = 0; /**< Main Torrc object. */ Log Vidalia::_log; QList<QTranslator *> Vidalia::_translators; @@ -124,8 +125,12 @@ Vidalia::Vidalia(QStringList args, int &argc, char **argv) /* Set the GUI style appropriately. */ setStyle(_args.value(ARG_GUISTYLE)); + TorSettings settings; /* Creates a TorControl object, used to talk to Tor. */ - _torControl = new TorControl(TorSettings().getControlMethod()); + _torControl = new TorControl(settings.getControlMethod()); + + /* Creates a Torrc handler */ + _torrc = new Torrc(settings.getTorrc(), settings.getDefaultsTorrc()); /* If we were built with QSslSocket support, then populate the default * CA certificate store. */ @@ -149,6 +154,7 @@ Vidalia::Vidalia(QStringList args, int &argc, char **argv) Vidalia::~Vidalia() { delete _torControl; + delete _torrc; } /** Enters the main event loop and waits until exit() is called. The signal diff --git a/src/vidalia/Vidalia.h b/src/vidalia/Vidalia.h index b7d09f4..0a2ab7c 100644 --- a/src/vidalia/Vidalia.h +++ b/src/vidalia/Vidalia.h @@ -21,6 +21,7 @@ #include "TorSettings.h" #include "Log.h" #include "TorControl.h" +#include "Torrc.h" #include <QApplication> #include <QMap> @@ -74,6 +75,9 @@ public: /** Returns Vidalia's main TorControl object. */ static TorControl* torControl() { return _torControl; } + + /** Returns Vidalia's main TorControl object. */ + static Torrc* torrc() { return _torrc; } /** Returns the location Vidalia uses for its data files. */ static QString dataDirectory(); @@ -156,6 +160,7 @@ private: static QString _style; /**< The current GUI style. */ static QString _language; /**< The current language. */ static TorControl* _torControl; /**< Vidalia's main TorControl object.*/ + static Torrc* _torrc; /**< Vidalia's main Torrc object. */ static Log _log; /**< Logs debugging messages to file or stdout. */ static QList<QTranslator *> _translators; /**< List of installed translators. */ };

1 0

[vidalia/alpha] Add the torrc parser and the torrc abstraction class
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 15cf1838fcaa1456d9e69f2fa8fc2364133547de Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Feb 3 17:30:10 2012 -0300 Add the torrc parser and the torrc abstraction class --- src/vidalia/CMakeLists.txt | 3 + src/vidalia/config/torrc/Torrc.cpp | 247 +++++++++++++++++ src/vidalia/config/torrc/Torrc.h | 75 ++++++ src/vidalia/config/torrc/TorrcParser.cpp | 428 ++++++++++++++++++++++++++++++ src/vidalia/config/torrc/TorrcParser.h | 189 +++++++++++++ 5 files changed, 942 insertions(+), 0 deletions(-) diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt index 3277bf0..5b4d2a2 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -17,6 +17,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/about ${CMAKE_CURRENT_SOURCE_DIR}/bwgraph ${CMAKE_CURRENT_SOURCE_DIR}/config + ${CMAKE_CURRENT_SOURCE_DIR}/config/torrc ${CMAKE_CURRENT_SOURCE_DIR}/help/browser ${CMAKE_CURRENT_SOURCE_DIR}/log ${CMAKE_CURRENT_SOURCE_DIR}/network @@ -126,6 +127,8 @@ set(vidalia_SRCS ${vidalia_SRCS} config/TorSettings.cpp config/VidaliaSettings.cpp config/VSettings.cpp + config/torrc/TorrcParser.cpp + config/torrc/Torrc.cpp ) qt4_wrap_cpp(vidalia_SRCS config/AbstractTorSettings.h diff --git a/src/vidalia/config/torrc/Torrc.cpp b/src/vidalia/config/torrc/Torrc.cpp new file mode 100644 index 0000000..7d2ad6c --- /dev/null +++ b/src/vidalia/config/torrc/Torrc.cpp @@ -0,0 +1,247 @@ +/* +** 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 Torrc.cpp +** \brief Handles the interaction with the torrc file +*/ + +#include "Torrc.h" +#include "Vidalia.h" + +#include <QtGlobal> + +Torrc::Torrc(const QString &torrcPath, const QString &defaultsPath) : + _torrcPath(torrcPath), changed(false) +{ + load(torrcPath, defaultsPath); +} + +void +Torrc::load(const QString &torrcPath, const QString &defaultsPath) +{ + _lines = _parser.parse(torrcPath, _torrcMap); + + if(not defaultsPath.isEmpty()) + _parser.parse(defaultsPath, _defaultsMap); +} + +bool +Torrc::apply(TorControl *tc, QString *errmsg) +{ + if(not changed) + return true; + + QFile torrc(_torrcPath); + QFileInfo torrc_info(torrc); + + if(!torrc.open(QIODevice::WriteOnly)) { + *errmsg = "Couldn't open torrc file"; + return false; + } + + QString torrc_contents = ""; + QString current_line; + + foreach(TorrcLine *line, _lines) { + torrc_contents += QString("%1 %2") + .arg(line->content()) + .arg(line->comment()).trimmed(); + torrc_contents += "\n"; + } + + if(torrc_info.isWritable()) + torrc.write(torrc_contents.trimmed().toLatin1()); + torrc.close(); + + clearAll(); + load(_torrcPath); + + changed = false; + + bool ret = true; + if(tc && tc->isConnected()) { + if(!tc->loadConf(torrc_contents, errmsg)) { + vWarn(QObject::tr("There were some settings that Vidalia " + "wasn't able to apply together")); + vWarn("Trying to apply them one at a time..."); + QPair<QString, TorOpt> value; + QString ferrmsg; + ControlReply reply; + bool somefailed = false; + foreach(QString key, _torrcMap.keys()) { + foreach(value, _torrcMap.values(key)) { + if(not tc->setConf(key, value.first, &ferrmsg, &reply)) { + if(reply.getStatus() == "553") { + vWarn(QObject::tr("Failed to set %1:\nReason: %2") + .arg(key).arg(ferrmsg)); + somefailed = true; + } else { + *errmsg = ferrmsg; + return false; + } + } + } + } + if(somefailed) { + if(torrc_info.isWritable()) + vWarn(QObject::tr("The failed options were saved in your torrc " + "and will be applied when you restart.")); + else + vWarn(QObject::tr("The failed options were NOT saved in your torrc " + "and will be applied when you restart.")); + } + if(not torrc_info.isWritable()) + vWarn(QObject::tr("Vidalia was unable to save the options to the torrc file.")); + } + } + return true; +} + +QStringList +Torrc::value(const QString &key) const +{ + QStringList ret; + QPair<QString,TorOpt> value; + if(_torrcMap.contains(key)) { + foreach(value, _torrcMap.values(key)) + ret << value.first; + return ret; + } + + if(_defaultsMap.contains(key)) { + foreach(value, _defaultsMap.values(key)) + ret << value.first; + return ret; + } + + return ret; +} + +void +Torrc::setValue(const QString &key, const QString &value, const QString &comment) +{ + // Prevent possible bugs + if(not key.isEmpty() and value.isEmpty()) + return; + + if(_defaultsMap.contains(key)) { + QPair<QString,TorOpt> defvalue; + foreach(defvalue, _defaultsMap.values(key)) { + if(defvalue.first == value) + return; + } + } + + if(_torrcMap.contains(key)) { + QPair<QString,TorOpt> val; + foreach(val, _torrcMap.values(key)) { + if(not val.second.isMultilined() and val.first != value) { + val.second.line()->setContent(QString("%1 %2") + .arg(key) + .arg(value)); + if(not comment.isEmpty() and val.second.line()->comment().isEmpty()) + val.second.line()->setComment(comment); + changed = true; + return; + } else if(not val.second.isMultilined() and val.first == value) { + // if it's the same, leave it like that + return; + } // else it's multilined, in which case we just add a new entry + } + } + + changed = true; + + TorOpt opt(_parser.getTorOpt(key)); + TorrcLine *line = new TorrcLine(QString("%1 %2") + .arg(key) + .arg(value).trimmed(), + comment.trimmed()); + + if(key.isEmpty()) { + _lines << line; + return; + } + + if(opt.isMultivalued()) { + bool found = false; + QPair<QString,TorOpt> val; + foreach(val, _torrcMap.values(key)) { + if(val.first == value) { + found = true; + break; + } + } + + opt.setLine(line); + + if(!found) + _torrcMap.insertMulti(key, QPair<QString,TorOpt>(value, opt)); + else + return; + } else + _torrcMap.insert(key, QPair<QString,TorOpt>(value, opt)); + + _lines << line; +} + +void +Torrc::clear(QStringList &keys) +{ + QPair<QString, TorOpt> value; + foreach(const QString key, keys) { + foreach(value, _torrcMap.values(key)) { + if(value.second.line()) { + value.second.line()->setContent(""); + if(value.second.line()->comment().isEmpty()) + _lines.removeAll(value.second.line()); + } + } + _torrcMap.remove(key); + } +} + +bool +Torrc::isValid(const QString &key, const QString &value) +{ + if(not _parser.getTorOpt(key).isNull()) + return true; + // TODO: check value + return false; +} + +void +Torrc::clearAll() +{ + _torrcMap.clear(); + _lines.clear(); +} + +bool +Torrc::setRawContents(const QString &contents, QString *errmsg, TorControl *tc) +{ + clearAll(); + + QFile torrc(_torrcPath); + if(!torrc.open(QIODevice::WriteOnly)) { + *errmsg = "Couldn't open torrc file"; + return false; + } + + torrc.write(contents.trimmed().toLatin1()); + torrc.close(); + + load(_torrcPath); + + if(tc && tc->isConnected()) + return tc->signal(TorSignal::Reload, errmsg); + return true; +} diff --git a/src/vidalia/config/torrc/Torrc.h b/src/vidalia/config/torrc/Torrc.h new file mode 100644 index 0000000..6ab7d08 --- /dev/null +++ b/src/vidalia/config/torrc/Torrc.h @@ -0,0 +1,75 @@ +/* +** 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 Torrc.h +** \brief Handles the interaction with the torrc file +*/ + +#ifndef TORRC_H +#define TORRC_H + +#include <QtCore> + +#include "TorControl.h" +#include "TorrcParser.h" + +class Torrc { + public: + /** Constructor */ + Torrc(const QString &torrcPath, const QString &defaultsPath = ""); + + /** Loads the torrc from the path provided and its defaults if provided */ + void load(const QString &torrcPath, const QString &defaultsPath = ""); + + /** Applies the changes in configuration to the torrc file */ + bool apply(TorControl *tc = 0, QString *errmsg = 0); + /** Clears the keys provided in the list */ + void clear(QStringList &keys); + /** Clears the _torrcMap and _lines values */ + void clearAll(); + + /** Returns a list of values associated with the given key */ + QStringList value(const QString &key) const; + /** Sets the value to the given key with a optional + * comment that will appear in the file */ + void setValue(const QString &key, const QString &value, const QString &comment = ""); + + /** Returns the used torrc path */ + QString getTorrcPath() const + { return _torrcPath; } + + /** Returns true if the key=value is a valid config option */ + 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. */ + bool setRawContents(const QString &contents, QString *errmsg, TorControl *tc = 0); + + private: + /** Map that contains the key=value config options and a + representation to the actual line in the torrc file */ + QMap<QString, QPair<QString,TorOpt> > _torrcMap; + /** Map that contains the key=value config options and a + representation to the actual line in the defaults torrc file */ + QMap<QString, QPair<QString,TorOpt> > _defaultsMap; + /** List of torrc lines */ + QList<TorrcLine *> _lines; + /** Parser used to analyze the torrc and defaults files */ + TorrcParser _parser; + + /** Path to the used torrc file */ + QString _torrcPath; + + /** True if the config options have been changed */ + bool changed; +}; + +#endif diff --git a/src/vidalia/config/torrc/TorrcParser.cpp b/src/vidalia/config/torrc/TorrcParser.cpp new file mode 100644 index 0000000..ed21e8e --- /dev/null +++ b/src/vidalia/config/torrc/TorrcParser.cpp @@ -0,0 +1,428 @@ +/* +** 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 TorrcParser.cpp +** \brief Parser for the torrc file and other data representations for the file +*/ + +#include "TorrcParser.h" +#include "Vidalia.h" + +TorrcParser::TorrcParser() +{ + _torOpts << TorOpt("AccountingMax", TorOpt::DataSize, "0 bytes"); + _torOpts << TorOpt("AccountingStart", TorOpt::String, ""); + _torOpts << TorOpt("Address", TorOpt::String, ""); + _torOpts << TorOpt("AllowDotExit", TorOpt::Boolean, "0"); + _torOpts << TorOpt("AllowInvalidNodes", TorOpt::CommaList, "middle,rendezvous"); + _torOpts << TorOpt("AllowNonRFC953Hostnames", TorOpt::Boolean, "0"); + _torOpts << TorOpt("AllowSingleHopCircuits", TorOpt::Boolean, "0"); + _torOpts << TorOpt("AllowSingleHopExits", TorOpt::Boolean, "0"); + _torOpts << TorOpt("AlternateBridgeAuthority", TorOpt::LineList, ""); + _torOpts << TorOpt("AlternateDirAuthority", TorOpt::LineList, ""); + _torOpts << TorOpt("AlternateHSAuthority", TorOpt::LineList, ""); + _torOpts << TorOpt("AssumeReachable", TorOpt::Boolean, "0"); + _torOpts << TorOpt("AuthDirBadDir", TorOpt::LineList, ""); + _torOpts << TorOpt("AuthDirBadExit", TorOpt::LineList, ""); + _torOpts << TorOpt("AuthDirInvalid", TorOpt::LineList, ""); + _torOpts << TorOpt("AuthDirReject", TorOpt::LineList, ""); + _torOpts << TorOpt("AuthDirRejectUnlisted", TorOpt::Boolean, "0"); + _torOpts << TorOpt("AuthDirListBadDirs", TorOpt::Boolean, "0"); + _torOpts << TorOpt("AuthDirListBadExits", TorOpt::Boolean, "0"); + _torOpts << TorOpt("AuthDirMaxServersPerAddr", TorOpt::Integer, "2"); + _torOpts << TorOpt("AuthDirMaxServersPerAuthAddr", TorOpt::Integer, "5"); + _torOpts << TorOpt("AuthoritativeDirectory", TorOpt::Boolean, "0"); + _torOpts << TorOpt("AutomapHostsOnResolve", TorOpt::Boolean, "0"); + _torOpts << TorOpt("AutomapHostsSuffixes", TorOpt::CommaList, ".onion,.exit"); + _torOpts << TorOpt("AvoidDiskWrites", TorOpt::Boolean, "0"); + _torOpts << TorOpt("BandwidthBurst", TorOpt::DataSize, "10 MB"); + _torOpts << TorOpt("BandwidthRate", TorOpt::DataSize, "5 MB"); + _torOpts << TorOpt("BridgeAuthoritativeDir", TorOpt::Boolean, "0"); + _torOpts << TorOpt("Bridge", TorOpt::LineList, ""); + _torOpts << TorOpt("BridgePassword", TorOpt::String, ""); + _torOpts << TorOpt("BridgeRecordUsageByCountry", TorOpt::Boolean, "1"); + _torOpts << TorOpt("BridgeRelay", TorOpt::Boolean, "0"); + _torOpts << TorOpt("CellStatistics", TorOpt::Boolean, "0"); + _torOpts << TorOpt("LearnCircuitBuildTimeout", TorOpt::Boolean, "1"); + _torOpts << TorOpt("CircuitBuildTimeout", TorOpt::TimeInterval, "0"); + _torOpts << TorOpt("CircuitIdleTimeout", TorOpt::TimeInterval, "1 hour"); + _torOpts << TorOpt("CircuitStreamTimeout", TorOpt::TimeInterval, "0"); + _torOpts << TorOpt("CircuitPriorityHalflife", TorOpt::Float, "-100.0"); + _torOpts << TorOpt("ClientDNSRejectInternalAddresses", TorOpt::Boolean, "1"); + _torOpts << TorOpt("ClientOnly", TorOpt::Boolean, "0"); + _torOpts << TorOpt("ClientRejectInternalAddresses", TorOpt::Boolean, "1"); + _torOpts << TorOpt("ClientTransportPlugin", TorOpt::LineList, ""); + _torOpts << TorOpt("ConsensusParams", TorOpt::String, ""); + _torOpts << TorOpt("ConnLimit", TorOpt::Integer, "1000"); + _torOpts << TorOpt("ConnDirectionStatistics", TorOpt::Boolean, "0"); + _torOpts << TorOpt("ConstrainedSockets", TorOpt::Boolean, "0"); + _torOpts << TorOpt("ConstrainedSockSize", TorOpt::DataSize, "8192"); + _torOpts << TorOpt("ContactInfo", TorOpt::String, ""); + _torOpts << TorOpt("ControlListenAddress", TorOpt::LineList, ""); + _torOpts << TorOpt("ControlPort", TorOpt::Port, "0"); + _torOpts << TorOpt("ControlPortFileGroupReadable", TorOpt::Boolean, "0"); + _torOpts << TorOpt("ControlPortWriteToFile", TorOpt::Filename, ""); + _torOpts << TorOpt("ControlSocket", TorOpt::LineList, ""); + _torOpts << TorOpt("ControlSocketsGroupWritable", TorOpt::Boolean, "0"); + _torOpts << TorOpt("CookieAuthentication", TorOpt::Boolean, "0"); + _torOpts << TorOpt("CookieAuthFileGroupReadable", TorOpt::Boolean, "0"); + _torOpts << TorOpt("CookieAuthFile", TorOpt::String, ""); + _torOpts << TorOpt("CountPrivateBandwidth", TorOpt::Boolean, "0"); + _torOpts << TorOpt("DataDirectory", TorOpt::Filename, ""); + _torOpts << TorOpt("DirAllowPrivateAddresses", TorOpt::Boolean, ""); + _torOpts << TorOpt("TestingAuthDirTimeToLearnReachability", TorOpt::TimeInterval, "30 minutes"); + _torOpts << TorOpt("DirListenAddress", TorOpt::LineList, ""); + _torOpts << TorOpt("DirPolicy", TorOpt::LineList, ""); + _torOpts << TorOpt("DirPort", TorOpt::Port, "0"); + _torOpts << TorOpt("DirPortFrontPage", TorOpt::Filename, ""); + _torOpts << TorOpt("DirReqStatistics", TorOpt::Boolean, "1"); + _torOpts << TorOpt("DirServer", TorOpt::LineList, ""); + _torOpts << TorOpt("DisableAllSwap", TorOpt::Boolean, "0"); + _torOpts << TorOpt("DisableIOCP", TorOpt::Boolean, "1"); + _torOpts << TorOpt("DNSPort", TorOpt::LineList, ""); + _torOpts << TorOpt("DNSListenAddress", TorOpt::LineList, ""); + _torOpts << TorOpt("DownloadExtraInfo", TorOpt::Boolean, "0"); + _torOpts << TorOpt("EnforceDistinctSubnets", TorOpt::Boolean, "1"); + _torOpts << TorOpt("EntryNodes", TorOpt::RouterList, ""); + _torOpts << TorOpt("EntryStatistics", TorOpt::Boolean, "0"); + _torOpts << TorOpt("TestingEstimatedDescriptorPropagationTime", TorOpt::TimeInterval, "10 minutes"); + _torOpts << TorOpt("ExcludeNodes", TorOpt::RouterList, ""); + _torOpts << TorOpt("ExcludeExitNodes", TorOpt::RouterList, ""); + _torOpts << TorOpt("ExcludeSingleHopRelays", TorOpt::Boolean, "1"); + _torOpts << TorOpt("ExitNodes", TorOpt::RouterList, ""); + _torOpts << TorOpt("ExitPolicy", TorOpt::LineList, ""); + _torOpts << TorOpt("ExitPolicyRejectPrivate", TorOpt::Boolean, "1"); + _torOpts << TorOpt("ExitPortStatistics", TorOpt::Boolean, "0"); + _torOpts << TorOpt("ExtraInfoStatistics", TorOpt::Boolean, "1"); + _torOpts << TorOpt("FallbackNetworkstatusFile", TorOpt::Filename, "/usr/local/share/tor/fallback-consensus"); + _torOpts << TorOpt("FascistFirewall", TorOpt::Boolean, "0"); + _torOpts << TorOpt("FirewallPorts", TorOpt::CommaList, ""); + _torOpts << TorOpt("FastFirstHopPK", TorOpt::Boolean, "1"); + _torOpts << TorOpt("FetchDirInfoEarly", TorOpt::Boolean, "0"); + _torOpts << TorOpt("FetchDirInfoExtraEarly", TorOpt::Boolean, "0"); + _torOpts << TorOpt("FetchServerDescriptors", TorOpt::Boolean, "1"); + _torOpts << TorOpt("FetchHidServDescriptors", TorOpt::Boolean, "1"); + _torOpts << TorOpt("FetchUselessDescriptors", TorOpt::Boolean, "0"); + _torOpts << TorOpt("FetchV2Networkstatus", TorOpt::Boolean, "0"); + _torOpts << TorOpt("GeoIPFile", TorOpt::Filename, "/usr/local/share/tor/geoip"); + _torOpts << TorOpt("GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays", TorOpt::Boolean, "0"); + _torOpts << TorOpt("HardwareAccel", TorOpt::Boolean, "0"); + _torOpts << TorOpt("HeartbeatPeriod", TorOpt::TimeInterval, "6 hours"); + _torOpts << TorOpt("AccelName", TorOpt::String, ""); + _torOpts << TorOpt("AccelDir", TorOpt::Filename, ""); + // HashedControlPassword will only use one value, the salt prevents + // treat it like the rest of the LineLists + _torOpts << TorOpt("HashedControlPassword", TorOpt::String, ""); + _torOpts << TorOpt("HidServDirectoryV2", TorOpt::Boolean, "1"); + _torOpts << TorOpt("HiddenServiceDir", TorOpt::Dependant, ""); + _torOpts << TorOpt("HiddenServiceOptions", TorOpt::Virtual, ""); + _torOpts << TorOpt("HiddenServicePort", TorOpt::Dependant, ""); + _torOpts << TorOpt("HiddenServiceVersion", TorOpt::Dependant, ""); + _torOpts << TorOpt("HiddenServiceAuthorizeClient", TorOpt::Dependant, ""); + _torOpts << TorOpt("HidServAuth", TorOpt::LineList, ""); + _torOpts << TorOpt("HSAuthoritativeDir", TorOpt::Boolean, "0"); + _torOpts << TorOpt("HTTPProxy", TorOpt::String, ""); + _torOpts << TorOpt("HTTPProxyAuthenticator", TorOpt::String, ""); + _torOpts << TorOpt("HTTPSProxy", TorOpt::String, ""); + _torOpts << TorOpt("HTTPSProxyAuthenticator", TorOpt::String, ""); + _torOpts << TorOpt("ServerTransportPlugin", TorOpt::LineList, ""); + _torOpts << TorOpt("Socks4Proxy", TorOpt::String, ""); + _torOpts << TorOpt("Socks5Proxy", TorOpt::String, ""); + _torOpts << TorOpt("Socks5ProxyUsername", TorOpt::String, ""); + _torOpts << TorOpt("Socks5ProxyPassword", TorOpt::String, ""); + _torOpts << TorOpt("KeepalivePeriod", TorOpt::TimeInterval, "5 minutes"); + _torOpts << TorOpt("Log", TorOpt::LineList, ""); + _torOpts << TorOpt("LogMessageDomains", TorOpt::Boolean, "0"); + _torOpts << TorOpt("LogTimeGranularity", TorOpt::TimeMsecInterval, "1 second"); + _torOpts << TorOpt("LongLivedPorts", TorOpt::CommaList, "21,22,706,1863,5050,5190,5222,5223,6523,6667,6697,8300"); + _torOpts << TorOpt("MapAddress", TorOpt::LineList, ""); + _torOpts << TorOpt("MaxAdvertisedBandwidth", TorOpt::DataSize, "1 GB"); + _torOpts << TorOpt("MaxCircuitDirtiness", TorOpt::TimeInterval, "10 minutes"); + _torOpts << TorOpt("MaxClientCircuitsPending", TorOpt::Integer, "32"); + _torOpts << TorOpt("MaxOnionsPending", TorOpt::Integer, "100"); + _torOpts << TorOpt("MyFamily", TorOpt::String, ""); + _torOpts << TorOpt("NewCircuitPeriod", TorOpt::TimeInterval, "30 seconds"); + _torOpts << TorOpt("NamingAuthoritativeDirectory", TorOpt::Boolean, "0"); + _torOpts << TorOpt("NATDListenAddress", TorOpt::LineList, ""); + _torOpts << TorOpt("NATDPort", TorOpt::LineList, ""); + _torOpts << TorOpt("Nickname", TorOpt::String, ""); + _torOpts << TorOpt("WarnUnsafeSocks", TorOpt::Boolean, "1"); + _torOpts << TorOpt("NodeFamily", TorOpt::LineList, ""); + _torOpts << TorOpt("NumCPUs", TorOpt::Integer, "0"); + _torOpts << TorOpt("NumEntryGuards", TorOpt::Integer, "3"); + _torOpts << TorOpt("ORListenAddress", TorOpt::LineList, ""); + _torOpts << TorOpt("ORPort", TorOpt::Port, "0"); + _torOpts << TorOpt("OutboundBindAddress", TorOpt::String, ""); + _torOpts << TorOpt("PerConnBWBurst", TorOpt::DataSize, "0"); + _torOpts << TorOpt("PerConnBWRate", TorOpt::DataSize, "0"); + _torOpts << TorOpt("PidFile", TorOpt::String, ""); + _torOpts << TorOpt("TestingTorNetwork", TorOpt::Boolean, "0"); + _torOpts << TorOpt("OptimisticData", TorOpt::BooleanAuto, "auto"); + _torOpts << TorOpt("PortForwarding", TorOpt::Boolean, "0"); + _torOpts << TorOpt("PortForwardingHelper", TorOpt::Filename, "tor-fw-helper"); + _torOpts << TorOpt("PreferTunneledDirConns", TorOpt::Boolean, "1"); + _torOpts << TorOpt("ProtocolWarnings", TorOpt::Boolean, "0"); + _torOpts << TorOpt("PublishServerDescriptor", TorOpt::CommaList, "1"); + _torOpts << TorOpt("PublishHidServDescriptors", TorOpt::Boolean, "1"); + _torOpts << TorOpt("ReachableAddresses", TorOpt::LineList, ""); + _torOpts << TorOpt("ReachableDirAddresses", TorOpt::LineList, ""); + _torOpts << TorOpt("ReachableORAddresses", TorOpt::LineList, ""); + _torOpts << TorOpt("RecommendedVersions", TorOpt::LineList, ""); + _torOpts << TorOpt("RecommendedClientVersions", TorOpt::LineList, ""); + _torOpts << TorOpt("RecommendedServerVersions", TorOpt::LineList, ""); + _torOpts << TorOpt("RefuseUnknownExits", TorOpt::BooleanAuto, "auto"); + _torOpts << TorOpt("RejectPlaintextPorts", TorOpt::CommaList, ""); + _torOpts << TorOpt("RelayBandwidthBurst", TorOpt::DataSize, "0"); + _torOpts << TorOpt("RelayBandwidthRate", TorOpt::DataSize, "0"); + _torOpts << TorOpt("RendPostPeriod", TorOpt::TimeInterval, "1 hour"); + _torOpts << TorOpt("RephistTrackTime", TorOpt::TimeInterval, "24 hours"); + _torOpts << TorOpt("RunAsDaemon", TorOpt::Boolean, "0"); + _torOpts << TorOpt("SafeLogging", TorOpt::String, "1"); + _torOpts << TorOpt("SafeSocks", TorOpt::Boolean, "0"); + _torOpts << TorOpt("ServerDNSAllowBrokenConfig", TorOpt::Boolean, "1"); + _torOpts << TorOpt("ServerDNSAllowNonRFC953Hostnames", TorOpt::Boolean, "0"); + _torOpts << TorOpt("ServerDNSDetectHijacking", TorOpt::Boolean, "1"); + _torOpts << TorOpt("ServerDNSRandomizeCase", TorOpt::Boolean, "1"); + _torOpts << TorOpt("ServerDNSResolvConfFile", TorOpt::String, ""); + _torOpts << TorOpt("ServerDNSSearchDomains", TorOpt::Boolean, "0"); + _torOpts << TorOpt("ServerDNSTestAddresses", TorOpt::CommaList, "www.google.com,www.mit.edu,www.yahoo.com,www.slashdot.org"); + _torOpts << TorOpt("ShutdownWaitLength", TorOpt::TimeInterval, "30 seconds"); + _torOpts << TorOpt("SocksListenAddress", TorOpt::LineList, ""); + _torOpts << TorOpt("SocksPolicy", TorOpt::LineList, ""); + _torOpts << TorOpt("SocksPort", TorOpt::LineList, ""); + _torOpts << TorOpt("SocksTimeout", TorOpt::TimeInterval, "2 minutes"); + _torOpts << TorOpt("StrictNodes", TorOpt::Boolean, "0"); + _torOpts << TorOpt("TestSocks", TorOpt::Boolean, "0"); + _torOpts << TorOpt("TokenBucketRefillInterval", TorOpt::TimeMsecInterval, "100 msec"); + _torOpts << TorOpt("TrackHostExits", TorOpt::CommaList, ""); + _torOpts << TorOpt("TrackHostExitsExpire", TorOpt::TimeInterval, "30 minutes"); + _torOpts << TorOpt("TransListenAddress", TorOpt::LineList, ""); + _torOpts << TorOpt("TransPort", TorOpt::LineList, ""); + _torOpts << TorOpt("TunnelDirConns", TorOpt::Boolean, "1"); + _torOpts << TorOpt("UpdateBridgesFromAuthority", TorOpt::Boolean, "0"); + _torOpts << TorOpt("UseBridges", TorOpt::Boolean, "0"); + _torOpts << TorOpt("UseEntryGuards", TorOpt::Boolean, "1"); + _torOpts << TorOpt("UseMicrodescriptors", TorOpt::BooleanAuto, "auto"); + _torOpts << TorOpt("User", TorOpt::String, ""); + _torOpts << TorOpt("V1AuthoritativeDirectory", TorOpt::Boolean, "0"); + _torOpts << TorOpt("V2AuthoritativeDirectory", TorOpt::Boolean, "0"); + _torOpts << TorOpt("V3AuthoritativeDirectory", TorOpt::Boolean, "0"); + _torOpts << TorOpt("TestingV3AuthInitialVotingInterval", TorOpt::TimeInterval, "30 minutes"); + _torOpts << TorOpt("TestingV3AuthInitialVoteDelay", TorOpt::TimeInterval, "5 minutes"); + _torOpts << TorOpt("TestingV3AuthInitialDistDelay", TorOpt::TimeInterval, "5 minutes"); + _torOpts << TorOpt("V3AuthVotingInterval", TorOpt::TimeInterval, "1 hour"); + _torOpts << TorOpt("V3AuthVoteDelay", TorOpt::TimeInterval, "5 minutes"); + _torOpts << TorOpt("V3AuthDistDelay", TorOpt::TimeInterval, "5 minutes"); + _torOpts << TorOpt("V3AuthNIntervalsValid", TorOpt::Integer, "3"); + _torOpts << TorOpt("V3AuthUseLegacyKey", TorOpt::Boolean, "0"); + _torOpts << TorOpt("V3BandwidthsFile", TorOpt::Filename, ""); + _torOpts << TorOpt("VersioningAuthoritativeDirectory", TorOpt::Boolean, "0"); + _torOpts << TorOpt("VirtualAddrNetwork", TorOpt::String, "127.192.0.0/10"); + _torOpts << TorOpt("WarnPlaintextPorts", TorOpt::CommaList, "23,109,110,143"); + _torOpts << TorOpt("_UseFilteringSSLBufferevents", TorOpt::Boolean, "0"); + _torOpts << TorOpt("__ReloadTorrcOnSIGHUP", TorOpt::Boolean, "1"); + _torOpts << TorOpt("__AllDirActionsPrivate", TorOpt::Boolean, "0"); + _torOpts << TorOpt("__DisablePredictedCircuits", TorOpt::Boolean, "0"); + _torOpts << TorOpt("__LeaveStreamsUnattached", TorOpt::Boolean, "0"); + _torOpts << TorOpt("__HashedControlSessionPassword", TorOpt::LineList, ""); + _torOpts << TorOpt("__OwningControllerProcess", TorOpt::String, ""); + _torOpts << TorOpt("MinUptimeHidServDirectoryV2", TorOpt::TimeInterval, "25 hours"); + _torOpts << TorOpt("VoteOnHidServDirectoriesV2", TorOpt::Boolean, "1"); + _torOpts << TorOpt("_UsingTestNetworkDefaults", TorOpt::Boolean, "0"); + + _regexp = createRegExp(); +} + +QRegExp +TorrcParser::createRegExp() +{ + QString reg = ""; + foreach(TorOpt opt, _torOpts) { + reg += opt.name(); + reg += "|"; + } + reg = reg.remove(reg.size() - 1, 1); + + return QRegExp(reg, Qt::CaseInsensitive); +} + +TorOpt +TorrcParser::getTorOpt(const QString &name) +{ + foreach(const TorOpt &opt, _torOpts) { + if(opt.name() == name) + return opt; + } + + return TorOpt::null(); +} + +QList<TorrcLine *> +TorrcParser::parse(const QString &path, + QMap<QString, QPair<QString, TorOpt> > &map) +{ + QFile torrc(path); + QFileInfo torrc_info; + QList<TorrcLine *> lines; + torrc_info.setFile(torrc); + + if(not torrc_info.isReadable()) { + vWarn("Can't read torrc file, aborting parsing."); + return lines; + } + + if(not torrc.open(QIODevice::ReadOnly)) { + vWarn("Can't open torrc file, aborting parsing."); + return lines; + } + + QString raw_contents(torrc.readAll()); + torrc.close(); + + lines = toTorrcLines(raw_contents); + + QString key, value; + int sp_pos = -1; + + foreach(TorrcLine *line, lines) { + sp_pos = line->content().indexOf(" "); + if(sp_pos == -1) + continue; + + key = line->content().mid(0, sp_pos); + value = ""; + if(line->isMultilined()) { + QList<TorrcLine *> valueLines = findValueLines(line, lines); + foreach(TorrcLine *valueLine, valueLines) { + if(valueLine->isMultilined()) { + value += valueLine->content().remove(valueLine->content().lastIndexOf("\\"), 1); + } else + // Last line, doesn't have \ at the end + value += valueLine->content(); + // remove the contents, since they will live in the first line only + valueLine->setContent(""); + } + line->setContent(QString("%1 %2").arg(key).arg(value)); + } else { + value = line->content().mid(sp_pos+1, line->content().size()); + } + + TorOpt opt(getTorOpt(key)); + opt.setLine(line); + if(map.contains(key) and opt.isMultivalued()) + map.insertMulti(key, QPair<QString, TorOpt>(value, opt)); + else + map.insert(key, QPair<QString, TorOpt>(value, opt)); + } + + return lines; +} + +QString +TorrcParser::stripContents(QString contents) +{ + QString stripped_contents = "", current_line = ""; + int comment_pos = -1; + + foreach(QString line, contents.split("\n")) { + comment_pos = line.indexOf("#"); + if(comment_pos == -1) { + stripped_contents += line.trimmed(); + stripped_contents += "\n"; + continue; + } + + current_line = line.mid(0, comment_pos).trimmed(); + if(current_line.size() == 0) + continue; + stripped_contents += current_line; + stripped_contents += "\n"; + } + + return stripped_contents.replace("\t", " "); +} + +QList<TorrcLine *> +TorrcParser::toTorrcLines(QString contents) +{ + QList<TorrcLine *> lines; + QString stripped_contents = "", current_line = ""; + int comment_pos = -1; + + foreach(QString line, contents.split("\n")) { + comment_pos = line.indexOf("#"); + if(comment_pos == -1) { + lines << new TorrcLine(line.trimmed()); + continue; + } + + current_line = line.mid(0, comment_pos).trimmed().replace("\t", " "); + if(current_line.size() == 0) { + // The line is just a comment + lines << new TorrcLine("", line.trimmed()); + continue; + } + lines << new TorrcLine(current_line, line.mid(comment_pos, line.size()).trimmed()); + } + + return lines; +} + +QList<TorrcLine *> +TorrcParser::findValueLines(TorrcLine *line, + const QList<TorrcLine *> &lines) const +{ + QList<TorrcLine *> collected; + + int index = -1; + index = lines.indexOf(line) + 1; + if(index >= lines.size()) + return collected; + + for(int i = index; i<lines.size(); i++) { + if(lines.at(i)->isMultilined()) + collected << lines.at(i); + else { + collected << lines.at(i); + break; + } + } + + return collected; +} + +bool +TorrcParser::isKeyword(const QString &contents, int pos) +{ + while(contents.at(pos) != '\n') { + pos--; + if(pos < 0 or contents.at(pos) == '\n') + return true; + if(contents.at(pos) != ' ') + return false; + } + return true; +} + +QDebug +operator<<(QDebug dbg, const TorOpt &opt) { + dbg.nospace() << qPrintable(QString("TorOpt(%1)") + .arg(opt.name())); + return dbg; +} + +QDebug +operator<<(QDebug dbg, TorrcLine *line) { + dbg.nospace() << qPrintable(QString("TorLine(%1, %2)") + .arg(line->content()) + .arg(line->comment())); + return dbg; +} diff --git a/src/vidalia/config/torrc/TorrcParser.h b/src/vidalia/config/torrc/TorrcParser.h new file mode 100644 index 0000000..83572bb --- /dev/null +++ b/src/vidalia/config/torrc/TorrcParser.h @@ -0,0 +1,189 @@ +/* +** 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 TorrcParser.h +** \brief Parser for the torrc file and other data representations for the file +*/ + +#ifndef TORRCPARSER_H +#define TORRCPARSER_H + +#include <QtCore> + +/** Rpresents a line in the torrc file that respects the formatting + * the user gave it */ +class TorrcLine +{ + public: + /** Constructor */ + TorrcLine(const QString &content = "", const QString &comment = "") + : _content(content), _comment(comment) {} + + /** Returns the content for this line */ + QString content() + { return _content; } + /** Sets the contents for this line */ + void setContent(const QString &content) + { _content = content; } + + /** Returns the comment for this line */ + QString comment() + { return _comment; } + /** Sets the comment for this line */ + void setComment(const QString &comment) + { _comment = comment; } + + /** Returns true if the line's content is divided into other + * subsequent lines */ + bool isMultilined() + { + int index = -1; + index = _content.lastIndexOf("\\") + 1; + if(index == -1) + return false; + for(int i = index; i<_content.size(); i++) { + if(_content.at(i) != ' ') + return false; + } + return true; + } + + private: + /** Strings that hold the content and comment for the line */ + QString _content, _comment; +}; + +/** Represents an possible option in the torrc file. This is used to + * handle the different type of values that may be associated with + * each option */ +class TorOpt +{ + public: + /** Possible value types */ + enum OptType { + TimeInterval = 0, + TimeMsecInterval, + String, + RouterList, + LineList, + Float, + Dependant, + Virtual, + Filename, + CommaList, + Boolean, + BooleanAuto, + Integer, + DataSize, + Port, + NIL + }; + + /** Default constructor */ + TorOpt() + { TorOpt("", NIL); } + /** Constructor */ + TorOpt(const QString &name, OptType type, QString defaultValue = "") + : _name(name), _type(type), _default(defaultValue), _line(0) {} + /** Copy constructor */ + TorOpt(const TorOpt &opt) + : _name(opt.name()), _type(opt.type()), _default(opt.defaultValue()), _line(opt.line()) {} + + /** Returns true if this option can be defined with multiple lines */ + bool isMultilined() + { return _type == LineList or _type == Dependant or _type == Virtual; } + + /** Returns true if this option can be defined multiple times with + * different values */ + bool isMultivalued() + { return _type == LineList; } + + /** Returns the name for this option */ + QString name() const + { return _name; } + + /** Returns the type for this option*/ + OptType type() const + { return _type; } + + /** Returns the default value that tor assumes for this option */ + QString defaultValue() const + { return _default; } + + /** Returns a pointer to the TorrcLine for this option */ + TorrcLine *line() const + { return _line; } + + /** Sets the line for this option */ + void setLine(TorrcLine *line) + { _line = line; } + + /** Returns true if it's a null TorOpt */ + bool isNull() const + { return _type == NIL; } + + /** Creates a null TorOpt*/ + static TorOpt null() + { return TorOpt("Nil", NIL); } + + private: + /** Name for this option */ + QString _name; + /** Type for this option */ + OptType _type; + /** Default value for this option */ + QString _default; + /** Pointer to the line that represents this option */ + TorrcLine *_line; +}; + +/** Parser for the torrc file and any other torrc structured file */ +class TorrcParser +{ + public: + /** Default constructor */ + TorrcParser(); + + /** Parses the torrc file provided in the path and returns the + * TorrcLine list for the file and the map of key=value */ + QList<TorrcLine *> parse(const QString &path, + QMap<QString, QPair<QString, TorOpt> > &map); + /** Returns the TorOpt for a given option name */ + TorOpt getTorOpt(const QString &name); + + private: + /** List with all the current valid options for the torrc */ + QList<TorOpt> _torOpts; + /** Regular expression used in the parsing based on _torOpts */ + QRegExp _regexp; + + /** Strips the torrc contents passed from comments an empty lines */ + QString stripContents(QString contents); + /** Given the contents of a torrc file, it returns a list of + * TorrcLines representing it */ + QList<TorrcLine *> toTorrcLines(QString contents); + /** Given a TorrcLine and the line list where it belongs, it returns + * the set of lines that define the multilined value */ + QList<TorrcLine *> findValueLines(TorrcLine *line, + const QList<TorrcLine *> &lines) const; + /** Creates the regular expression used in parsing */ + QRegExp createRegExp(); + /** Returns true if there's a keyword in the contents at the given + * pos */ + bool isKeyword(const QString &contents, int pos); +}; + +/** Debug output methods */ +QDebug operator<<(QDebug dbg, const TorOpt &opt); +QDebug operator<<(QDebug dbg, TorrcLine *line); + +#endif +

1 0

[vidalia/alpha] Change the basic behavior when saving settings
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 442df199a7aeb531b5102df6273056155809fda9 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Feb 3 22:23:41 2012 -0300 Change the basic behavior when saving settings We want to apply them every time, and the torrc handler will take care of the dirty details and corner cases. --- src/vidalia/config/ConfigDialog.cpp | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/vidalia/config/ConfigDialog.cpp b/src/vidalia/config/ConfigDialog.cpp index a2debf5..a92e959 100644 --- a/src/vidalia/config/ConfigDialog.cpp +++ b/src/vidalia/config/ConfigDialog.cpp @@ -199,10 +199,8 @@ ConfigDialog::saveChanges() return; } } - if (Vidalia::torControl()->isConnected()) - applyChanges(); - else - close(); + + applyChanges(); } /** Called after Vidalia has authenticated to Tor and applies any changes @@ -238,8 +236,7 @@ ConfigDialog::applyChanges() } appliedChanges = true; } - if (appliedChanges) - saveConf(); + close(); }

1 0

[vidalia/alpha] Make the NetworkPage handle just one settings object
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 7f4124b4f43d0b047559fca7307ef66ed9ffcbb6 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Feb 3 22:25:55 2012 -0300 Make the NetworkPage handle just one settings object Otherwise the volatile values will go away between objects, and we don't want that. --- src/vidalia/config/NetworkPage.cpp | 49 +++++++++++++++++++---------------- src/vidalia/config/NetworkPage.h | 8 +++++- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index 8bfabb3..c38e875 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -39,6 +39,8 @@ NetworkPage::NetworkPage(QWidget *parent) /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); + _settings = new NetworkSettings(Vidalia::torControl()); + connect(ui.btnAddBridge, SIGNAL(clicked()), this, SLOT(addBridge())); connect(ui.btnRemoveBridge, SIGNAL(clicked()), this, SLOT(removeBridge())); connect(ui.btnCopyBridge, SIGNAL(clicked()), @@ -81,6 +83,12 @@ NetworkPage::NetworkPage(QWidget *parent) #endif } +/** Default destructor */ +NetworkPage::~NetworkPage() +{ + delete _settings; +} + /** Called when the user changes the UI translation. */ void NetworkPage::retranslateUi() @@ -94,7 +102,7 @@ NetworkPage::retranslateUi() bool NetworkPage::apply(QString &errmsg) { - return NetworkSettings(Vidalia::torControl()).apply(&errmsg); + return _settings->apply(&errmsg); } /** Returns true if the user has changed their server settings since the * @@ -102,7 +110,7 @@ NetworkPage::apply(QString &errmsg) bool NetworkPage::changedSinceLastApply() { - return NetworkSettings(Vidalia::torControl()).changedSinceLastApply(); + return _settings->changedSinceLastApply(); } /** Reverts the server configuration settings to their values at the last * @@ -110,8 +118,7 @@ NetworkPage::changedSinceLastApply() void NetworkPage::revert() { - NetworkSettings settings(Vidalia::torControl()); - settings.revert(); + _settings->revert(); } /** Called when a link in a label is clicked. url is the target of @@ -194,7 +201,6 @@ NetworkPage::bridgeSelectionChanged() bool NetworkPage::save(QString &errmsg) { - NetworkSettings settings(Vidalia::torControl()); QString addr; QString user, pass; NetworkSettings::ProxyType proxy = NetworkSettings::NoProxy; @@ -243,13 +249,13 @@ NetworkPage::save(QString &errmsg) proxy = static_cast<NetworkSettings::ProxyType>(type); } - settings.setProxyType(proxy); - settings.setProxyAddress(addr); - settings.setProxyUsername(user); - settings.setProxyPassword(pass); + _settings->setProxyType(proxy); + _settings->setProxyAddress(addr); + _settings->setProxyUsername(user); + _settings->setProxyPassword(pass); /* Save the reachable port settings */ - settings.setFascistFirewall(ui.chkFascistFirewall->isChecked()); + _settings->setFascistFirewall(ui.chkFascistFirewall->isChecked()); foreach (QString portString, ui.lineReachablePorts->text().split(",", QString::SkipEmptyParts)) { quint32 port = portString.toUInt(&ok); @@ -259,7 +265,7 @@ NetworkPage::save(QString &errmsg) } reachablePorts << (quint16)port; } - settings.setReachablePorts(reachablePorts); + _settings->setReachablePorts(reachablePorts); if (ui.chkUseBridges->isChecked()) { if (ui.listBridges->count() < 1) { @@ -269,10 +275,10 @@ NetworkPage::save(QString &errmsg) } /* Save the bridge settings */ - settings.setUseBridges(ui.chkUseBridges->isChecked()); + _settings->setUseBridges(ui.chkUseBridges->isChecked()); for (int i = 0; i < ui.listBridges->count(); i++) bridgeList << ui.listBridges->item(i)->text(); - settings.setBridgeList(bridgeList); + _settings->setBridgeList(bridgeList); return true; } @@ -281,20 +287,19 @@ NetworkPage::save(QString &errmsg) void NetworkPage::load() { - NetworkSettings settings(Vidalia::torControl()); QStringList reachablePortStrings; NetworkSettings::ProxyType proxyType; /* Load proxy settings */ - proxyType = settings.getProxyType(); + proxyType = _settings->getProxyType(); ui.chkUseProxy->setChecked(proxyType != NetworkSettings::NoProxy); - QStringList proxy = settings.getProxyAddress().split(":"); + QStringList proxy = _settings->getProxyAddress().split(":"); if (proxy.size() >= 1) ui.lineProxyAddress->setText(proxy.at(0)); if (proxy.size() >= 2) ui.lineProxyPort->setText(proxy.at(1)); - ui.lineProxyUsername->setText(settings.getProxyUsername()); - ui.lineProxyPassword->setText(settings.getProxyPassword()); + ui.lineProxyUsername->setText(_settings->getProxyUsername()); + ui.lineProxyPassword->setText(_settings->getProxyPassword()); /* SOCKS options are only available on Tor >= 0.2.2.1-alpha, so don't show * them if Tor is running and its version is less than that. */ @@ -316,17 +321,17 @@ NetworkPage::load() ui.cmboProxyType->setCurrentIndex(ui.cmboProxyType->findData(proxyType)); /* Load firewall settings */ - ui.chkFascistFirewall->setChecked(settings.getFascistFirewall()); - QList<quint16> reachablePorts = settings.getReachablePorts(); + ui.chkFascistFirewall->setChecked(_settings->getFascistFirewall()); + QList<quint16> reachablePorts = _settings->getReachablePorts(); foreach (quint16 port, reachablePorts) { reachablePortStrings << QString::number(port); } ui.lineReachablePorts->setText(reachablePortStrings.join(",")); /* Load bridge settings */ - ui.chkUseBridges->setChecked(settings.getUseBridges()); + ui.chkUseBridges->setChecked(_settings->getUseBridges()); ui.listBridges->clear(); - ui.listBridges->addItems(settings.getBridgeList()); + ui.listBridges->addItems(_settings->getBridgeList()); } /** Called when the user clicks the "Find Bridges Now" button. diff --git a/src/vidalia/config/NetworkPage.h b/src/vidalia/config/NetworkPage.h index 2193be7..3111bf3 100644 --- a/src/vidalia/config/NetworkPage.h +++ b/src/vidalia/config/NetworkPage.h @@ -21,6 +21,8 @@ #include "Vidalia.h" #include "BridgeDownloader.h" +class NetworkSettings; + #include <QPoint> @@ -31,7 +33,9 @@ class NetworkPage : public ConfigPage public: /** Default Constructor */ NetworkPage(QWidget *parent = 0); - + /** Defaults Destructor */ + ~NetworkPage(); + /** Saves the changes on this page */ bool save(QString &errmsg); /** Loads the settings for this page */ @@ -87,6 +91,8 @@ private: /** Qt Designer generated object */ Ui::NetworkPage ui; + + NetworkSettings *_settings; }; #endif

1 0

[vidalia/alpha] Always set DataDirectory and return to the default ControlPort when toggling off auto
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 826ca762eeaa274a0a86eebdbc592499cf6463ef Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Feb 3 22:27:01 2012 -0300 Always set DataDirectory and return to the default ControlPort when toggling off auto --- src/vidalia/config/AdvancedPage.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp index ebee44f..44216c7 100644 --- a/src/vidalia/config/AdvancedPage.cpp +++ b/src/vidalia/config/AdvancedPage.cpp @@ -193,8 +193,7 @@ AdvancedPage::save(QString &errmsg) } QString dataDir = ui.lineTorDataDirectory->text(); - if (dataDir != _settings->getDataDirectory()) - _settings->setDataDirectory(dataDir); + _settings->setDataDirectory(dataDir); } if(!ui.chkAuto->isChecked()) { @@ -434,6 +433,7 @@ AdvancedPage::toggleAuto(bool) ui.lineControlAddress->setVisible(!ui.chkAuto->isChecked()); ui.label->setVisible(!ui.chkAuto->isChecked()); ui.lineControlPort->setVisible(!ui.chkAuto->isChecked()); + ui.lineControlPort->setText("9051"); } void

1 0

[vidalia/alpha] Adapt MainWindow behavior
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit b32177a35c890073225ed863fb115e10166e1cf2 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Feb 3 22:38:19 2012 -0300 Adapt MainWindow behavior We don't want to launch tor with so many arguments, we handle those through the torrc file. Also adapt the "remember previous random ports used" fix. --- src/vidalia/MainWindow.cpp | 49 +++++++++++++++++-------------------------- 1 files changed, 19 insertions(+), 30 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index c3b1954..f7c67e1 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -620,8 +620,6 @@ 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" << expDataDirectory; if(settings.getControlMethod() == ControlMethod::Port) { if(settings.autoControlPort()) { @@ -629,30 +627,15 @@ MainWindow::start() if(!QFile::remove(portconf)) vWarn(QString("Unable to remove %1, may be it didn't existed.").arg(portconf)); - QString control_str = "auto"; - QString socks_str = "auto"; - if(!_previousControlPort.isEmpty()) { - control_str = _previousControlPort; + Vidalia::torrc()->setValue("ControlPort", _previousControlPort); _startedWithPrevious = true; } if(!_previousSocksPort.isEmpty()) { - socks_str = _previousSocksPort; + Vidalia::torrc()->setValue("ControlPort", _previousSocksPort); _startedWithPrevious = true; } - - args << "ControlPort" << control_str; - args << "SocksPort" << socks_str; - args << "ControlPortWriteToFile" << QString("%1/port.conf").arg(expDataDirectory); - } else { - /* Add the intended control port value */ - quint16 controlPort = settings.getControlPort(); - if (controlPort) - args << "ControlPort" << QString::number(controlPort); } - } else { - QString path = settings.getSocketPath(); - args << "ControlSocket" << path; } args << "__OwningControllerProcess" << QString::number(QCoreApplication::applicationPid()); @@ -664,20 +647,15 @@ MainWindow::start() if (settings.useRandomPassword()) { _controlPassword = TorSettings::randomPassword(); _useSavedPassword = false; - } else { - _controlPassword = settings.getControlPassword(); + Vidalia::torrc()->setValue("HashedControlPassword", + TorSettings::hashPassword(_controlPassword)); + Vidalia::torrc()->apply(Vidalia::torControl(), new QString()); + } else _useSavedPassword = true; - } } - args << "HashedControlPassword" - << TorSettings::hashPassword(_controlPassword); - - break; - case TorSettings::CookieAuth: - args << "CookieAuthentication" << "1"; break; default: - args << "CookieAuthentication" << "0"; + break; } /* This doesn't get set to false until Tor is actually up and running, so we @@ -753,10 +731,16 @@ MainWindow::started() /* Try to connect to Tor's control port */ if(settings.getControlMethod() == ControlMethod::Port) _torControl->connect(settings.getControlAddress(), - settings.getControlPort()); + settings.getControlPort()); else _torControl->connect(settings.getSocketPath()); } + // If we used the previous ports, set the *Port to auto again + if(_startedWithPrevious) { + Vidalia::torrc()->setValue("ControlPort", "auto"); + Vidalia::torrc()->setValue("SocksPort", "auto"); + Vidalia::torrc()->apply(Vidalia::torControl()); + } setStartupProgress(STARTUP_PROGRESS_CONNECTING, tr("Connecting to Tor")); } @@ -867,6 +851,9 @@ MainWindow::startFailed(QString errmsg) _startedWithPrevious = false; _previousControlPort = ""; _previousSocksPort = ""; + Vidalia::torrc()->setValue("ControlPort", "auto"); + Vidalia::torrc()->setValue("SocksPort", "auto"); + Vidalia::torrc()->apply(Vidalia::torControl()); vWarn("Retrying with new ports"); start(); return; @@ -1666,6 +1653,8 @@ MainWindow::showConfigDialog(ConfigDialog::Page page) ConfigDialog *configDialog = new ConfigDialog(); connect(configDialog, SIGNAL(helpRequested(QString)), this, SLOT(showHelpDialog(QString))); + connect(configDialog, SIGNAL(restartTor()), + this, SLOT(restart())); configDialog->showWindow(page); }

1 0

[vidalia/alpha] Simplify the torrc dialog with the new handling
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 5f7f1e3762a8515a2366b82ce40f8f9ed3d16141 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Feb 3 22:28:46 2012 -0300 Simplify the torrc dialog with the new handling --- src/vidalia/config/TorrcDialog.cpp | 92 +++++++----------------------------- src/vidalia/config/TorrcDialog.ui | 43 ----------------- 2 files changed, 17 insertions(+), 118 deletions(-) diff --git a/src/vidalia/config/TorrcDialog.cpp b/src/vidalia/config/TorrcDialog.cpp index a1ad569..6f5a678 100644 --- a/src/vidalia/config/TorrcDialog.cpp +++ b/src/vidalia/config/TorrcDialog.cpp @@ -87,56 +87,8 @@ TorrcDialog::loadToolBar() bool TorrcDialog::parseAndSet(QString *errmsg) { - if(!errmsg) errmsg = new QString(""); - if(!tc || !tc->isConnected()) { - *errmsg = tr("Error connecting to Tor"); - return false; - } - - QString key, val; - QStringList parts, lines; - - if(ui.rdoAll->isChecked()) - lines = ui.teditTorrc->toPlainText().split('\n', QString::SkipEmptyParts); - else { - QString tmp = ui.teditTorrc->toPlainText(); - QTextCursor tcursor = ui.teditTorrc->textCursor(); - int start = tcursor.selectionStart(); - int end = tcursor.selectionEnd(); - tmp = tmp.mid(start, end - start).trimmed(); - if(tmp.isEmpty()) { - *errmsg = tr("Selection is empty. Please select some text, or check \"Apply all\""); - return false; - } - - lines = tmp.split('\n', QString::SkipEmptyParts); - } - /* First pass: parsing */ - int i = 0; - foreach(QString line, lines) { - i++; - line = line.trimmed(); - if(line.startsWith("#")) continue; // Skip commentaries - parts = line.split(" ", QString::SkipEmptyParts); - if(parts.count() < 2) { - *errmsg = tr("Error at line %1: \"%2\"").arg(i).arg(line); - return false; - } - } - /* Second pass: setting */ - QHash<QString,QString> settings; - foreach(QString line, lines) { - line = line.trimmed(); - parts = line.split(" ", QString::SkipEmptyParts); - key = parts[0]; - parts.removeFirst(); - val = parts.join(" "); - settings.insert(key, val); - } - - if(!tc->setConf(settings, errmsg)) return false; - - return true; + return Vidalia::torrc()->setRawContents(ui.teditTorrc->toPlainText(), + errmsg, Vidalia::torControl()); } /** Loads the saved torrc file that Tor's using to the TextEdit widget for @@ -144,20 +96,18 @@ TorrcDialog::parseAndSet(QString *errmsg) void TorrcDialog::loadTorrc() { - if(tc && tc->isConnected()) { - QString text = ""; - QFile file(tc->getInfo("config-file").toString()); - if(file.open(QFile::ReadOnly)) { - QTextStream in(&file); - QString line = ""; - do { - line = in.readLine(); - text += line + "\n"; - } while(!line.isNull()); - ui.teditTorrc->setText(text); - } else { - QMessageBox::critical(this, tr("Error"), tr("An error ocurred while opening torrc file")); - } + QString text = ""; + QFile file(Vidalia::torrc()->getTorrcPath()); + if(file.open(QFile::ReadOnly)) { + QTextStream in(&file); + QString line = ""; + do { + line = in.readLine(); + text += line + "\n"; + } while(!line.isNull()); + ui.teditTorrc->setText(text); + } else { + QMessageBox::critical(this, tr("Error"), tr("An error ocurred while opening torrc file")); } } @@ -167,17 +117,9 @@ void TorrcDialog::saveTorrc() { QString errmsg = ""; - if(tc && tc->isConnected()) { - if(!parseAndSet(&errmsg)) { - QMessageBox::critical(this, tr("Error"), errmsg); - return; - } - if(ui.chkSave->isChecked()) { - if(!tc->saveConf(&errmsg)) { - QMessageBox::critical(this, tr("Error"), errmsg); - return; - } - } + if(!parseAndSet(&errmsg)) { + QMessageBox::critical(this, tr("Error"), errmsg); + return; } accept(); } diff --git a/src/vidalia/config/TorrcDialog.ui b/src/vidalia/config/TorrcDialog.ui index 46ac151..5e55d79 100644 --- a/src/vidalia/config/TorrcDialog.ui +++ b/src/vidalia/config/TorrcDialog.ui @@ -50,49 +50,6 @@ </widget> </item> <item> - <layout class="QHBoxLayout" name="hLayout"> - <item> - <widget class="QRadioButton" name="rdoAll"> - <property name="text"> - <string>Apply all</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="rdoSelection"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Apply selection only</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QCheckBox" name="chkSave"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Save settings. If unchecked it will only apply settings to the current Tor instance.</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum>

1 0

[vidalia/alpha] Improve GeoIP lookup
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 1999b2fd72e3e3a68a6414d4ef4606a5898bf648 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Feb 13 12:35:59 2012 -0300 Improve GeoIP lookup --- cmake/FindGeoIP.cmake | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/cmake/FindGeoIP.cmake b/cmake/FindGeoIP.cmake index 76986bf..9554082 100644 --- a/cmake/FindGeoIP.cmake +++ b/cmake/FindGeoIP.cmake @@ -16,18 +16,22 @@ message(STATUS "Looking for MaxMind GeoIP header files") set(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH} ${GEOIP_INCLUDE_DIR}") -check_include_file("GeoIP.h" HAVE_GEOIP_H) -check_include_file("GeoIPCity.h" HAVE_GEOIPCITY_H) -if (HAVE_GEOIP_H AND HAVE_GEOIPCITY_H) +find_path(GEOIP_INCLUDE_DIR + NAMES GeoIP.h GeoIPCity.h + PATHS ${GEOIP_INCLUDE_DIR} +) + +if (GEOIP_INCLUDE_DIR) message(STATUS "Looking for MaxMind GeoIP header files - found") -else(HAVE_GEOIP_H AND HAVE_GEOIPCITY_H) +else(GEOIP_INCLUDE_DIR) message(FATAL_ERROR "Could not find one or more MaxMind GeoIP header files. If the MaxMind GeoIP library is installed, you can run CMake again and specify its location with -DGEOIP_INCLUDE_DIR=<path>") -endif(HAVE_GEOIP_H AND HAVE_GEOIPCITY_H) +endif(GEOIP_INCLUDE_DIR) message(STATUS "Looking for MaxMind GeoIP libraries") -find_library(GEOIP_LIB - NAMES GeoIP geoip - PATHS ${GEOIP_LIBRARY_DIR} +find_file(GEOIP_LIB + NAMES libGeoIP.a + PATHS ${GEOIP_LIBRARY_DIR}/.libs/ + HINTS ${GEOIP_LIBRARY_DIR}/.libs/ ) if (GEOIP_LIB) message(STATUS "Looking for MaxMind GeoIP libraries - found")

1 0