- tor-commits - lists.torproject.org

r25784: {website} Updated RPM instructions for EL5 due to separate rpm signing (website/trunk/docs/en)
by Ondrej Mikle 07 Sep '12

07 Sep '12

Author: hiviah Date: 2012-09-07 13:13:16 +0000 (Fri, 07 Sep 2012) New Revision: 25784 Modified: website/trunk/docs/en/rpms.wml Log: Updated RPM instructions for EL5 due to separate rpm signing key Modified: website/trunk/docs/en/rpms.wml =================================================================== --- website/trunk/docs/en/rpms.wml 2012-09-06 20:26:50 UTC (rev 25783) +++ website/trunk/docs/en/rpms.wml 2012-09-07 13:13:16 UTC (rev 25784) @@ -17,7 +17,7 @@ Do not use the packages in the native repositories. They are frequently out of date. That means you'll be missing stability and - security fixes. + security fixes. Repositories contain i686 and x86_64 builds. @@ -25,6 +25,12 @@ Tor. Assuming yum, in /etc/yum.repos.d/, create a file called torproject.repo. Edit this file with the following information: + + For Fedora 16, Fedora 17, RHEL 6 (and clones), use following repo file - + substitute DISTRIBUTION with one of the following: fc/16, fc/17 or el/6 + according to your distribution. + + <pre>[tor-experimental] name=Tor experimental repo enabled=1 @@ -41,17 +47,36 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.… </pre> - If you wish to track the experimental releases of Tor, you should substitute - DISTRIBUTION with one of the following: el/5, el/6, fc/16 and fc/17 - - - The keys's fingerprint should be (for RPM-GPG-KEY-torproject.org.asc above, yum will ask about the fingerprint): <pre>3B9E EEB9 7B1E 827B CF0A 0D96 8AF5 653C 5AC0 01F1</pre> + Packages for RHEL 5 (and clones) are signed with different key due to + old rpm limitations, use this repo file: + + +<pre>[tor-experimental] +name=Tor experimental repo +enabled=1 +baseurl=http://deb.torproject.org/torproject.org/rpm/el/5/$basearch/ +gpgcheck=1 +gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.EL5.asc + +[tor-experimental-source] +name=Tor experimental source repo +enabled=1 +autorefresh=0 +baseurl=http://deb.torproject.org/torproject.org/rpm/el/5/SRPMS +gpgcheck=1 +gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.EL5.asc +</pre> + Fingerprint of RPM-GPG-KEY-torproject.org.EL5.asc key above should be: + +<pre>9D27 0E2A 351C B4CB 6D95 78AF F8E7 95F8 B4D4 03EA</pre> + + Then install Tor by running: <pre>yum install tor</pre>

1 0

[flashproxy/master] Comment WebSocketRequestHandler.
by dcf＠torproject.org 07 Sep '12

07 Sep '12

commit efc80968b2c8614739f38bbb5bfd3703d0eb82e9 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 7 03:05:37 2012 -0700 Comment WebSocketRequestHandler. Python doesn't give us a straightforward way to parse an HTTP request as a string, so we do it through a BaseHTTPRequestHandler. --- flashproxy-client | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index a8dcd15..daf710b 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -442,6 +442,8 @@ def format_peername(s): # to avoid Slowloris-like attacks. WEBSOCKET_REQUEST_TIMEOUT = 2.0 +# This subclass of BaseHTTPRequestHandler is essentially a means of parsing an +# HTTP request. class WebSocketRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): def __init__(self, request_text, fd): self.rfile = cStringIO.StringIO(request_text)

1 0

[flashproxy/master] Add tests for WebSocket request handling.
by dcf＠torproject.org 07 Sep '12

07 Sep '12

commit 0c1afe22b38596675f9aa06d75fbb754ea915638 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 7 05:04:53 2012 -0700 Add tests for WebSocket request handling. --- flashproxy-client-test | 169 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 169 insertions(+), 0 deletions(-) diff --git a/flashproxy-client-test b/flashproxy-client-test index 527093c..084a272 100755 --- a/flashproxy-client-test +++ b/flashproxy-client-test @@ -1,11 +1,20 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +import base64 +import cStringIO +import httplib import socket import subprocess import sys import unittest +try: + from hashlib import sha1 +except ImportError: + # Python 2.4 uses this name. + from sha import sha as sha1 + # Special tricks to load a module whose filename contains a dash and doesn't end # in ".py". import imp @@ -13,6 +22,7 @@ dont_write_bytecode = sys.dont_write_bytecode sys.dont_write_bytecode = True flashproxy = imp.load_source("flashproxy", "flashproxy-client") parse_socks_request = flashproxy.parse_socks_request +handle_websocket_request = flashproxy.handle_websocket_request WebSocketDecoder = flashproxy.WebSocketDecoder WebSocketEncoder = flashproxy.WebSocketEncoder sys.dont_write_bytecode = dont_write_bytecode @@ -40,6 +50,165 @@ class TestSocks(unittest.TestCase): def test_parse_socks_request_hostname(self): dest, port = parse_socks_request("\x04\x01\x99\x99\x00\x00\x00\x01userid\x00abc\x00") +class DummySocket(object): + def __init__(self, read_fd, write_fd): + self.read_fd = read_fd + self.write_fd = write_fd + self.readp = 0 + + def read(self, *args, **kwargs): + self.read_fd.seek(self.readp, 0) + data = self.read_fd.read(*args, **kwargs) + self.readp = self.read_fd.tell() + return data + + def readline(self, *args, **kwargs): + self.read_fd.seek(self.readp, 0) + data = self.read_fd.readline(*args, **kwargs) + self.readp = self.read_fd.tell() + return data + + def recv(self, size, *args, **kwargs): + return self.read(size) + + def write(self, data): + self.write_fd.seek(0, 2) + self.write_fd.write(data) + + def send(self, data, *args, **kwargs): + return self.write(data) + + def sendall(self, data, *args, **kwargs): + return self.write(data) + + def makefile(self, *args, **kwargs): + return self + +def dummy_socketpair(): + f1 = cStringIO.StringIO() + f2 = cStringIO.StringIO() + return (DummySocket(f1, f2), DummySocket(f2, f1)) + +class HTTPRequest(object): + def __init__(self): + self.method = "GET" + self.path = "/" + self.headers = {} + +def transact_http(req): + l, r = dummy_socketpair() + r.send("%s %s HTTP/1.0\r\n" % (req.method, req.path)) + for k, v in req.headers.items(): + r.send("%s: %s\r\n" % (k, v)) + r.send("\r\n") + protocols = handle_websocket_request(l) + + resp = httplib.HTTPResponse(r) + resp.begin() + return resp, protocols + +class TestHandleWebSocketRequest(unittest.TestCase): + DEFAULT_KEY = "0123456789ABCDEF" + DEFAULT_KEY_BASE64 = base64.b64encode(DEFAULT_KEY) + MAGIC_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11" + + @staticmethod + def default_req(): + req = HTTPRequest() + req.method = "GET" + req.path = "/" + req.headers["Upgrade"] = "websocket" + req.headers["Connection"] = "Upgrade" + req.headers["Sec-WebSocket-Key"] = TestHandleWebSocketRequest.DEFAULT_KEY_BASE64 + req.headers["Sec-WebSocket-Version"] = "13" + + return req + + def assert_ok(self, req): + resp, protocols = transact_http(req) + self.assertEqual(resp.status, 101) + self.assertEqual(resp.getheader("Upgrade").lower(), "websocket") + self.assertEqual(resp.getheader("Connection").lower(), "upgrade") + self.assertEqual(resp.getheader("Sec-WebSocket-Accept"), base64.b64encode(sha1(self.DEFAULT_KEY_BASE64 + self.MAGIC_GUID).digest())) + self.assertEqual(protocols, []) + + def assert_not_ok(self, req): + resp, protocols = transact_http(req) + self.assertEqual(resp.status // 100, 4) + self.assertEqual(protocols, None) + + def test_default(self): + req = self.default_req() + self.assert_ok(req) + + def test_missing_upgrade(self): + req = self.default_req() + del req.headers["Upgrade"] + self.assert_not_ok(req) + + def test_missing_connection(self): + req = self.default_req() + del req.headers["Connection"] + self.assert_not_ok(req) + + def test_case_insensitivity(self): + """Test that the values of the Upgrade and Connection headers are + case-insensitive.""" + req = self.default_req() + req.headers["Upgrade"] = req.headers["Upgrade"].lower() + self.assert_ok(req) + req.headers["Upgrade"] = req.headers["Upgrade"].upper() + self.assert_ok(req) + req.headers["Connection"] = req.headers["Connection"].lower() + self.assert_ok(req) + req.headers["Connection"] = req.headers["Connection"].upper() + self.assert_ok(req) + + def test_bogus_key(self): + req = self.default_req() + req.headers["Sec-WebSocket-Key"] = base64.b64encode(self.DEFAULT_KEY[:-1]) + self.assert_not_ok(req) + + req.headers["Sec-WebSocket-Key"] = "///" + self.assert_not_ok(req) + + def test_versions(self): + req = self.default_req() + req.headers["Sec-WebSocket-Version"] = "13" + self.assert_ok(req) + req.headers["Sec-WebSocket-Version"] = "8" + self.assert_ok(req) + + req.headers["Sec-WebSocket-Version"] = "7" + self.assert_not_ok(req) + req.headers["Sec-WebSocket-Version"] = "9" + self.assert_not_ok(req) + + del req.headers["Sec-WebSocket-Version"] + self.assert_not_ok(req) + + def test_protocols(self): + req = self.default_req() + req.headers["Sec-WebSocket-Protocol"] = "base64" + resp, protocols = transact_http(req) + self.assertEqual(resp.status, 101) + self.assertEqual(protocols, ["base64"]) + self.assertEqual(resp.getheader("Sec-WebSocket-Protocol"), "base64") + + req = self.default_req() + req.headers["Sec-WebSocket-Protocol"] = "cat" + resp, protocols = transact_http(req) + self.assertEqual(resp.status, 101) + self.assertEqual(protocols, ["cat"]) + self.assertEqual(resp.getheader("Sec-WebSocket-Protocol"), None) + + req = self.default_req() + req.headers["Sec-WebSocket-Protocol"] = "cat, base64" + resp, protocols = transact_http(req) + self.assertEqual(resp.status, 101) + self.assertEqual(protocols, ["cat", "base64"]) + self.assertEqual(resp.getheader("Sec-WebSocket-Protocol"), "base64") + def read_frames(dec): frames = [] while True:

1 0

[flashproxy/master] Don't crash when the Upgrade or Connection headers are missing.
by dcf＠torproject.org 07 Sep '12

07 Sep '12

commit 508079f995abdc054ca153d8ae109f80bc6e344d Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 7 05:05:14 2012 -0700 Don't crash when the Upgrade or Connection headers are missing. --- flashproxy-client | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index daf710b..dfe060f 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -485,13 +485,21 @@ def handle_websocket_request(fd): # 3. An |Upgrade| header field containing the value "websocket", treated as # an ASCII case-insensitive value. - if "websocket" not in [x.strip().lower() for x in headers.get("upgrade").split(",")]: + upgrade = headers.get("upgrade") + if upgrade is None: + handler.send_error(400) + return None + if "websocket" not in [x.strip().lower() for x in upgrade.split(",")]: handler.send_error(400) return None # 4. A |Connection| header field that includes the token "Upgrade", treated # as an ASCII case-insensitive value. - if "upgrade" not in [x.strip().lower() for x in headers.get("connection").split(",")]: + connection = headers.get("connection") + if connection is None: + handler.send_error(400) + return None + if "upgrade" not in [x.strip().lower() for x in connection.split(",")]: handler.send_error(400) return None

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit fdae985c88bee3d2eff2f91a5686519aa7a9667b Merge: 9e6ba63 e0f7cf9 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Aug 2 16:29:24 2012 -0700 Merge branch 'maint-2.3' ...solate-the-Image-Cache-per-url-bar-domain.patch | 32 ++++++++++++-------- 1 files changed, 19 insertions(+), 13 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit b05e24326c4ec9826231cfafdce314e5659149c5 Merge: 1f4bfd8 fe62dab Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 31 18:17:43 2012 -0700 Merge branch 'maint-2.3' build-scripts/config/prefs.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit 9e6ba63ee4f141f9f3bf5f82741e659f8e76a5c0 Merge: d716d11 7f0cf43 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Aug 2 07:57:49 2012 +0100 Merge branch 'maint-2.3' build-scripts/config/alpha/torrc-obfsproxy-linux | 31 ++++++++++++++++ build-scripts/config/alpha/torrc-obfsproxy-osx | 31 ++++++++++++++++ .../config/alpha/vidalia.conf.ff-obfsproxy | 15 -------- .../config/alpha/vidalia.conf.ff-obfsproxy-linux | 21 +++++++++++ .../config/alpha/vidalia.conf.ff-obfsproxy-osx | 20 +++++++++++ build-scripts/linux-alpha.mk | 37 +++++++++++++++++++- build-scripts/osx-alpha.mk | 34 +++++++++++++++++- build-scripts/windows-alpha.mk | 35 +++++++++++++++++-- 8 files changed, 204 insertions(+), 20 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit d716d11ec10af4c3a04ae68a85cf16f675a44f8a Merge: b05e243 d8e36b1 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Aug 1 14:31:28 2012 -0700 Merge branch 'maint-2.3' ...0-Add-a-redirect-API-for-HTTPS-Everywhere.patch | 346 ++++++++ ...solate-the-Image-Cache-per-url-bar-domain.patch | 904 ++++++++++++++++++++ 2 files changed, 1250 insertions(+), 0 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit 1f4bfd86f6d351be637b5ee0a8aa78bce22e2090 Merge: 0087524 fb8c3ea Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 31 18:01:19 2012 -0700 Merge branch 'maint-2.2' build-scripts/config/prefs.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.3'
by erinn＠torproject.org 07 Sep '12

07 Sep '12

commit c85e20f2cc40dcc9fdae18c2cf482e575766dd10 Merge: d486476 1e3b8a5 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 6 02:16:43 2012 +0100 Merge branch 'maint-2.3' README.LINUX-2.3 | 2 +- README.OSX-2.3 | 2 +- README.WIN-2.3 | 2 +- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.3 | 3 ++- changelog.osx-2.3 | 3 ++- changelog.windows-2.3 | 3 ++- 10 files changed, 13 insertions(+), 10 deletions(-)

1 0