October 2013 - tor-commits - lists.torproject.org

[flashproxy/master] ChangeLog for source code rearrangement.
by dcf＠torproject.org 14 Oct '13

14 Oct '13

commit fafc26a63f419326e09aca4d4f4804e7bc75c18d Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 13 19:13:51 2013 -0700 ChangeLog for source code rearrangement. --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8707b89..1b41ad9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,11 @@ particular protocol flash proxies should use to connect to you, and is distinct from the transport method name used by Tor. … [View More]

1 0

[flashproxy/master] Move the modules directory into the proxy directory.
by dcf＠torproject.org 14 Oct '13

14 Oct '13

commit 3f85bb0ed83ec34505be1b0fca5b3f8307d9dec4 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 13 19:02:44 2013 -0700 Move the modules directory into the proxy directory. Taken from https://github.com/infinity0/flashproxy/commit/4819df2aa1f45eec0fd5e676abcb…, except moved to proxy/modules rather than proxy-modules, as was originally suggested at https://trac.torproject.org/projects/tor/ticket/9668. --- .gitignore … [View More] | 4 ++-- modules/README | 8 -------- modules/drupal/flashproxy-start.js | 1 - modules/drupal/flashproxy.info | 5 ----- modules/drupal/flashproxy.js | 1 - modules/drupal/flashproxy.module | 2 -- modules/facebook/facebook.html | 17 ----------------- modules/mediawiki/custom.js | 9 --------- modules/nodejs/Makefile | 4 ---- modules/nodejs/README | 28 ---------------------------- modules/nodejs/main.js | 30 ------------------------------ modules/nodejs/package.json | 30 ------------------------------ proxy/modules/README | 8 ++++++++ proxy/modules/drupal/flashproxy-start.js | 1 + proxy/modules/drupal/flashproxy.info | 5 +++++ proxy/modules/drupal/flashproxy.js | 1 + proxy/modules/drupal/flashproxy.module | 2 ++ proxy/modules/facebook/facebook.html | 17 +++++++++++++++++ proxy/modules/mediawiki/custom.js | 9 +++++++++ proxy/modules/nodejs/Makefile | 4 ++++ proxy/modules/nodejs/README | 28 ++++++++++++++++++++++++++++ proxy/modules/nodejs/main.js | 30 ++++++++++++++++++++++++++++++ proxy/modules/nodejs/package.json | 30 ++++++++++++++++++++++++++++++ 23 files changed, 137 insertions(+), 137 deletions(-) diff --git a/.gitignore b/.gitignore index c3e5b7f..0e9120d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ *.pyc /dist /py2exe-tmp -/modules/nodejs/node_modules -/modules/nodejs/flashproxy.js +/proxy/modules/nodejs/node_modules +/proxy/modules/nodejs/flashproxy.js diff --git a/modules/README b/modules/README deleted file mode 100644 index 520a47b..0000000 --- a/modules/README +++ /dev/null @@ -1,8 +0,0 @@ -This directory contains modules and plugins for making flash proxies -work with other systems such as web publishing platforms. - -See a collection of modules for other platforms at -https://github.com/glamrock/cupcake. - -For a plugin for Mozilla Firefox, see -https://addons.mozilla.org/en-us/firefox/addon/tor-flashproxy-badge/. diff --git a/modules/drupal/flashproxy-start.js b/modules/drupal/flashproxy-start.js deleted file mode 100644 index fe7d10b..0000000 --- a/modules/drupal/flashproxy-start.js +++ /dev/null @@ -1 +0,0 @@ -flashproxy_badge_insert().start(); diff --git a/modules/drupal/flashproxy.info b/modules/drupal/flashproxy.info deleted file mode 100644 index 2f9b174..0000000 --- a/modules/drupal/flashproxy.info +++ /dev/null @@ -1,5 +0,0 @@ -name = Flashproxy Module -description = Insert Flashproxy js into some or all pages on your site. -core = 7.x -scripts[] = flashproxy.js -scripts[] = flashproxy-start.js diff --git a/modules/drupal/flashproxy.js b/modules/drupal/flashproxy.js deleted file mode 120000 index 710e470..0000000 --- a/modules/drupal/flashproxy.js +++ /dev/null @@ -1 +0,0 @@ -../../proxy/flashproxy.js \ No newline at end of file diff --git a/modules/drupal/flashproxy.module b/modules/drupal/flashproxy.module deleted file mode 100644 index a4abe2d..0000000 --- a/modules/drupal/flashproxy.module +++ /dev/null @@ -1,2 +0,0 @@ -<?php - diff --git a/modules/facebook/facebook.html b/modules/facebook/facebook.html deleted file mode 100644 index 8321dbc..0000000 --- a/modules/facebook/facebook.html +++ /dev/null @@ -1,17 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<meta charset="utf-8"> -<title>flash proxy facebook app demo</title> -<style type="text/css"> -iframe { - display: block; - padding: 5%; - border: none; -} -</style> -</head> -<body> -<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="80" height="15" frameborder="0" scrolling="no"></iframe> -</body> -</html> diff --git a/modules/mediawiki/custom.js b/modules/mediawiki/custom.js deleted file mode 100644 index 4b882c6..0000000 --- a/modules/mediawiki/custom.js +++ /dev/null @@ -1,9 +0,0 @@ -/* Flash proxy badge for MediaWiki. By Sathyanarayanan Gunasekaran. - Requires $wgAllowUserJs to be true in the MediaWiki configuration. - https://www.mediawiki.org/wiki/Manual:Interface/JavaScript - This affects only your own user. Works on Wikipedia. - - Go to Preferences → Appearance → Custom JavaScript. - You will end up editing common.js; paste in this code and save it. */ - -$('#p-personal ul').append('<li><iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="80" height="15" frameborder="0" scrolling="no"></iframe></li>'); diff --git a/modules/nodejs/Makefile b/modules/nodejs/Makefile deleted file mode 100644 index e4a11d4..0000000 --- a/modules/nodejs/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -.PHONY: prepublish -prepublish: flashproxy.js -flashproxy.js: ../../proxy/flashproxy.js - cp -f $< $@ diff --git a/modules/nodejs/README b/modules/nodejs/README deleted file mode 100644 index 57d0ddf..0000000 --- a/modules/nodejs/README +++ /dev/null @@ -1,28 +0,0 @@ -== Headless flash proxies with node.js - -Traditionally, flash proxies have run in the browser. However, it may be -desirable to run them as background daemons. This directory contains a main.js -file which wraps the regular flashproxy.js and runs headlessly from node.js. - -To install the requirements (in Ubuntu universe), - - > apt-get install git nodejs npm - -Then, if you've checked out the flashproxy source from git, - - > git clone https://git.torproject.org/flashproxy.git - > cd flashproxy/modules/nodejs - > npm install - > npm start # or, node main.js - -This package is also being published on the npm registry. To add a `flashproxy` -bin to your path without checking out from git, at any time run, - - > npm install -g flashproxy - > flashproxy - -Rather than install globally, you can also, - - > cd ~/ # or, to the dir of your choice - > npm install flashproxy - > npm start flashproxy # or, node node_modules/flashproxy diff --git a/modules/nodejs/main.js b/modules/nodejs/main.js deleted file mode 100755 index 64e50b9..0000000 --- a/modules/nodejs/main.js +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env node - -var path = require("path"); -var fs = require("fs"); - -// Get a querystring from the command line -var location_search = "debug=1&initial_facilitator_poll_interval=10"; -if (process.argv[2] != null) - location_search = process.argv[2]; - -// Setup environment variables for node.js -var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; -var window = { - location: { search: "?" + location_search }, - navigator: { userAgent: "Chrome/16" }, - WebSocket: require("ws") -}; - -// Include flashproxy.js using eval to avoid modifying it. -var file = path.join(__dirname, "flashproxy.js"); -try { - var data = fs.readFileSync(file, "utf8"); -} catch (e) { - console.log("Can't locate the flashproxy.js file. You probably need to run \"npm install\"."); - process.exit(1); -} -eval(data); - -// Start 'er up -flashproxy_badge_new().start(); diff --git a/modules/nodejs/package.json b/modules/nodejs/package.json deleted file mode 100644 index 1de1157..0000000 --- a/modules/nodejs/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "flashproxy", - "version": "0.1.0", - "description": "Standalone flash proxy. A flash proxy is a lightweight proxy providing access to the Tor network.", - "main": "main.js", - "scripts": { - "prepublish": "make prepublish", - "start": "node main.js" - }, - "bin": { - "flashproxy": "main.js" - }, - "dependencies": { - "xmlhttprequest": "1.5.0", - "ws": "0.4.27" - }, - "repository": { - "type": "git", - "url": "https://git.torproject.org/flashproxy.git" - }, - "keywords": [ - "flashproxy", - "tor", - "bridge", - "relay", - "websocket", - "pluggable transport" - ], - "license": "MIT" -} diff --git a/proxy/modules/README b/proxy/modules/README new file mode 100644 index 0000000..520a47b --- /dev/null +++ b/proxy/modules/README @@ -0,0 +1,8 @@ +This directory contains modules and plugins for making flash proxies +work with other systems such as web publishing platforms. + +See a collection of modules for other platforms at +https://github.com/glamrock/cupcake. + +For a plugin for Mozilla Firefox, see +https://addons.mozilla.org/en-us/firefox/addon/tor-flashproxy-badge/. diff --git a/proxy/modules/drupal/flashproxy-start.js b/proxy/modules/drupal/flashproxy-start.js new file mode 100644 index 0000000..fe7d10b --- /dev/null +++ b/proxy/modules/drupal/flashproxy-start.js @@ -0,0 +1 @@ +flashproxy_badge_insert().start(); diff --git a/proxy/modules/drupal/flashproxy.info b/proxy/modules/drupal/flashproxy.info new file mode 100644 index 0000000..2f9b174 --- /dev/null +++ b/proxy/modules/drupal/flashproxy.info @@ -0,0 +1,5 @@ +name = Flashproxy Module +description = Insert Flashproxy js into some or all pages on your site. +core = 7.x +scripts[] = flashproxy.js +scripts[] = flashproxy-start.js diff --git a/proxy/modules/drupal/flashproxy.js b/proxy/modules/drupal/flashproxy.js new file mode 120000 index 0000000..710e470 --- /dev/null +++ b/proxy/modules/drupal/flashproxy.js @@ -0,0 +1 @@ +../../proxy/flashproxy.js \ No newline at end of file diff --git a/proxy/modules/drupal/flashproxy.module b/proxy/modules/drupal/flashproxy.module new file mode 100644 index 0000000..a4abe2d --- /dev/null +++ b/proxy/modules/drupal/flashproxy.module @@ -0,0 +1,2 @@ +<?php + diff --git a/proxy/modules/facebook/facebook.html b/proxy/modules/facebook/facebook.html new file mode 100644 index 0000000..8321dbc --- /dev/null +++ b/proxy/modules/facebook/facebook.html @@ -0,0 +1,17 @@ +<!DOCTYPE html> +<html> +<head> +<meta charset="utf-8"> +<title>flash proxy facebook app demo</title> +<style type="text/css"> +iframe { + display: block; + padding: 5%; + border: none; +} +</style> +</head> +<body> +<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="80" height="15" frameborder="0" scrolling="no"></iframe> +</body> +</html> diff --git a/proxy/modules/mediawiki/custom.js b/proxy/modules/mediawiki/custom.js new file mode 100644 index 0000000..4b882c6 --- /dev/null +++ b/proxy/modules/mediawiki/custom.js @@ -0,0 +1,9 @@ +/* Flash proxy badge for MediaWiki. By Sathyanarayanan Gunasekaran. + Requires $wgAllowUserJs to be true in the MediaWiki configuration. + https://www.mediawiki.org/wiki/Manual:Interface/JavaScript + This affects only your own user. Works on Wikipedia. + + Go to Preferences → Appearance → Custom JavaScript. + You will end up editing common.js; paste in this code and save it. */ + +$('#p-personal ul').append('<li><iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="80" height="15" frameborder="0" scrolling="no"></iframe></li>'); diff --git a/proxy/modules/nodejs/Makefile b/proxy/modules/nodejs/Makefile new file mode 100644 index 0000000..e4a11d4 --- /dev/null +++ b/proxy/modules/nodejs/Makefile @@ -0,0 +1,4 @@ +.PHONY: prepublish +prepublish: flashproxy.js +flashproxy.js: ../../proxy/flashproxy.js + cp -f $< $@ diff --git a/proxy/modules/nodejs/README b/proxy/modules/nodejs/README new file mode 100644 index 0000000..57d0ddf --- /dev/null +++ b/proxy/modules/nodejs/README @@ -0,0 +1,28 @@ +== Headless flash proxies with node.js + +Traditionally, flash proxies have run in the browser. However, it may be +desirable to run them as background daemons. This directory contains a main.js +file which wraps the regular flashproxy.js and runs headlessly from node.js. + +To install the requirements (in Ubuntu universe), + + > apt-get install git nodejs npm + +Then, if you've checked out the flashproxy source from git, + + > git clone https://git.torproject.org/flashproxy.git + > cd flashproxy/modules/nodejs + > npm install + > npm start # or, node main.js + +This package is also being published on the npm registry. To add a `flashproxy` +bin to your path without checking out from git, at any time run, + + > npm install -g flashproxy + > flashproxy + +Rather than install globally, you can also, + + > cd ~/ # or, to the dir of your choice + > npm install flashproxy + > npm start flashproxy # or, node node_modules/flashproxy diff --git a/proxy/modules/nodejs/main.js b/proxy/modules/nodejs/main.js new file mode 100755 index 0000000..64e50b9 --- /dev/null +++ b/proxy/modules/nodejs/main.js @@ -0,0 +1,30 @@ +#!/usr/bin/env node + +var path = require("path"); +var fs = require("fs"); + +// Get a querystring from the command line +var location_search = "debug=1&initial_facilitator_poll_interval=10"; +if (process.argv[2] != null) + location_search = process.argv[2]; + +// Setup environment variables for node.js +var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; +var window = { + location: { search: "?" + location_search }, + navigator: { userAgent: "Chrome/16" }, + WebSocket: require("ws") +}; + +// Include flashproxy.js using eval to avoid modifying it. +var file = path.join(__dirname, "flashproxy.js"); +try { + var data = fs.readFileSync(file, "utf8"); +} catch (e) { + console.log("Can't locate the flashproxy.js file. You probably need to run \"npm install\"."); + process.exit(1); +} +eval(data); + +// Start 'er up +flashproxy_badge_new().start(); diff --git a/proxy/modules/nodejs/package.json b/proxy/modules/nodejs/package.json new file mode 100644 index 0000000..1de1157 --- /dev/null +++ b/proxy/modules/nodejs/package.json @@ -0,0 +1,30 @@ +{ + "name": "flashproxy", + "version": "0.1.0", + "description": "Standalone flash proxy. A flash proxy is a lightweight proxy providing access to the Tor network.", + "main": "main.js", + "scripts": { + "prepublish": "make prepublish", + "start": "node main.js" + }, + "bin": { + "flashproxy": "main.js" + }, + "dependencies": { + "xmlhttprequest": "1.5.0", + "ws": "0.4.27" + }, + "repository": { + "type": "git", + "url": "https://git.torproject.org/flashproxy.git" + }, + "keywords": [ + "flashproxy", + "tor", + "bridge", + "relay", + "websocket", + "pluggable transport" + ], + "license": "MIT" +} [View Less]

1 0

[stem/master] Tagging version 1.1 changelog
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit a5392292c829190940d43c34690b0d08e6eaaf1c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 18:37:04 2013 -0700 Tagging version 1.1 changelog Revising our changelog to list the changes in version 1.1. Also re-adding the '-dev' suffix to our git version. --- docs/change_log.rst | 5 +++++ stem/__init__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 334f995..62c9ea3 … [View More]

1 0

[stem/master] Stem release 1.1.0
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit 2ef492467d13a121a76ac8ebfdc2dfbaa4b20e1d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 18:15:41 2013 -0700 Stem release 1.1.0 --- stem/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/__init__.py b/stem/__init__.py index 5b9a975..5abe6a7 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -368,7 +368,7 @@ Library for working with the tor process. =============== =========== """ -__version__ = '1.0.1-dev' +… [View More]

1 0

[flashproxy/master] Change the client transport method name from "websocket" to "flashproxy".
by dcf＠torproject.org 14 Oct '13

14 Oct '13

commit c47025cd9260a77d65a7ca41f5f806a87c1baf27 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 13 17:21:11 2013 -0700 Change the client transport method name from "websocket" to "flashproxy". Both names still work and are equivalent. This only affects what string appears in the configuration files we ship. --- ChangeLog | 10 ++++++++++ README | 6 +++--- doc/design.txt | 4 ++-- … [View More]experiments/exercise/exercise.sh | 2 +- torrc | 4 ++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff115cf..8707b89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,16 @@ assign proxies to clients that use matching transports. Patch by George Kadianakis. Part of bug 9349. + o Changed to use the pluggable transport method name "flashproxy" + rather than "websocket". Both names are equivalent and "websocket" + continues to work. The reason for this change is to reduce confusion + with a transport that simply makes a WebSocket connection to a + "websocket" bridge, without receiving an inbound connection from a + flash proxy. The default argument to the --transport option + continues to be "websocket", because that option controls which + particular protocol flash proxies should use to connect to you, and + is distinct from the transport method name used by Tor. + Changes in version 1.3 o Added a new observed Google public key pin. diff --git a/README b/README index ca93ce8..aa1dc6a 100644 --- a/README +++ b/README @@ -19,11 +19,11 @@ By default the transport plugin listens on Internet-facing TCP port 9000. If you have to use a different port (to get through a firewall, for example), edit the ClientTransportPlugin line of the torrc to give a different port number: - ClientTransportPlugin websocket exec ./flashproxy-client --register :0 :8888 + ClientTransportPlugin flashproxy exec ./flashproxy-client --register :0 :8888 If the flashproxy-client program is in a different directoy (after being installed, for example), use the full path in the ClientTransportPlugin line: - ClientTransportPlugin websocket exec /usr/local/bin/flashproxy-client --register + ClientTransportPlugin flashproxy exec /usr/local/bin/flashproxy-client --register You should receive a flash proxy connection within about 60 seconds. See "Troubleshooting" below if it doesn't work. @@ -69,7 +69,7 @@ public instance of it. This way is not as realistic because all your Tor traffic will first go to a fixed address and can be easily blocked. However this is an easy way to try out the system without having to do port forwarding. - $ tor ClientTransportPlugin "websocket socks4 fp-facilitator.org:9999" UseBridges 1 Bridge "websocket 0.0.1.0:1" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 + $ tor ClientTransportPlugin "flashproxy socks4 fp-facilitator.org:9999" UseBridges 1 Bridge "flashproxy 0.0.1.0:1" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 == Troubleshooting diff --git a/doc/design.txt b/doc/design.txt index bc0f377..20b63b7 100644 --- a/doc/design.txt +++ b/doc/design.txt @@ -100,9 +100,9 @@ Design of flash proxies The Tor client must be configured to make its connections through a local proxy (the client transport plugin). This configuration is sufficient: - ClientTransportPlugin websocket socks4 127.0.0.1:9001 + ClientTransportPlugin flashproxy socks4 127.0.0.1:9001 UseBridges 1 - Bridge websocket 0.0.1.0:1 + Bridge flashproxy 0.0.1.0:1 LearnCircuitBuildTimeout 0 The address given for the "Bridge" option is actually irrelevant. The client transport plugin will ignore it and connect (through the flash diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index 0bc49c0..efefde7 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -26,7 +26,7 @@ PIDS_TO_KILL+=($!) sleep 20 -"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 0.0.1.0:1" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 & +"$TOR" ClientTransportPlugin "flashproxy socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "flashproxy 0.0.1.0:1" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 & PIDS_TO_KILL+=($!) sleep 60 diff --git a/torrc b/torrc index e047cd0..4a66162 100644 --- a/torrc +++ b/torrc @@ -4,10 +4,10 @@ UseBridges 1 # The address and port are ignored by the client transport plugin. -Bridge websocket 0.0.1.0:1 +Bridge flashproxy 0.0.1.0:1 LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 # Change the second number here (9000) to the number of a port that can # receive connections from the Internet (the port for which you # configured port forwarding). -ClientTransportPlugin websocket exec ./flashproxy-client --register :0 :9000 +ClientTransportPlugin flashproxy exec ./flashproxy-client --register :0 :9000 [View Less]

1 0

[stem/master] Python 3 compatability for mapaddress test
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit 6c81b101dd69cf9f4b9170aa089d98e38220f383 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 17:25:34 2013 -0700 Python 3 compatability for mapaddress test Quite a few byte vs unicode gotchas. Also, the behavior of indexing into byte strings changed in python 3 (it provides ints rather than characters). ====================================================================== ERROR: test_mapaddress -------------------------------------… [View More]--------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/data/python3/test/integ/control/controller.py", line 813, in test_mapaddress test.network.negotiate_socks(s, '1.2.1.2', 80) File "/home/atagar/Desktop/stem/test/data/python3/test/network.py", line 321, in negotiate_socks request = "\x04\x01" + struct.pack("!H", port) + "\x00\x00\x00\x01" + "\x00" + host + "\x00" TypeError: Can't convert 'bytes' object to str implicitly --- test/integ/control/controller.py | 7 ++++--- test/network.py | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 69112cf..1c0e468 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -16,6 +16,7 @@ import stem.descriptor.reader import stem.descriptor.router_status_entry import stem.response.protocolinfo import stem.socket +import stem.util.str_tools import stem.version import test.network import test.runner @@ -811,7 +812,7 @@ class TestController(unittest.TestCase): s.settimeout(30) s.connect(('127.0.0.1', int(controller.get_conf('SocksListenAddress').rsplit(':', 1)[1]))) test.network.negotiate_socks(s, '1.2.1.2', 80) - s.sendall(test.network.ip_request) # make the http request for the ip address + s.sendall(stem.util.str_tools._to_bytes(test.network.ip_request)) # make the http request for the ip address response = s.recv(1000) if response: @@ -826,9 +827,9 @@ class TestController(unittest.TestCase): # everything after the blank line is the 'data' in a HTTP response. # The response data for our request for request should be an IP address + '\n' - ip_addr = response[response.find("\r\n\r\n"):].strip() + ip_addr = response[response.find(b"\r\n\r\n"):].strip() - self.assertTrue(stem.util.connection.is_valid_ipv4_address(ip_addr)) + self.assertTrue(stem.util.connection.is_valid_ipv4_address(stem.util.str_tools._to_unicode(ip_addr))) def test_get_microdescriptor(self): """ diff --git a/test/network.py b/test/network.py index 78ebf21..fbb378a 100644 --- a/test/network.py +++ b/test/network.py @@ -20,6 +20,8 @@ import socket import struct import stem.util.connection +import stem.util.str_tools + from stem import ProtocolError, SocketError # Store a reference to the original class so we can find it after @@ -318,11 +320,11 @@ def negotiate_socks(sock, host, port): """ # SOCKS4a request here - http://en.wikipedia.org/wiki/SOCKS#Protocol - request = "\x04\x01" + struct.pack("!H", port) + "\x00\x00\x00\x01" + "\x00" + host + "\x00" + request = b"\x04\x01" + struct.pack("!H", port) + b"\x00\x00\x00\x01" + b"\x00" + stem.util.str_tools._to_bytes(host) + b"\x00" sock.sendall(request) response = sock.recv(8) - if len(response) != 8 or response[0] != "\x00" or response[1] != "\x5a": + if len(response) != 8 or response[0:2] != b"\x00\x5a": sock.close() raise ProtocolError(error_msgs.get(response[1], "SOCKS server returned unrecognized error code")) [View Less]

1 0

[stem/master] Correcting test issues with python 2.6 and 3.x
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit 216937c0821e27301f60dd77a1addfb286b1b3ea Merge: 242569a 6c81b10 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 17:40:51 2013 -0700 Correcting test issues with python 2.6 and 3.x Generally I just work with python 2.7, so other interpretor versions just get love prior to releases. Most of this is issues with our tests, but @lru_cache introduced a lot of legitimate regressions for python 3.x. run_tests.py … [View More] | 6 +- stem/descriptor/__init__.py | 4 +- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/descriptor/microdescriptor.py | 5 +- stem/descriptor/networkstatus.py | 3 + stem/descriptor/remote.py | 2 +- stem/descriptor/server_descriptor.py | 11 +- stem/exit_policy.py | 128 ++++++++++++++------- stem/prereq.py | 21 +++- stem/util/lru_cache.py | 2 +- stem/util/proc.py | 2 +- stem/version.py | 21 ++-- test/integ/control/controller.py | 7 +- test/integ/descriptor/networkstatus.py | 2 +- test/integ/descriptor/remote.py | 12 +- test/integ/process.py | 6 +- test/integ/response/protocolinfo.py | 8 +- test/integ/util/system.py | 6 +- test/network.py | 6 +- test/settings.cfg | 2 + test/unit/connection/authentication.py | 8 +- test/unit/control/controller.py | 8 +- test/unit/descriptor/export.py | 8 +- test/unit/descriptor/networkstatus/document_v3.py | 4 +- test/unit/descriptor/reader.py | 6 +- test/unit/descriptor/remote.py | 21 +++- test/unit/descriptor/server_descriptor.py | 8 +- test/unit/descriptor/tordnsel.py | 10 +- test/unit/response/events.py | 8 +- test/unit/response/protocolinfo.py | 8 +- test/unit/tutorial.py | 8 +- test/unit/util/connection.py | 8 +- test/unit/util/proc.py | 8 +- test/unit/util/system.py | 8 +- test/unit/version.py | 8 +- test/util.py | 6 +- 36 files changed, 278 insertions(+), 113 deletions(-) [View Less]

1 0

[stem/master] Fixing python 3 testing issue with key certs
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit bfd5a667f150d4fef77c6a730432494ee930610b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 13:20:08 2013 -0700 Fixing python 3 testing issue with key certs Test file wasn't being opened in bytes mode, causing... ====================================================================== ERROR: test_metrics_cert ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/… [View More]atagar/Desktop/stem/test/data/python3/test/integ/descriptor/networkstatus.py", line 178, in test_metrics_cert cert = next(stem.descriptor.parse_file(cert_file)) File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/__init__.py", line 200, in parse_file for desc in file_parser(descriptor_file): File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/__init__.py", line 241, in _parse_metrics_file for desc in stem.descriptor.networkstatus._parse_file_key_certs(descriptor_file, validate = validate, **kwargs): File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/networkstatus.py", line 252, in _parse_file_key_certs yield stem.descriptor.networkstatus.KeyCertificate(bytes.join(b"", keycert_content), validate = validate) TypeError: sequence item 0: expected bytes, str found --- stem/descriptor/__init__.py | 4 +++- test/integ/descriptor/networkstatus.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index d388fd0..d6b007e 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -371,7 +371,9 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi :param int end_position: end if we reach this point in the file :param bool include_ending_keyword: provides the keyword we broke on if **True** - :returns: **list** with the lines until we find one of the keywords, this is a two value tuple with the ending keyword if include_ending_keyword is **True** + :returns: **list** with the lines until we find one of the keywords, this is + a two value tuple with the ending keyword if include_ending_keyword is + **True** """ content = None if skip else [] diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index 7e07939..5209f51 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -174,7 +174,7 @@ GM9hAsAMRX9Ogqhq5UjDNqEsvDKuyVeyh7unSZEOip9Zr6K/+7VsVPNb8vfBRBjo cert_path = get_resource("metrics_cert") - with open(cert_path) as cert_file: + with open(cert_path, 'rb') as cert_file: cert = next(stem.descriptor.parse_file(cert_file)) self.assertEquals(3, cert.version) self.assertEquals(None, cert.address) [View Less]

1 0

[stem/master] Fixing python 3 compatability for remote descriptor unit tests
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit a303b137a9ada7cc9a31a57ba2dcbeae89dd83a3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 12:55:24 2013 -0700 Fixing python 3 compatability for remote descriptor unit tests ====================================================================== ERROR: test_query_with_timeout ---------------------------------------------------------------------- Traceback (most recent call last): File "/opt/python3.3/lib/python3.3/unittest/mock.py", … [View More]line 1079, in patched arg = patching.__enter__() File "/opt/python3.3/lib/python3.3/unittest/mock.py", line 1132, in __enter__ self.target = self.getter() File "/opt/python3.3/lib/python3.3/unittest/mock.py", line 1294, in <lambda> getter = lambda: _importer(target) File "/opt/python3.3/lib/python3.3/unittest/mock.py", line 988, in _importer thing = __import__(import_path) ImportError: No module named 'urllib2' --- test/unit/descriptor/remote.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index 4eda9e8..60a5c1a 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -6,6 +6,7 @@ import io import socket import unittest +import stem.prereq import stem.descriptor.remote try: @@ -14,6 +15,12 @@ try: except ImportError: from mock import patch +# The urlopen() method is in a different location depending on if we're using +# python 2.x or 3.x. The 2to3 converter accounts for this in imports, but not +# mock annotations. + +URL_OPEN = 'urllib.request.urlopen' if stem.prereq.is_python_3() else 'urllib2.urlopen' + # Output from requesting moria1's descriptor from itself... # % curl http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C… @@ -53,7 +60,7 @@ iO3EUE0AEYah2W9gdz8t+i3Dtr0zgqLS841GC/TyDKCm+MKmN8d098qnwK0NGF9q class TestDescriptorDownloader(unittest.TestCase): - @patch('urllib2.urlopen') + @patch(URL_OPEN) def test_query_download(self, urlopen_mock): """ Check Query functionality when we successfully download a descriptor. @@ -81,7 +88,7 @@ class TestDescriptorDownloader(unittest.TestCase): urlopen_mock.assert_called_once_with(expeced_url, timeout = None) - @patch('urllib2.urlopen') + @patch(URL_OPEN) def test_query_with_malformed_content(self, urlopen_mock): """ Query with malformed descriptor content. @@ -109,7 +116,7 @@ class TestDescriptorDownloader(unittest.TestCase): self.assertRaises(ValueError, query.run) - @patch('urllib2.urlopen') + @patch(URL_OPEN) def test_query_with_timeout(self, urlopen_mock): urlopen_mock.side_effect = socket.timeout('connection timed out') @@ -128,7 +135,7 @@ class TestDescriptorDownloader(unittest.TestCase): ) self.assertEqual(3, urlopen_mock.call_count) - @patch('urllib2.urlopen') + @patch(URL_OPEN) def test_can_iterate_multiple_times(self, urlopen_mock): urlopen_mock.return_value = io.BytesIO(TEST_DESCRIPTOR) [View Less]

1 0

[stem/master] Fixing python 3 issue with orphaned annotation exceptions
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit ab86475d484c9c727ba17b9cf39e1661d0e72a8a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 12:49:22 2013 -0700 Fixing python 3 issue with orphaned annotation exceptions ====================================================================== ERROR: test_annotations ---------------------------------------------------------------------- Traceback (most recent call last): File "/opt/python3.3/lib/python3.3/unittest/mock.py", line 1087, … [View More]

1 0