- tor-commits - lists.torproject.org

[vidalia/alpha] Add non hardcoded defaults handling
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit cdc250c8159a25a9b4a7bb3e386c87f9fc6b4ca7 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 19:38:05 2012 -0300 Add non hardcoded defaults handling Also removes temporary files that shouldn't have been there in the first place. --- src/vidalia/config/VSettings.cpp | 11 +- src/vidalia/config/VSettings.h | 7 +- src/vidalia/config/VidaliaSettings.cpp~ | 396 ------------------------------- src/vidalia/config/VidaliaSettings.h~ | 163 ------------- 4 files changed, 16 insertions(+), 561 deletions(-) diff --git a/src/vidalia/config/VSettings.cpp b/src/vidalia/config/VSettings.cpp index ca8cdd4..020485b 100644 --- a/src/vidalia/config/VSettings.cpp +++ b/src/vidalia/config/VSettings.cpp @@ -20,16 +20,25 @@ /** The file in which all settings will read and written. */ #define SETTINGS_FILE (Vidalia::dataDirectory() + "/vidalia.conf") +#define SETTINGS_DEFAULTS_FILE (Vidalia::dataDirectory() + "/vidalia.defaults.conf") /** Constructor */ VSettings::VSettings(const QString settingsGroup) : QSettings(SETTINGS_FILE, QSettings::IniFormat) { + _defaultSettings = new QSettings(SETTINGS_DEFAULTS_FILE, + QSettings::IniFormat); + if (!settingsGroup.isEmpty()) beginGroup(settingsGroup); } +VSettings::~VSettings() +{ + delete _defaultSettings; +} + /** Returns the location of Vidalia's configuration settings file. */ QString VSettings::settingsFile() @@ -70,7 +79,7 @@ VSettings::setValue(const QString &key, const QVariant &val) void VSettings::setDefault(const QString &key, const QVariant &val) { - _defaults.insert(key, val); + _defaults.insert(key, _defaultSettings->value(key, val)); } /** Returns the default setting value associated with key. If diff --git a/src/vidalia/config/VSettings.h b/src/vidalia/config/VSettings.h index 50357fc..539f9a8 100644 --- a/src/vidalia/config/VSettings.h +++ b/src/vidalia/config/VSettings.h @@ -29,7 +29,9 @@ public: * set a prefix that will be prepended to keys specified to VSettings in * value() and setValue(). */ VSettings(const QString group = QString()); - + /** Default destructor */ + ~VSettings(); + /** Returns the location of Vidalia's configuration settings file. */ static QString settingsFile(); /** Returns true if Vidalia's configuration settings file already exists. */ @@ -67,6 +69,9 @@ private: /** Stores values that last as long as Vidalia lives as a process */ QMap<QString, QVariant> _volatileSettings; + + /** Defaults stored in a settings file */ + QSettings *_defaultSettings; }; #endif diff --git a/src/vidalia/config/VidaliaSettings.cpp~ b/src/vidalia/config/VidaliaSettings.cpp~ deleted file mode 100644 index 6e468fa..0000000 --- a/src/vidalia/config/VidaliaSettings.cpp~ +++ /dev/null @@ -1,396 +0,0 @@ -/* -** 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 VidaliaSettings.cpp -** \brief General Vidalia settings, such as language and interface style -*/ - -#include "VidaliaSettings.h" -#include "LanguageSupport.h" -#include "Vidalia.h" -#if defined(Q_WS_WIN) -#include "win32.h" -#endif - -#include <QDir> -#include <QCoreApplication> -#include <QStyleFactory> - -#define SETTING_LANGUAGE "LanguageCode" -#define SETTING_STYLE "InterfaceStyle" -#define SETTING_RUN_TOR_AT_START "RunTorAtStart" -#define SETTING_DATA_DIRECTORY "DataDirectory" -#define SETTING_SHOW_MAINWINDOW_AT_START "ShowMainWindowAtStart" -#define SETTING_BROWSER_EXECUTABLE "BrowserExecutable" -#define SETTING_BROWSER_DIRECTORY "BrowserDirectory" -#define SETTING_IM_EXECUTABLE "IMExecutable" -#define SETTING_RUN_PROXY_AT_START "RunProxyAtStart" -#define SETTING_PROXY_EXECUTABLE "ProxyExecutable" -#define SETTING_PROXY_EXECUTABLE_ARGUMENTS "ProxyExecutableArguments" -#define SETTING_CHECK_FOR_UPDATES "CheckForUpdates" -#define SETTING_LAST_UPDATE_CHECK "LastUpdateCheck" -#define SETTING_USE_LOCAL_GEOIP_DATABASE "UseLocalGeoIpDatabase" -#define SETTING_LOCAL_GEOIP_DATABASE "LocalGeoIpDatabase" -#define SETTING_PLUGIN_PATH "PluginPath" -#define SETTING_SKIP_VERSION_CHECK "SkipVersionCheck" - -#if defined(Q_OS_WIN32) -#define STARTUP_REG_KEY "Software\\Microsoft\\Windows\\CurrentVersion\\Run" -#define VIDALIA_REG_KEY "Vidalia" -#endif - -#define SETTING_ICON_PREF "IconPref" - -/** Default Constructor */ -VidaliaSettings::VidaliaSettings() -{ -#if defined(Q_WS_MAC) - setDefault(SETTING_STYLE, "macintosh (aqua)"); -#else - static QStringList styles = QStyleFactory::keys(); -#if defined(Q_WS_WIN) - if (styles.contains("windowsvista", Qt::CaseInsensitive)) - setDefault(SETTING_STYLE, "windowsvista"); - else -#endif - { - if (styles.contains("cleanlooks", Qt::CaseInsensitive)) - setDefault(SETTING_STYLE, "cleanlooks"); - else - setDefault(SETTING_STYLE, "plastique"); - } -#endif - - setDefault(SETTING_LANGUAGE, LanguageSupport::defaultLanguageCode()); - setDefault(SETTING_RUN_TOR_AT_START, true); - setDefault(SETTING_SHOW_MAINWINDOW_AT_START, true); - setDefault(SETTING_BROWSER_EXECUTABLE, ""); - setDefault(SETTING_IM_EXECUTABLE, ""); - setDefault(SETTING_RUN_PROXY_AT_START, false); - setDefault(SETTING_PROXY_EXECUTABLE, ""); - setDefault(SETTING_PROXY_EXECUTABLE_ARGUMENTS, QString()); -#if defined(Q_WS_WIN) - setDefault(SETTING_CHECK_FOR_UPDATES, true); -#else - setDefault(SETTING_CHECK_FOR_UPDATES, false); -#endif - setDefault(SETTING_LAST_UPDATE_CHECK, QDateTime()); - setDefault(SETTING_USE_LOCAL_GEOIP_DATABASE, false); - setDefault(SETTING_LOCAL_GEOIP_DATABASE, ""); - - setDefault(SETTING_PLUGIN_PATH, vApp->dataDirectory()); - setDefault(SETTING_ICON_PREF, Both); -<<<<<<< HEAD - setDefault(SETTING_SKIP_VERSION_CHECK, false); -======= - setDefault(SETTING_REMEMBER_SHUTDOWN, false); ->>>>>>> bug4577_remember -} - -/** Gets the currently preferred language code for Vidalia. */ -QString -VidaliaSettings::getLanguageCode() -{ - return value(SETTING_LANGUAGE).toString(); -} - -/** Sets the preferred language code. */ -void -VidaliaSettings::setLanguageCode(QString languageCode) -{ - setValue(SETTING_LANGUAGE, languageCode); -} - -/** Gets the interface style key (e.g., "windows", "motif", etc.) */ -QString -VidaliaSettings::getInterfaceStyle() -{ - return value(SETTING_STYLE).toString(); -} - -/** Sets the interface style key. */ -void -VidaliaSettings::setInterfaceStyle(QString styleKey) -{ - setValue(SETTING_STYLE, styleKey); -} - -/** Returns true if Tor is to be run when Vidalia starts. */ -bool -VidaliaSettings::runTorAtStart() -{ - return value(SETTING_RUN_TOR_AT_START).toBool(); -} - -/** If run is set to true, then Tor will be run when Vidalia starts. */ -void -VidaliaSettings::setRunTorAtStart(bool run) -{ - setValue(SETTING_RUN_TOR_AT_START, run); -} - -/** Returns true if Vidalia's main window should be visible when the - * application starts. */ -bool -VidaliaSettings::showMainWindowAtStart() -{ - return value(SETTING_SHOW_MAINWINDOW_AT_START).toBool(); -} - -/** Sets whether to show Vidalia's main window when the application starts. */ -void -VidaliaSettings::setShowMainWindowAtStart(bool show) -{ - setValue(SETTING_SHOW_MAINWINDOW_AT_START, show); -} - - -/** Returns true if Vidalia is set to run on system boot. */ -bool -VidaliaSettings::runVidaliaOnBoot() -{ -#if defined(Q_WS_WIN) - if (!win32_registry_get_key_value(STARTUP_REG_KEY, VIDALIA_REG_KEY).isEmpty()) { - return true; - } else { - return false; - } -#else - /* Platforms other than windows aren't supported yet */ - return false; -#endif -} - -/** If run is set to true, then Vidalia will run on system boot. */ -void -VidaliaSettings::setRunVidaliaOnBoot(bool run) -{ -#if defined(Q_WS_WIN) - if (run) { - win32_registry_set_key_value(STARTUP_REG_KEY, VIDALIA_REG_KEY, - QString("\"" + - QDir::convertSeparators(QCoreApplication::applicationFilePath())) + - "\""); - } else { - win32_registry_remove_key(STARTUP_REG_KEY, VIDALIA_REG_KEY); - } -#else - /* Platforms othe rthan windows aren't supported yet */ - Q_UNUSED(run); - return; -#endif -} - -/** If browserDirectory is empty, returns a fully-qualified path to - * the web browser, including the executable name. If browserDirectory - * is set, then returns the basename of the configured web browser */ -QString -VidaliaSettings::getBrowserExecutable() const -{ - return QDir::convertSeparators(value(SETTING_BROWSER_EXECUTABLE).toString()); -} - -/** Sets the location and name of the web browser executable to the given string. - * If set to the empty string, the browser will not be started. */ -void -VidaliaSettings::setBrowserExecutable(const QString &browserExecutable) -{ - setValue(SETTING_BROWSER_EXECUTABLE, browserExecutable); -} - -/** Returns a fully-qualified path to the web browser directory */ -QString -VidaliaSettings::getBrowserDirectory() const -{ - return QDir::convertSeparators(value(SETTING_BROWSER_DIRECTORY).toString()); -} - -/** Sets the location and name of the web browser directory to the given string. - * If set to the empty string, the browser will not be started. */ -void -VidaliaSettings::setBrowserDirectory(const QString &browserDirectory) -{ - setValue(SETTING_BROWSER_DIRECTORY, browserDirectory); -} - -/** Returns a fully-qualified path to the IM client, including the - * executable name. */ -QString -VidaliaSettings::getIMExecutable() const -{ - return QDir::convertSeparators(value(SETTING_IM_EXECUTABLE).toString()); -} - -/** Sets the location and name of the IM client executable to the given string. - * If set to the empty string, the client will not be started. */ -void -VidaliaSettings::setIMExecutable(const QString &IMExecutable) -{ - setValue(SETTING_IM_EXECUTABLE, IMExecutable); -} - -/** Returns true if Vidalia should start a proxy application when it - * starts. */ -bool -VidaliaSettings::runProxyAtStart() -{ - return value(SETTING_RUN_PROXY_AT_START).toBool(); -} - -/** Set whether to run a proxy application when Vidalia starts. */ -void -VidaliaSettings::setRunProxyAtStart(bool run) -{ - setValue(SETTING_RUN_PROXY_AT_START, run); -} - -/** Returns a fully-qualified path to the proxy server, including the - * executable name. */ -QString -VidaliaSettings::getProxyExecutable() const -{ - return QDir::convertSeparators(value(SETTING_PROXY_EXECUTABLE).toString()); -} - -/** Sets the location and name of the proxy server executable to the given - * string. If set to the empty string, the proxy will not be started. */ -void -VidaliaSettings::setProxyExecutable(const QString &proxyExecutable) -{ - setValue(SETTING_PROXY_EXECUTABLE, proxyExecutable); -} - -/** Returns a string containing additional command line arguments to be passed - * to ProxyExecutable */ -QString -VidaliaSettings::getProxyExecutableArguments() const -{ - return value(SETTING_PROXY_EXECUTABLE_ARGUMENTS).toString(); -} - -/** Sets the additional arguments to be passed to Proxy Executable */ -void -VidaliaSettings::setProxyExecutableArguments(const QString - &proxyExecutableArguments) -{ - setValue(SETTING_PROXY_EXECUTABLE_ARGUMENTS, proxyExecutableArguments); -} - -bool -VidaliaSettings::isAutoUpdateEnabled() const -{ - return value(SETTING_CHECK_FOR_UPDATES).toBool(); -} - -void -VidaliaSettings::setAutoUpdateEnabled(bool enabled) -{ - setValue(SETTING_CHECK_FOR_UPDATES, enabled); -} - -QDateTime -VidaliaSettings::lastCheckedForUpdates() const -{ - return value(SETTING_LAST_UPDATE_CHECK).toDateTime(); -} - -void -VidaliaSettings::setLastCheckedForUpdates(const QDateTime &checkedAt) -{ - setValue(SETTING_LAST_UPDATE_CHECK, checkedAt); -} - -bool -VidaliaSettings::useLocalGeoIpDatabase() const -{ - return value(SETTING_USE_LOCAL_GEOIP_DATABASE).toBool(); -} - -void -VidaliaSettings::setUseLocalGeoIpDatabase(bool enabled) -{ - setValue(SETTING_USE_LOCAL_GEOIP_DATABASE, enabled); -} - -QString -VidaliaSettings::localGeoIpDatabase() const -{ - return QDir::convertSeparators(value(SETTING_LOCAL_GEOIP_DATABASE).toString()); -} - -void -VidaliaSettings::setLocalGeoIpDatabase(const QString &databaseFile) -{ - setValue(SETTING_LOCAL_GEOIP_DATABASE, databaseFile); -} - -QString -VidaliaSettings::pluginPath() const -{ - return QDir::convertSeparators(value(SETTING_PLUGIN_PATH).toString()); -} - -void -VidaliaSettings::setPluginPath(const QString &path) -{ - setValue(SETTING_PLUGIN_PATH, path); -} - -/** Get the icon preference */ -VidaliaSettings::IconPosition -VidaliaSettings::getIconPref() -{ - return fromString(value(SETTING_ICON_PREF).toString()); -} - -/** Set the icon preference */ -void -VidaliaSettings::setIconPref(const IconPosition iconPref) -{ - setValue(SETTING_ICON_PREF, toString(iconPref)); -} - -QString -VidaliaSettings::toString(const IconPosition iconPref) -{ - switch(iconPref) { - case Dock: return "Dock"; - case Tray: return "Tray"; - default: return "Both"; - } -} - -VidaliaSettings::IconPosition -VidaliaSettings::fromString(QString iconPref) -{ - if(iconPref == "Dock") return Dock; - if(iconPref == "Tray") return Tray; - - return Both; -} - -bool -<<<<<<< HEAD -VidaliaSettings::skipVersionCheck() const -{ - return value(SETTING_SKIP_VERSION_CHECK).toBool(); -======= -VidaliaSettings::rememberShutdown() -{ - return value(SETTING_REMEMBER_SHUTDOWN).toBool(); -} - -void -VidaliaSettings::setRememberShutdown(bool val) -{ - setValue(SETTING_REMEMBER_SHUTDOWN, val); ->>>>>>> bug4577_remember -} diff --git a/src/vidalia/config/VidaliaSettings.h~ b/src/vidalia/config/VidaliaSettings.h~ deleted file mode 100644 index 75c0b7a..0000000 --- a/src/vidalia/config/VidaliaSettings.h~ +++ /dev/null @@ -1,163 +0,0 @@ -/* -** 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 VidaliaSettings.h -** \brief General Vidalia settings, such as language and interface style -*/ - -#ifndef _VIDALIASETTINGS_H -#define _VIDALIASETTINGS_H - -#include "VSettings.h" - -#include <QDateTime> - -/** Public setting keys */ -#define SETTING_REMEMBER_SHUTDOWN "RememberShutdown" - -/** Handles saving and restoring Vidalia's settings, such as the - * location of Tor, the control port, etc. - * - * NOTE: Qt 4.1 documentation states that constructing a QSettings object is - * "very fast", so we shouldn't need to create a global instance of this - * class. - */ -class VidaliaSettings : public VSettings -{ - Q_OBJECT - -public: - enum IconPosition { - Tray, - Dock, - Both, - }; - - /** Default constructor. */ - VidaliaSettings(); - - /** Gets the currently preferred language code for Vidalia. */ - QString getLanguageCode(); - /** Saves the preferred language code. */ - void setLanguageCode(QString languageCode); - - /** Gets the interface style key (e.g., "windows", "motif", etc.) */ - QString getInterfaceStyle(); - /** Sets the interface style key. */ - void setInterfaceStyle(QString styleKey); - - /** Returns true if Vidalia should start Tor when it starts. */ - bool runTorAtStart(); - /** Set whether to run Tor when Vidalia starts. */ - void setRunTorAtStart(bool run); - - /** Returns true if Vidalia's main window should be visible when the - * application starts. */ - bool showMainWindowAtStart(); - /** Sets whether to show Vidalia's main window when the application starts. */ - void setShowMainWindowAtStart(bool show); - - /** Returns true if Vidalia should start on system boot. */ - bool runVidaliaOnBoot(); - /** Set whether to run Vidalia on system boot. */ - void setRunVidaliaOnBoot(bool run); - - /** If browserDirectory is empty, returns a fully-qualified path to - * the web browser, including the executable name. If browserDirectory - * is set, then returns the basename of the configured web browser */ - QString getBrowserExecutable() const; - /** Sets the location and name of the web browser executable to the given - * string. If set to the empty string, the browser will not be started. */ - void setBrowserExecutable(const QString &browserExecutable); - - /** Returns a fully-qualified path to the web browser directory */ - QString getBrowserDirectory() const; - /** Sets the location and name of the web browser directory to the given string. - * If set to the empty string, the browser will not be started. */ - void setBrowserDirectory(const QString &browserDirectory); - - /** Returns a fully-qualified path to the IM client, including the - * executable name. */ - QString getIMExecutable() const; - /** Sets the location and name of the IM client executable to the given - * string. If set to the empty string, the client will not be started. */ - void setIMExecutable(const QString &IMExecutable); - - /** Returns true if Vidalia should start a proxy application when it - * starts. */ - bool runProxyAtStart(); - /** Set whether to run a proxy application when Vidalia starts. */ - void setRunProxyAtStart(bool run); - - /** Returns a fully-qualified path to the proxy server, including the - * executable name. */ - QString getProxyExecutable() const; - /** Sets the location and name of the proxy server executable to the given - * string. If set to the empty string, the proxy will not be started. */ - void setProxyExecutable(const QString &proxyExecutable); - - /** Returns a list containing additional command line arguments to be - * passed to ProxyExecutable */ - QString getProxyExecutableArguments() const; - /** Sets the additional arguments to be passed to Proxy Executable */ - void setProxyExecutableArguments(const QString &proxyExecutableArguments); - - /** Returns true if Vidalia should automatically check for software updates. - */ - bool isAutoUpdateEnabled() const; - /** Sets to enabled whether Vidalia should automatically check for - * software updates or not. */ - void setAutoUpdateEnabled(bool enabled); - - /** Returns the time at which Vidalia last checked for software updates. */ - QDateTime lastCheckedForUpdates() const; - /** Sets to checkedAt the time at which Vidalia last checked for - * available software updates. */ - void setLastCheckedForUpdates(const QDateTime &checkedAt); - - /** Returns true if Vidalia is currently configured to use a local GeoIP - * database. */ - bool useLocalGeoIpDatabase() const; - /** Enables or disables use of a local GeoIP database. */ - void setUseLocalGeoIpDatabase(bool enabled); - - /** Returns the file, if set, to be used as the local GeoIP database. */ - QString localGeoIpDatabase() const; - /** Sets the file to use as a local GeoIP database. */ - void setLocalGeoIpDatabase(const QString &databaseFile); - - /** Returns the path where the plugins live */ - QString pluginPath() const; - /** Sets the path where the plugins live */ - void setPluginPath(const QString &path); - - /** Get the icon preference */ - IconPosition getIconPref(); - - /** Set the icon preference */ - void setIconPref(const IconPosition iconPref); - QString toString(const IconPosition iconPref); - IconPosition fromString(QString iconPref); - -<<<<<<< HEAD - /** Returns true if Vidalia should skip the version check for tor */ - bool skipVersionCheck() const; -======= - /** Returns true if Vidalia should not ask if the user wants to shutdown - * tor gracefully */ - bool rememberShutdown(); - /** Sets RememberShutdown to val */ - void setRememberShutdown(bool val); ->>>>>>> bug4577_remember -}; - -#endif -

1 0

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

05 Mar '12

commit 2f3d0ab98e13a2779b03eed808ca97e554740d0d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 10:11:38 2012 -0300 Add a changes file --- changes/bug5277 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug5277 b/changes/bug5277 new file mode 100644 index 0000000..997971c --- /dev/null +++ b/changes/bug5277 @@ -0,0 +1,3 @@ + o Change the wording from New Identity to New Circuit. For a proper + New Identity while browsing, TorButton's solution should be + used. Fixes bug 5277. \ No newline at end of file

1 0

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

05 Mar '12

commit aab37942e01681a3f18d4a0af6fdd70eb702f016 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 19:42:44 2012 -0300 Add a changes file --- changes/featDefaultSettings | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/featDefaultSettings b/changes/featDefaultSettings new file mode 100644 index 0000000..c8c9798 --- /dev/null +++ b/changes/featDefaultSettings @@ -0,0 +1,6 @@ + o Add a way to handle default settings through a file instead of + just the hardcoded values. Vidalia will look for a + vidalia.defaults.conf file in the same place the vidalia.conf file + is, and from it it will read the default values for each + configuration option or fall back to the hardcoded default if the + key isn't present. \ No newline at end of file

1 0

r25507: {website} sebastian signed a tbb once (website/trunk/docs/en)
by Roger Dingledine 05 Mar '12

05 Mar '12

Author: arma Date: 2012-03-05 22:13:51 +0000 (Mon, 05 Mar 2012) New Revision: 25507 Modified: website/trunk/docs/en/signing-keys.wml Log: sebastian signed a tbb once Modified: website/trunk/docs/en/signing-keys.wml =================================================================== --- website/trunk/docs/en/signing-keys.wml 2012-03-05 16:48:03 UTC (rev 25506) +++ website/trunk/docs/en/signing-keys.wml 2012-03-05 22:13:51 UTC (rev 25507) @@ -32,7 +32,8 @@ <li>Karsten Loesing (0xF7C11265) signs the metrics archives and tools.</li> <li>Robert Hogan (0x22F6856F) signs torsocks release tarballs.</li> - <li>Sebastian Hahn (0xC5AA446D) signs Obfsproxy Tor Browser Bundles.</li> + <li>Sebastian Hahn (0xC5AA446D) signs Obfsproxy Tor Browser Bundles, + and sometimes signs the Tor Browser Bundles.</li> <li>Other developers include Peter Palfrader (0xC82E0039, or its subkey 0xE1DEC577) and Jacob Appelbaum (0xE012B42D).</li> </ul>

1 0

[ooni-probe/master] Merge branch 'master' of https://github.com/hellais/ooni-probe
by art＠torproject.org 05 Mar '12

05 Mar '12

commit b13aa4db0842c25d394e1d217d01f7418ba08fa0 Merge: 739229d af274db Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Sun Mar 4 23:01:36 2012 -0800 Merge branch 'master' of https://github.com/hellais/ooni-probe logo.py | 2 +- ooniprobe.py | 3 +- plugoo.py | 388 --------------------------------------------------- plugoo/__init__.py | 53 +++++++ plugoo/assets.py | 45 ++++++ plugoo/nodes.py | 71 ++++++++++ plugoo/reports.py | 170 ++++++++++++++++++++++ plugoo/tests.py | 105 ++++++++++++++ tests/bridget.py | 10 +- tests/dnstamper.py | 8 +- tests/traceroute.py | 7 +- 11 files changed, 461 insertions(+), 401 deletions(-)

1 0

[ooni-probe/master] Adding script for searching and adding PL nodes, .conf parameters, and class file for PL
by art＠torproject.org 05 Mar '12

05 Mar '12

commit 739229d24a3cc12cce0c2d8cf24e25d53f92b8b0 Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Sun Mar 4 21:52:04 2012 -0800 Adding script for searching and adding PL nodes, .conf parameters, and class file for PL --- addnodes.py | 59 +++++++++++++++++++++++++++++ ooni-probe.conf | 8 +++- planetlab/planetlab.py | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 163 insertions(+), 1 deletions(-) diff --git a/addnodes.py b/addnodes.py new file mode 100755 index 0000000..d6814a2 --- /dev/null +++ b/addnodes.py @@ -0,0 +1,59 @@ +#!/usr/bin/python +""" + addnodes.py + *********** + Script to add PlanetLab nodes to a slice. Takes an argument in the + form of a dictionary boot_state_filter, which searches for nodes which + match a pattern. Authentication patterns can be optionally defined in + ooniprobe.config. + + :copyright: (c)2012 Isis Lovecruft + :license: see LICENSE for more details +""" + +from ooniprobe import ooni +try: + import paramiko +except: + "Error: paramiko module was not found." +import pprint +try: + import pyXMLRPCssh +except: + "Error: pyXMLRPCssh module was not found. Please download and install from: https://pypi.python.org/pypi/pyXMLRPCssh/1.0-0" +import xmlrpclib + +class PlanetLab: + def __init__(self, ooni): + self.config = ooni.config + self.logger = ooni.logger + self.name = "PlanetLab" + + def api_auth(self): + api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/') + auth = {} + auth['Username'] = self.config.main.pl_username + auth['AuthString'] = self.config.main.pl_password + auth['AuthMethod'] = "password" + authorized = api_server.AuthCheck(auth) + + if authorized: + print 'We are authorized!' + return auth + else: + print 'Authorization failed. Please check the ooni-probe.conf file.' + + def search_for_nodes(self, boot_state_filter=None): + api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/') + boot_state_filter = {'hostname': '*.cert.org.cn'} + all_nodes = api_server.GetNodes(self.api_auth(), boot_state_filter) + pp = pprint.PrettyPrinter() + pp.pprint(all_nodes) + +def main(): + o = ooni() + pl = PlanetLab(o) + pl.search_for_nodes() + +if __name__=="__main__": + main() diff --git a/ooni-probe.conf b/ooni-probe.conf index 8ea67e3..1a0e607 100644 --- a/ooni-probe.conf +++ b/ooni-probe.conf @@ -1,6 +1,6 @@ # ooni-probe # -# These are the global configuration paramters necessary to +# These are the global configuration parameters necessary to # make ooni-probe work [main] reportdir = reports/ @@ -11,6 +11,12 @@ testdir = tests/ loglevel = DEBUG proxyaddress = 127.0.0.1:9050 +# The following configurations are for searching for PlanetLab +# nodes, adding them to a slice, and PlanetLab general API +# authentication: +pl_username = you(a)youraddress.com +pl_password = yourpassword + # These are configurations specific to the tests that should be # run by ooni-probe [tests] diff --git a/planetlab/planetlab.py b/planetlab/planetlab.py new file mode 100644 index 0000000..0a8648e --- /dev/null +++ b/planetlab/planetlab.py @@ -0,0 +1,97 @@ +#!/usr/bin/env python +""" + planetlab.py + ************ + + Classes for using ooni-probe with PlanetLab nodes. + + :copyright: (c)2012 Isis Lovecruft + :license: see LICENSE for more details +""" + +from binascii import hexlify +from ooniprobe import ooni +import os +import xmlrpclib +import pprint +try: + import paramiko +except: + print "Error: paramiko module is not installed." +try: + import pyXMLRPCssh +except: + print "Error: pyXMLRPCssh module was not found. Please download and install from : https://pypi.python.org/pypi/pyXMLRPCssh/1.0-0" + +class PlanetLab: + + """Defines a PlanetLab node""" + + ## should inherit from CODE EXEC NODE and NETWORK + ## ADD UNIT OF WORK, adds the unit to pl's schedule + ## needs GET STATUS method for reporting + ## needs upload() and run() private methods + + def __init__(self, ooni): + self.config = ooni.config + self.logger = ooni.logger + self.name = "PlanetLab" + + def api_auth(self): + api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/') + auth = {} + ## should be changed to separate node.conf file + auth['Username'] = self.config.main.pl_username + auth['AuthString'] = self.config.main.pl_password + auth['AuthMethod'] = "password" + authorized = api_server.AuthCheck(auth) + + if authorized: + print 'We are authorized!' + return auth + else: + print 'Authorization failed. Please check your settings for pl_username and pl_password in the ooni-probe.conf file.' + + def search_for_nodes(self, boot_state_filter=None): + api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/') + boot_state_filter = {'hostname': '*.cert.org.cn'} + all_nodes = api_server.GetNodes(self.api_auth(), boot_state_filter) + pp = pprint.PrettyPrinter() + pp.pprint(all_nodes) + + def auth_login(slicename, machinename): + """Attempt to authenticate to the given PL node, slicename and + machinename, using any of the private keys in ~/.ssh/ """ + + agent = paramiko.Agent() + agent_keys = agent.get_keys() + if len(agent_keys) == 0: + return + + for key in agent_keys: + print 'Trying ssh-agent key %s' % hexlify(key.get_fingerprint()), + try: + paramiko.transport.auth_publickey(machinename, slicename) + print 'Public key authentication to PlanetLab node %s successful.' % machinename, + return + except paramiko.SSHException: + print 'Public key authentication to PlanetLab node %s failed.' % machinename, + + def make_client(slicename, machinename, command): + """Attempt to make a standard OpenSSH client to PL node.""" + + command = PlanetLab.get_command() + + client = paramiko.SSHClient() + client.load_system_host_keys() + client.connect(machinename) + + stdin, stdout, stderr = client.exec_command(command) + + def send_files(files): + """Attempt to rsync a tree to the PL node. Requires PyRsync: + https://pypi.python.org/pypi/pyrsync/0.1.0""" + pass + + def get_command: + pass

1 0

[ooni-probe/master] Add docstrings and remove unnecessary import
by art＠torproject.org 05 Mar '12

05 Mar '12

commit ed5840cba69ed2c2a488c32ad193b53353f15b08 Author: Arturo Filastò <hellais(a)gmail.com> Date: Mon Mar 5 13:50:44 2012 -0800 Add docstrings and remove unnecessary import --- plugoo/nodes.py | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/plugoo/nodes.py b/plugoo/nodes.py index 320caa7..5b16d22 100644 --- a/plugoo/nodes.py +++ b/plugoo/nodes.py @@ -1,10 +1,21 @@ #!/usr/bin/env python # -*- coding: UTF-8 +""" + nodes + ***** + + This contains all the code related to Nodes + both network and code execution. + + :copyright: (c) 2012 by Arturo Filastò. + :license: see LICENSE for more details. + +""" -from binascii import hexlify -from ooniprobe import ooni import os -try: +from binascii import hexlify + +try: import paramiko except: print "Error: module paramiko is not installed." @@ -91,7 +102,7 @@ class PlanetLab(Node, CodeExecNode): def _api_auth(self): api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/') auth = {} - ## should be changed to separate node.conf file + ## should be changed to separate node.conf file auth['Username'] = self.config.main.pl_username auth['AuthString'] = self.config.main.pl_password auth['AuthMethod'] = "password" @@ -140,7 +151,7 @@ class PlanetLab(Node, CodeExecNode): pass def ssh_and_run_(slicename, machinename, command): - """Attempt to make a standard OpenSSH client to PL node, and run + """Attempt to make a standard OpenSSH client to PL node, and run commands from a .conf file.""" ## needs a way to specify 'ssh -l <slicename> <machinename>' @@ -157,9 +168,9 @@ class PlanetLab(Node, CodeExecNode): def send_files_to_node(directory, files): """Attempt to rsync a tree to the PL node.""" pass - + def add_unit: pass - + def get_status: pass

1 0

[ooni-probe/master] moved class PlanetLab to nodes.py, removed nodefinder script, updated .conf file for added parameters
by art＠torproject.org 05 Mar '12

05 Mar '12

commit fd5bfe89decac46cb5d6e3eee1454faac59a3f56 Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Mon Mar 5 13:00:15 2012 -0800 moved class PlanetLab to nodes.py, removed nodefinder script, updated .conf file for added parameters --- addnodes.py | 59 ----------------------------- ooni-probe.conf | 2 +- planetlab/planetlab.py | 97 ------------------------------------------------ plugoo/nodes.py | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 157 deletions(-) diff --git a/addnodes.py b/addnodes.py deleted file mode 100755 index d6814a2..0000000 --- a/addnodes.py +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/python -""" - addnodes.py - *********** - Script to add PlanetLab nodes to a slice. Takes an argument in the - form of a dictionary boot_state_filter, which searches for nodes which - match a pattern. Authentication patterns can be optionally defined in - ooniprobe.config. - - :copyright: (c)2012 Isis Lovecruft - :license: see LICENSE for more details -""" - -from ooniprobe import ooni -try: - import paramiko -except: - "Error: paramiko module was not found." -import pprint -try: - import pyXMLRPCssh -except: - "Error: pyXMLRPCssh module was not found. Please download and install from: https://pypi.python.org/pypi/pyXMLRPCssh/1.0-0" -import xmlrpclib - -class PlanetLab: - def __init__(self, ooni): - self.config = ooni.config - self.logger = ooni.logger - self.name = "PlanetLab" - - def api_auth(self): - api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/') - auth = {} - auth['Username'] = self.config.main.pl_username - auth['AuthString'] = self.config.main.pl_password - auth['AuthMethod'] = "password" - authorized = api_server.AuthCheck(auth) - - if authorized: - print 'We are authorized!' - return auth - else: - print 'Authorization failed. Please check the ooni-probe.conf file.' - - def search_for_nodes(self, boot_state_filter=None): - api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/') - boot_state_filter = {'hostname': '*.cert.org.cn'} - all_nodes = api_server.GetNodes(self.api_auth(), boot_state_filter) - pp = pprint.PrettyPrinter() - pp.pprint(all_nodes) - -def main(): - o = ooni() - pl = PlanetLab(o) - pl.search_for_nodes() - -if __name__=="__main__": - main() diff --git a/ooni-probe.conf b/ooni-probe.conf index 1a0e607..9563493 100644 --- a/ooni-probe.conf +++ b/ooni-probe.conf @@ -14,7 +14,7 @@ proxyaddress = 127.0.0.1:9050 # The following configurations are for searching for PlanetLab # nodes, adding them to a slice, and PlanetLab general API # authentication: -pl_username = you(a)youraddress.com +pl_username = yourusername pl_password = yourpassword # These are configurations specific to the tests that should be diff --git a/planetlab/planetlab.py b/planetlab/planetlab.py deleted file mode 100644 index 0a8648e..0000000 --- a/planetlab/planetlab.py +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env python -""" - planetlab.py - ************ - - Classes for using ooni-probe with PlanetLab nodes. - - :copyright: (c)2012 Isis Lovecruft - :license: see LICENSE for more details -""" - -from binascii import hexlify -from ooniprobe import ooni -import os -import xmlrpclib -import pprint -try: - import paramiko -except: - print "Error: paramiko module is not installed." -try: - import pyXMLRPCssh -except: - print "Error: pyXMLRPCssh module was not found. Please download and install from : https://pypi.python.org/pypi/pyXMLRPCssh/1.0-0" - -class PlanetLab: - - """Defines a PlanetLab node""" - - ## should inherit from CODE EXEC NODE and NETWORK - ## ADD UNIT OF WORK, adds the unit to pl's schedule - ## needs GET STATUS method for reporting - ## needs upload() and run() private methods - - def __init__(self, ooni): - self.config = ooni.config - self.logger = ooni.logger - self.name = "PlanetLab" - - def api_auth(self): - api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/') - auth = {} - ## should be changed to separate node.conf file - auth['Username'] = self.config.main.pl_username - auth['AuthString'] = self.config.main.pl_password - auth['AuthMethod'] = "password" - authorized = api_server.AuthCheck(auth) - - if authorized: - print 'We are authorized!' - return auth - else: - print 'Authorization failed. Please check your settings for pl_username and pl_password in the ooni-probe.conf file.' - - def search_for_nodes(self, boot_state_filter=None): - api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/') - boot_state_filter = {'hostname': '*.cert.org.cn'} - all_nodes = api_server.GetNodes(self.api_auth(), boot_state_filter) - pp = pprint.PrettyPrinter() - pp.pprint(all_nodes) - - def auth_login(slicename, machinename): - """Attempt to authenticate to the given PL node, slicename and - machinename, using any of the private keys in ~/.ssh/ """ - - agent = paramiko.Agent() - agent_keys = agent.get_keys() - if len(agent_keys) == 0: - return - - for key in agent_keys: - print 'Trying ssh-agent key %s' % hexlify(key.get_fingerprint()), - try: - paramiko.transport.auth_publickey(machinename, slicename) - print 'Public key authentication to PlanetLab node %s successful.' % machinename, - return - except paramiko.SSHException: - print 'Public key authentication to PlanetLab node %s failed.' % machinename, - - def make_client(slicename, machinename, command): - """Attempt to make a standard OpenSSH client to PL node.""" - - command = PlanetLab.get_command() - - client = paramiko.SSHClient() - client.load_system_host_keys() - client.connect(machinename) - - stdin, stdout, stderr = client.exec_command(command) - - def send_files(files): - """Attempt to rsync a tree to the PL node. Requires PyRsync: - https://pypi.python.org/pypi/pyrsync/0.1.0""" - pass - - def get_command: - pass diff --git a/plugoo/nodes.py b/plugoo/nodes.py index a76601d..320caa7 100644 --- a/plugoo/nodes.py +++ b/plugoo/nodes.py @@ -1,9 +1,21 @@ #!/usr/bin/env python # -*- coding: UTF-8 +from binascii import hexlify +from ooniprobe import ooni import os +try: + import paramiko +except: + print "Error: module paramiko is not installed." +from pprint import pprint +try: + import pyXMLRPCssh +except: + print "Error: module pyXMLRPCssh is not installed." import sys import socks +import xmlrpclib class Node(object): def __init__(self, address, port): @@ -68,4 +80,86 @@ class CodeExecNode(Node): def get_status(self): pass +class PlanetLab(Node, CodeExecNode): + def __init__(self, address, auth_creds, ooni): + self.auth_creds = auth_creds + + self.config = ooni.config + self.logger = ooni.logger + self.name = "PlanetLab" + + def _api_auth(self): + api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/') + auth = {} + ## should be changed to separate node.conf file + auth['Username'] = self.config.main.pl_username + auth['AuthString'] = self.config.main.pl_password + auth['AuthMethod'] = "password" + authorized = api_server.AuthCheck(auth) + + if authorized: + print 'We are authorized!' + return auth + else: + print 'Authorization failed. Please check your settings for pl_username and pl_password in the ooni-probe.conf file.' + + def _search_for_nodes(self, node_filter=None): + api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/', allow_none=True) + node_filter = {'hostname': '*.cert.org.cn'} + return_fields = ['hostname', 'site_id'] + all_nodes = api_server.GetNodes(self.api_auth(), node_filter, boot_state_filter) + pprint(all_nodes) + return all_nodes + def _add_nodes_to_slice(self): + api_server = xmlrpclib.ServerProxy('https://www.planet-lab.org/PLCAPI/', allow_none=True) + all_nodes = self.search_for_nodes() + for node in all_nodes: + api_server.AddNode(self.api_auth(), node['site_id'], all_nodes) + print 'Adding nodes %s' % node['hostname'] + + def _auth_login(slicename, machinename): + """Attempt to authenticate to the given PL node, slicename and + machinename, using any of the private keys in ~/.ssh/ """ + + agent = paramiko.Agent() + agent_keys = agent.get_keys() + if len(agent_keys) == 0: + return + + for key in agent_keys: + print 'Trying ssh-agent key %s' % hexlify(key.get_fingerprint()), + try: + paramiko.transport.auth_publickey(machinename, slicename) + print 'Public key authentication to PlanetLab node %s successful.' % machinename, + return + except paramiko.SSHException: + print 'Public key authentication to PlanetLab node %s failed.' % machinename, + + def _get_command: + pass + + def ssh_and_run_(slicename, machinename, command): + """Attempt to make a standard OpenSSH client to PL node, and run + commands from a .conf file.""" + + ## needs a way to specify 'ssh -l <slicename> <machinename>' + ## with public key authentication. + + command = PlanetLab.get_command() + + client = paramiko.SSHClient() + client.load_system_host_keys() + client.connect(machinename) + + stdin, stdout, stderr = client.exec_command(command) + + def send_files_to_node(directory, files): + """Attempt to rsync a tree to the PL node.""" + pass + + def add_unit: + pass + + def get_status: + pass

1 0

[obfsproxy/master] add a skeletal changelog file
by arma＠torproject.org 05 Mar '12

05 Mar '12

commit b5dc66a423240464df0776dd6afad36ccd5fc170 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Mar 5 15:00:30 2012 -0500 add a skeletal changelog file --- ChangeLog | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..aa68790 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,3 @@ +Changes in version 0.1.0 - 2012-03-05 + - Initial release. +

1 0

[obfsproxy/master] bump to a real initial version number
by arma＠torproject.org 05 Mar '12

05 Mar '12

commit dbb905231171f3531a185eff7704812baa18049e Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Mar 5 15:01:09 2012 -0500 bump to a real initial version number --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 38deb3d..cf5bd43 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.61])dnl Possibly earlier will do, but this is what I have -AC_INIT([obfsproxy], [0.0]) +AC_INIT([obfsproxy], [0.1.0]) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign nostdinc])

1 0