April 2015 - tor-commits - lists.torproject.org

[meek/master] Use persistent connections in the WSGI reflector.
by dcf＠torproject.org 12 Apr '15

12 Apr '15

commit e06bcf2c849075cf241addf2182dfc0125a35c92 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 7 09:36:35 2015 -0700 Use persistent connections in the WSGI reflector. This improves performance quite a lot--previously we were doing a complete TCP and TLS handshake to meek-server for every single request, which, apart from increasing latency, also caused a lot of CPU usage on meek-server. it was up above 80% when I checked it. Now we reuse connections until they error out, making a new connection if all others are currently busy. --- wsgi/reflect.py | 90 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 30 deletions(-) diff --git a/wsgi/reflect.py b/wsgi/reflect.py index e9bff42..5b89f6a 100644 --- a/wsgi/reflect.py +++ b/wsgi/reflect.py @@ -2,35 +2,18 @@ import httplib import urlparse +import threading FORWARD_URL = "https://meek.bamsoftware.com/" TIMEOUT = 20 BUFSIZ = 2048 +MAX_REQUEST_LENGTH = 0x10000 REFLECTED_HEADER_FIELDS = [ "Content-Type", "X-Session-Id", ] -# Limits a file-like object to reading only n bytes. Used to limit wsgi.input to -# the Content-Length, otherwise it blocks. -class LimitedReader(object): - def __init__(self, f, n): - self.f = f - self.n = n - - def __getattr__(self, name): - return getattr(self.f, name) - - def read(self, size=None): - if self.n <= 0: - return "" - if size is None or size > self.n: - size = self.n - data = self.f.read(size) - self.n -= len(data) - return data - # Join two URL paths. def path_join(a, b): if a.endswith("/"): @@ -60,8 +43,14 @@ def copy_request(environ, url): content_length = environ.get("CONTENT_LENGTH") if content_length: - body = LimitedReader(environ["wsgi.input"], int(content_length)) - headers.append(("Content-Length", content_length)) + content_length = int(content_length) + # We read the whole response body (and limit its length). Normally we + # would just pass environ["wsgi.input"] as the body to + # HTTPSConnection.request. But make_request may need to try the request + # twice, in which case it needs to send the same body the second time. + if content_length > MAX_REQUEST_LENGTH: + raise ValueError("Content-Length too large: %d" % content_length) + body = environ["wsgi.input"].read(content_length) else: body = "" @@ -73,18 +62,56 @@ def copy_request(environ, url): return method, url, body, headers -def make_conn(url): - u = urlparse.urlsplit(url) - create_connection = httplib.HTTPConnection - if u.scheme == "https": - create_connection = httplib.HTTPSConnection - return create_connection(u.hostname, u.port, strict=True, timeout=TIMEOUT) +# We want to reuse persistent HTTPSConnections. If we don't then every request +# will start a branch new TCP and TLS connection, leading to increased latency +# and high CPU use on meek-server. A pool just locks connections so only one +# thread can use a connection at a time. If the connection is still good after +# use, then the caller should put it back by calling restore_conn. +class ConnectionPool(object): + def __init__(self, url): + self.url = urlparse.urlsplit(url) + self.conns = [] + self.lock = threading.RLock() + + def new_conn(self): + create_connection = httplib.HTTPConnection + if self.url.scheme == "https": + create_connection = httplib.HTTPSConnection + return create_connection(self.url.hostname, self.url.port, strict=True, timeout=TIMEOUT) + + def get_conn(self): + with self.lock: + try: + return self.conns.pop(0) + except IndexError: + pass + return self.new_conn() + + def restore_conn(self, conn): + with self.lock: + self.conns.append(conn) def make_request(conn, method, url, body, headers): u = urlparse.urlsplit(url) path = urlparse.urlunsplit(("", "", u.path, u.query, "")) conn.request(method, path, body, headers) - return conn.getresponse() + try: + return conn.getresponse() + except httplib.BadStatusLine, e: + if e.message != "": + raise + # There's a very common error with httplib persistent connections. If + # you let a connection idle until it times out, then issue a request, + # you will get a BadStatusLine("") exception, not when the request is + # sent, but when getresponse tries to read from a closed socket. When + # that happens, we reinitialize the connection by first closing it, + # which will cause a new TCP and TLS handshake to happen for the next + # request. + conn.close() + conn.request(method, path, body, headers) + return conn.getresponse() + +pool = ConnectionPool(FORWARD_URL) def main(environ, start_response): try: @@ -93,10 +120,12 @@ def main(environ, start_response): start_response("400 Bad Request", [("Content-Type", "text/plain; charset=utf-8")]) yield "Bad Request" return + try: - conn = make_conn(url) + conn = pool.get_conn() resp = make_request(conn, method, url, body, headers) except Exception, e: + # Discard conn. start_response("500 Internal Server Error", [("Content-Type", "text/plain; charset=utf-8")]) yield "Internal Server Error" return @@ -114,7 +143,8 @@ def main(environ, start_response): break yield data - conn.close() + resp.close() + pool.restore_conn(conn) if __name__ == "__main__": import wsgiref.simple_server

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit 03bd8f178eaeb937ea1f35f70d87da287047dfc6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 07:15:39 2015 +0000 Update translations for tor-launcher-network-settings_completed --- zh_CN/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 4e6d5e1..7162b0f 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -47,9 +47,9 @@ <!ENTITY torsettings.useBridges.type "传输类型："> <!ENTITY torsettings.useBridges.custom "输入自定义网桥"> <!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。"> -<!ENTITY torsettings.useBridges.placeholder "输入地址:端口"> +<!ENTITY torsettings.useBridges.placeholder "输入 address:port"> -<!ENTITY torsettings.copyLog "请将 Tor 日志复制到剪贴板"> +<!ENTITY torsettings.copyLog "点击复制 Tor 日志"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> <!ENTITY torsettings.bridgeHelp1 "如果 Tor 网络无法连接，可能是因为互联网服务提供商 (ISP) 或其他机构对 Tor 进行了封锁。通常，使用 Tor 网桥可以解决这种问题。网桥指未公开的网络中继，更难于封锁。"> <!ENTITY torsettings.bridgeHelp1B "你可以使用本软件集成的一组网桥，也可以通过以下三种方法获取网桥。">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit 99bd7a9027e985a228a8befc38f5c165cb0ac860 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 07:15:33 2015 +0000 Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 4e6d5e1..7162b0f 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -47,9 +47,9 @@ <!ENTITY torsettings.useBridges.type "传输类型："> <!ENTITY torsettings.useBridges.custom "输入自定义网桥"> <!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。"> -<!ENTITY torsettings.useBridges.placeholder "输入地址:端口"> +<!ENTITY torsettings.useBridges.placeholder "输入 address:port"> -<!ENTITY torsettings.copyLog "请将 Tor 日志复制到剪贴板"> +<!ENTITY torsettings.copyLog "点击复制 Tor 日志"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> <!ENTITY torsettings.bridgeHelp1 "如果 Tor 网络无法连接，可能是因为互联网服务提供商 (ISP) 或其他机构对 Tor 进行了封锁。通常，使用 Tor 网桥可以解决这种问题。网桥指未公开的网络中继，更难于封锁。"> <!ENTITY torsettings.bridgeHelp1B "你可以使用本软件集成的一组网桥，也可以通过以下三种方法获取网桥。">

1 0

[meek/master] Make WSGI LimitedReader.read() work when not given a size.
by dcf＠torproject.org 12 Apr '15

12 Apr '15

commit d9f9913e8987d020bf16d19d0dad1578e94d5a92 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 9 10:23:30 2015 -0700 Make WSGI LimitedReader.read() work when not given a size. It was reading unlimitedly in this case. --- wsgi/reflect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wsgi/reflect.py b/wsgi/reflect.py index 4a522b4..e9bff42 100644 --- a/wsgi/reflect.py +++ b/wsgi/reflect.py @@ -25,7 +25,7 @@ class LimitedReader(object): def read(self, size=None): if self.n <= 0: return "" - if size is not None and size > self.n: + if size is None or size > self.n: size = self.n data = self.f.read(size) self.n -= len(data)

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit 0142e293ead92cf1a3532c159d4f413b0f97e70b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 02:16:28 2015 +0000 Update translations for tails-perl5lib_completed --- ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca.po b/ca.po index a197ab2..5547ad0 100644 --- a/ca.po +++ b/ca.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-06-24 11:37+0200\n" -"PO-Revision-Date: 2015-04-10 17:00+0000\n" +"PO-Revision-Date: 2015-04-12 02:08+0000\n" "Last-Translator: laia_ <laiaadorio(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit a9288a3f9b81b21189ab38701d39e886cbd512a9 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 02:16:25 2015 +0000 Update translations for tails-perl5lib --- ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca.po b/ca.po index a197ab2..5547ad0 100644 --- a/ca.po +++ b/ca.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-06-24 11:37+0200\n" -"PO-Revision-Date: 2015-04-10 17:00+0000\n" +"PO-Revision-Date: 2015-04-12 02:08+0000\n" "Last-Translator: laia_ <laiaadorio(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit a508e48c6ffef99e98210d2690ef7dd45892dc71 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 02:16:22 2015 +0000 Update translations for tails-iuk_completed --- ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca.po b/ca.po index 1ecf678..34f640f 100644 --- a/ca.po +++ b/ca.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-01-13 14:19+0100\n" -"PO-Revision-Date: 2015-04-10 17:03+0000\n" +"PO-Revision-Date: 2015-04-12 02:08+0000\n" "Last-Translator: laia_ <laiaadorio(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit 6513ee582462303b38b20969d01982a0b785da5a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 02:16:19 2015 +0000 Update translations for tails-iuk --- ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca.po b/ca.po index 1ecf678..34f640f 100644 --- a/ca.po +++ b/ca.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-01-13 14:19+0100\n" -"PO-Revision-Date: 2015-04-10 17:03+0000\n" +"PO-Revision-Date: 2015-04-12 02:08+0000\n" "Last-Translator: laia_ <laiaadorio(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit 297e7b326b415a78fd013d000012e536d110cd41 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 02:16:16 2015 +0000 Update translations for torbutton-torbuttondtd --- ku_IQ/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ku_IQ/torbutton.dtd b/ku_IQ/torbutton.dtd index 3e5ff86..57e8056 100644 --- a/ku_IQ/torbutton.dtd +++ b/ku_IQ/torbutton.dtd @@ -125,7 +125,7 @@ <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> -<!ENTITY torbutton.cookiedialog.nameCol "Name"> +<!ENTITY torbutton.cookiedialog.nameCol "ناو"> <!ENTITY torbutton.cookiedialog.pathCol "Path"> <!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie"> <!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 12 Apr '15

12 Apr '15

commit 522fc285916e491184926195612f81763b832114 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 12 02:16:11 2015 +0000 Update translations for torbutton-torbuttonproperties --- ku_IQ/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ku_IQ/torbutton.properties b/ku_IQ/torbutton.properties index 5d7703f..15a030a 100644 --- a/ku_IQ/torbutton.properties +++ b/ku_IQ/torbutton.properties @@ -33,7 +33,7 @@ torbutton.popup.external.app = Tor Browser cannot display this file. You will ne torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n torbutton.popup.launch = Download file -torbutton.popup.cancel = Cancel +torbutton.popup.cancel = پاشگەزبوونەوە torbutton.popup.dontask = Automatically download files from now on torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.captcha.title = Avoid Google Captchas?

1 0