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

[flashproxy/master] Make the protocol implicit in embed.html.
by dcf＠torproject.org 10 Jul '12

10 Jul '12

commit af9fb3a6ae729b43078b524671ef825194928012 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 17:25:17 2012 -0700 Make the protocol implicit in embed.html. --- embed.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/embed.html b/embed.html index 1c4e619..0c85f3c 100644 --- a/embed.html +++ b/embed.html @@ -80,7 +80,7 @@ body { flashproxy_badge_insert().start(); </script> <noscript> -<table id="flashproxy-badge"><tr><td><a href="http://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" alt="Internet freedom"></a></td></tr></table> +<table id="flashproxy-badge"><tr><td><a href="//crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" alt="Internet freedom"></a></td></tr></table> </noscript> </body> </html>

1 0

[vidalia/alpha] Fix includes for crypto in Linux
by chiiph＠torproject.org 10 Jul '12

10 Jul '12

commit 541371a7a36cccfee8081a2558639357fc18f1c0 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jul 9 20:19:35 2012 -0300 Fix includes for crypto in Linux --- src/common/crypto.cpp | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/common/crypto.cpp b/src/common/crypto.cpp index 5ae5295..70689a9 100644 --- a/src/common/crypto.cpp +++ b/src/common/crypto.cpp @@ -61,6 +61,11 @@ #include <wincrypt.h> #endif +#if defined(Q_OS_LINUX) +#include <stdint.h> +#include <arpa/inet.h> +#endif + /** Returns up to <b>len</b> bytes of pseudorandom data on success, or an empty * QByteArray on failure. The caller should verify that the returned

1 0

[vidalia-plugins/master] Check whether to show the tray icon message using settings
by chiiph＠torproject.org 10 Jul '12

10 Jul '12

commit 96351750f8b6dda629c970c417d313f780669cef Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jul 9 18:31:43 2012 -0300 Check whether to show the tray icon message using settings --- tbb/tbb.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbb/tbb.js b/tbb/tbb.js index d23f77c..124c855 100644 --- a/tbb/tbb.js +++ b/tbb/tbb.js @@ -343,7 +343,7 @@ var tbb = { }, showWaitDialog: function() { - if (this.chkTrayShow.checkState() == Qt.Checked) { + if (this.tab.getSetting("DontShowTrayBox", "false") != "true") { if(QSystemTrayIcon.supportsMessages()) { if (this.browserProcess.state() == QProcess.Running) { VidaliaMainWindow.

1 0

[vidalia-plugins/master] Separate -profile from the actual path
by chiiph＠torproject.org 10 Jul '12

10 Jul '12

commit 8be5414a34b2fa4f5e39b7476c7f9659b05d778c Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun May 20 19:59:07 2012 -0300 Separate -profile from the actual path --- tbb/tbb.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbb/tbb.js b/tbb/tbb.js index c034fdb..d23f77c 100644 --- a/tbb/tbb.js +++ b/tbb/tbb.js @@ -250,7 +250,7 @@ var tbb = { /* Build the command line arguments */ /* Is this better or worse than MOZ_NO_REMOTE? */ var commandLine = "-no-remote "; - commandLine += "-profile"; + commandLine += "-profile "; commandLine += "\"" + profileDir + "\""; /* Launch the browser */

1 0

[vidalia-plugins/master] Make tbb.js respect the new path criteria
by chiiph＠torproject.org 10 Jul '12

10 Jul '12

commit 543e96e4af7e8c77f10790232bf5d5913ec8254f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu May 17 23:06:04 2012 -0300 Make tbb.js respect the new path criteria --- tbb/tbb.js | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/tbb/tbb.js b/tbb/tbb.js index 8955d9d..c034fdb 100644 --- a/tbb/tbb.js +++ b/tbb/tbb.js @@ -42,7 +42,11 @@ var tbb = { // Load the GUI file this.tab = new VidaliaTab("Browser Bundle Settings", "TBB"); - var file = new QFile(pluginPath+"/tbb/tbb.ui"); + var uiPath = pluginPath+"/tbb/tbb.ui"; + if((new QDir(uiPath)).isRelative()) + uiPath = QCoreApplication.applicationDirPath()+"/"+uiPath; + + var file = new QFile(uiPath); var loader = new QUiLoader(this.tab); file.open(QIODevice.ReadOnly); this.widget = loader.load(file); @@ -205,7 +209,7 @@ var tbb = { vdebug("TBB@launchBrowserFromDirectory"); /** Directory for the browser */ var browserDirectory = this.tab.getSetting(this.BrowserDirectory, ""); - if(QDir(browserDirectory).isRelative()) + if(new QDir(browserDirectory).isRelative()) browserDirectory = QDir.toNativeSeparators(QCoreApplication.applicationDirPath() + "/" + browserDirectory); @@ -223,7 +227,7 @@ var tbb = { /** Relative path to the default plugins directory from the browserDirectory */ var defaultPluginsDirectory = QDir.toNativeSeparators(this.tab.getSetting(this.DefaultPluginsDirectory, "")); - var profileDir = browserDirectory + "/" + profileDirectory; + var profileDir = (new QDir(browserDirectory + "/" + profileDirectory)).canonicalPath(); this.browserProcess.setEnvironment(this.updateBrowserEnv()); @@ -232,22 +236,22 @@ var tbb = { /* Copy the profile directory if it's not already there */ if (!browserDirObj.exists(profileDirectory)) { browserDirObj.mkdir(profileDirectory); - this.copy_dir(browserDirectory + "/" + defaultProfileDirectory, - browserDirectory + "/" + profileDirectory); + this.copy_dir((new QDir(browserDirectory + "/" + defaultProfileDirectory)).canonicalPath(), + (new QDir(browserDirectory + "/" + profileDirectory)).canonicalPath()); } /* Copy the plugins directory if it's not already there */ if (!browserDirObj.exists(pluginsDirectory)) { browserDirObj.mkdir(pluginsDirectory); - this.copy_dir(browserDirectory + "/" + defaultPluginsDirectory, - browserDirectory + "/" + pluginsDirectory); + this.copy_dir((new QDir(browserDirectory + "/" + defaultPluginsDirectory)).canonicalPath(), + (new QDir(browserDirectory + "/" + pluginsDirectory)).canonicalPath()); } /* Build the command line arguments */ /* Is this better or worse than MOZ_NO_REMOTE? */ var commandLine = "-no-remote "; - commandLine += "-profile "; - commandLine += profileDir; + commandLine += "-profile"; + commandLine += "\"" + profileDir + "\""; /* Launch the browser */ this.browserProcess.start(browserExecutable, commandLine); @@ -268,10 +272,6 @@ var tbb = { QCoreApplication.processEvents(); } - if(!torControl.isRunning() || - !torControl.isConnected()) - return; - var proxyExecutable = this.tab.getSetting(this.ProxyExecutable, ""); var runAtStart = this.tab.getSetting(this.RunProxyAtStart, ""); var proxyExecutableArguments = this.tab.getSetting(this.ProxyExecutableArguments, ""); @@ -362,7 +362,11 @@ var tbb = { }, showCloseDialog: function() { - var file = new QFile(pluginPath+"/tbb/reopen.ui"); + var uiPath = pluginPath+"/tbb/reopen.ui"; + if((new QDir(uiPath)).isRelative()) + uiPath = QCoreApplication.applicationDirPath()+"/"+uiPath; + + var file = new QFile(uiPath); var loader = new QUiLoader(); file.open(QIODevice.ReadOnly); var dialog = loader.load(file);

1 0

[flashproxy/master] Use width="70" in place of width="70px" (same for height) in iframe.
by dcf＠torproject.org 10 Jul '12

10 Jul '12

commit 3977cf8e6ffd2b6fbcaf85fd0d42744b48c1e939 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 12:02:01 2012 -0700 Use width="70" in place of width="70px" (same for height) in iframe. The W3C validator complained about this. --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 34b33ff..f81201b 100644 --- a/README +++ b/README @@ -126,7 +126,7 @@ Add this line to torrc to make the relay use the external proxy: Paste in this HTML where you want the badge to appear: -<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="70px" height="23px" frameBorder="0" scrolling="no"></iframe> +<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="70" height="23" frameBorder="0" scrolling="no"></iframe> == For developers

1 0

[flashproxy/master] Use http not https in static link to stanford flashproxy page.
by dcf＠torproject.org 10 Jul '12

10 Jul '12

commit 163669c56300b1b0c9fcbd0a99b083341e10a33a Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 12:02:54 2012 -0700 Use http not https in static link to stanford flashproxy page. See 1caa8dad for previous changes in this vein. --- embed.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/embed.html b/embed.html index 0b55f00..fce05ff 100644 --- a/embed.html +++ b/embed.html @@ -55,7 +55,7 @@ body { flashproxy_badge_insert().start(); </script> <noscript> -<div id="flashproxy-badge"><a href="https://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" border="0" alt="I support Internet freedom"></a></div> +<div id="flashproxy-badge"><a href="http://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" border="0" alt="I support Internet freedom"></a></div> </noscript> </body> </html>

1 0

[flashproxy/master] Put a charset on embed.html.
by dcf＠torproject.org 10 Jul '12

10 Jul '12

commit 346452577a6ff7b6cd064bcca6ce11c79e0369bc Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 12:13:59 2012 -0700 Put a charset on embed.html. --- embed.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/embed.html b/embed.html index fce05ff..a5fd275 100644 --- a/embed.html +++ b/embed.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html> <head> +<meta charset="utf-8"> <meta http-equiv="refresh" content="86400"> <style type="text/css"> body {

1 0

[stem/master] Minor revisions for LOADCONF and prior cleanup
by atagar＠torproject.org 10 Jul '12

10 Jul '12

commit ab553f54e70ea21d8bd117cf912e1b208417e5d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 9 11:34:33 2012 -0700 Minor revisions for LOADCONF and prior cleanup --- stem/__init__.py | 2 +- stem/control.py | 3 ++- stem/descriptor/__init__.py | 2 +- stem/response/__init__.py | 2 +- stem/util/__init__.py | 2 +- stem/version.py | 1 + test/__init__.py | 2 +- test/integ/__init__.py | 2 +- test/integ/control/controller.py | 29 +++++++++++++++-------------- test/unit/__init__.py | 2 +- 10 files changed, 25 insertions(+), 22 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index a2f00a1..faee5db 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -17,6 +17,6 @@ __all__ = [ "prereq", "process", "socket", - "version" + "version", ] diff --git a/stem/control.py b/stem/control.py index f68183e..51804cc 100644 --- a/stem/control.py +++ b/stem/control.py @@ -19,6 +19,7 @@ interacting at a higher level. |- set_conf - sets the value of a configuration option |- reset_conf - reverts configuration options to their default values |- set_options - sets or resets the values of multiple configuration options + |- load_conf - loads configuration information as if it was in the torrc |- get_version - convenience method to get tor version |- authenticate - convenience method to authenticate the controller +- protocolinfo - convenience method to get the protocol info @@ -760,7 +761,7 @@ class Controller(BaseController): def load_conf(self, configtext): """ Sends the configuration text to Tor and loads it as if it has been read from - disk. + the torrc. :param str configtext: the configuration text diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 2328bf5..f3b40c5 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -18,7 +18,7 @@ __all__ = [ "extrainfo_descriptor", "server_descriptor", "parse_file", - "Descriptor" + "Descriptor", ] import os diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 2d7f028..5a665b6 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -32,7 +32,7 @@ __all__ = [ "authchallenge", "convert", "ControlMessage", - "ControlLine" + "ControlLine", ] import re diff --git a/stem/util/__init__.py b/stem/util/__init__.py index 6bc70e4..78fe9e1 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -10,6 +10,6 @@ __all__ = [ "proc", "system", "term", - "tor_tools" + "tor_tools", ] diff --git a/stem/version.py b/stem/version.py index c63a92a..d0228b1 100644 --- a/stem/version.py +++ b/stem/version.py @@ -232,6 +232,7 @@ safecookie_req.greater_than(Version("0.2.3.13")) Requirement = stem.util.enum.Enum( ("AUTH_SAFECOOKIE", safecookie_req), ("GETINFO_CONFIG_TEXT", Version("0.2.2.7")), + ("LOADCONF", Version("0.2.1.1")), ("TORRC_CONTROL_SOCKET", Version("0.2.0.30")), ("TORRC_DISABLE_DEBUGGER_ATTACHMENT", Version("0.2.3.9")), ) diff --git a/test/__init__.py b/test/__init__.py index adb29e4..c0297aa 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -6,6 +6,6 @@ __all__ = [ "check_whitespace", "mocking", "output", - "runner" + "runner", ] diff --git a/test/integ/__init__.py b/test/integ/__init__.py index ec9d1ca..3cc4a7f 100644 --- a/test/integ/__init__.py +++ b/test/integ/__init__.py @@ -9,6 +9,6 @@ __all__ = [ "process", "socket", "util", - "version" + "version", ] diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index bcd76fb..857799d 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -274,25 +274,26 @@ class TestController(unittest.TestCase): """ if test.runner.require_control(self): return + elif test.runner.require_version(self, stem.version.Requirement.LOADCONF): return runner = test.runner.get_runner() with runner.get_tor_controller() as controller: oldconf = runner.get_torrc_contents() - # invalid requests - self.assertRaises(stem.socket.InvalidRequest, controller.load_conf, "ContactInfo confloaded") try: - controller.load_conf("Blahblah blah") - except stem.socket.InvalidArguments, exc: - self.assertEqual(["Blahblah"], exc.arguments) - else: - self.fail() - - # valid config - controller.load_conf(runner.get_torrc_contents() + "\nContactInfo confloaded\n") - self.assertEqual("confloaded", controller.get_conf("ContactInfo")) - - # reload original valid config - controller.load_conf(oldconf) + # invalid requests + self.assertRaises(stem.socket.InvalidRequest, controller.load_conf, "ContactInfo confloaded") + try: + controller.load_conf("Blahblah blah") + self.fail() + except stem.socket.InvalidArguments, exc: + self.assertEqual(["Blahblah"], exc.arguments) + + # valid config + controller.load_conf(runner.get_torrc_contents() + "\nContactInfo confloaded\n") + self.assertEqual("confloaded", controller.get_conf("ContactInfo")) + finally: + # reload original valid config + controller.load_conf(oldconf) diff --git a/test/unit/__init__.py b/test/unit/__init__.py index 6c77f6f..6bbec07 100644 --- a/test/unit/__init__.py +++ b/test/unit/__init__.py @@ -7,6 +7,6 @@ __all__ = [ "descriptor", "socket", "util", - "version" + "version", ]

1 0

[stem/master] Remove ugly if-elif tree in favour of a dict
by atagar＠torproject.org 10 Jul '12

10 Jul '12

commit c5472856c9895bd118af79297ccdce59fcba2e13 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Mon Jul 9 10:12:23 2012 +0530 Remove ugly if-elif tree in favour of a dict --- stem/response/__init__.py | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 995cc69..2d7f028 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -84,17 +84,18 @@ def convert(response_type, message, **kwargs): if not isinstance(message, ControlMessage): raise TypeError("Only able to convert stem.response.ControlMessage instances") - if response_type == "GETINFO": - response_class = stem.response.getinfo.GetInfoResponse - elif response_type == "GETCONF": - response_class = stem.response.getconf.GetConfResponse - elif response_type == "SINGLELINE": - response_class = SingleLineResponse - elif response_type == "PROTOCOLINFO": - response_class = stem.response.protocolinfo.ProtocolInfoResponse - elif response_type == "AUTHCHALLENGE": - response_class = stem.response.authchallenge.AuthChallengeResponse - else: raise TypeError("Unsupported response type: %s" % response_type) + response_types = { + "GETINFO": stem.response.getinfo.GetInfoResponse, + "GETCONF": stem.response.getconf.GetConfResponse, + "SINGLELINE": SingleLineResponse, + "PROTOCOLINFO": stem.response.protocolinfo.ProtocolInfoResponse, + "AUTHCHALLENGE": stem.response.authchallenge.AuthChallengeResponse, + } + + try: + response_class = response_types[response_type] + except TypeError: + raise TypeError("Unsupported response type: %s" % response_type) message.__class__ = response_class message._parse_message(**kwargs)

1 0