- tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 31 Aug '12

31 Aug '12

commit b79649ed33a9cca77830ffec7e23675134e86d20 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 31 18:15:36 2012 +0000 Update translations for https_everywhere --- sk/https-everywhere.properties | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sk/https-everywhere.properties b/sk/https-everywhere.properties index 29d0a44..e69247e 100644 --- a/sk/https-everywhere.properties +++ b/sk/https-everywhere.properties @@ -1,5 +1,5 @@ https-everywhere.menu.globalEnable = Povoliť HTTPS Everywhere https-everywhere.menu.globalDisable = Zakázať HTTPS Everywhere -# https-everywhere.menu.enableDisable = Enable / Disable Rules -# https-everywhere.menu.noRules = (No Rules for This Page) -# https-everywhere.menu.unknownRules = (Rules for This Page Unknown) +https-everywhere.menu.enableDisable = Povoliť / Zakázať Pravidlá +https-everywhere.menu.noRules = (Pre Túto Stránku Neexistujú Žiadne Pravidlá) +https-everywhere.menu.unknownRules = (Pravidlá Pre Túto Stránku Sú Neznáme)

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 31 Aug '12

31 Aug '12

commit 72df7b49a6d1b216788e6eb6d95cf89dd7fb9a4f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 31 18:15:23 2012 +0000 Update translations for vidalia_help --- sk/links.po | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sk/links.po b/sk/links.po index d8977f1..b22651c 100644 --- a/sk/links.po +++ b/sk/links.po @@ -1,12 +1,13 @@ # # Translators: +# <koloman375(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-05 20:21+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-08-31 18:13+0000\n" +"Last-Translator: K0L0M4N <koloman375(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: links.html:16 msgid "Helpful Links" -msgstr "" +msgstr "Užitočné Odkazy" #. type: Content of: <html><body><h3> #: links.html:19 @@ -77,5 +78,3 @@ msgstr "" #: links.html:60 msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" msgstr "" - -

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 31 Aug '12

31 Aug '12

commit eb4aee12d92968361fc1eb7cf93db8aff4241fde Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 31 18:15:03 2012 +0000 Update translations for bridgedb --- sk/bridgedb.po | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/sk/bridgedb.po b/sk/bridgedb.po new file mode 100644 index 0000000..7d408ab --- /dev/null +++ b/sk/bridgedb.po @@ -0,0 +1,72 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-01-01 07:48-0800\n" +"PO-Revision-Date: 2011-02-19 16:53+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sk\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" + +#: lib/bridgedb/I18n.py:21 +msgid "Here are your bridge relays: " +msgstr "" + +#: lib/bridgedb/I18n.py:23 +msgid "" +"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" +"in the main directory. Since there is no complete public list of them,\n" +"even if your ISP is filtering connections to all the known Tor relays,\n" +"they probably won't be able to block all the bridges." +msgstr "" + +#: lib/bridgedb/I18n.py:28 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click\n" +"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" +"address one at a time." +msgstr "" + +#: lib/bridgedb/I18n.py:32 +msgid "" +"Configuring more than one bridge address will make your Tor connection\n" +"more stable, in case some of the bridges become unreachable." +msgstr "" + +#: lib/bridgedb/I18n.py:35 +msgid "" +"Another way to find public bridge addresses is to send mail to\n" +"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" +"of the mail. However, so we can make it harder for an attacker to learn\n" +"lots of bridge addresses, you must send this request from an email address at\n" +"one of the following domains:" +msgstr "" + +#: lib/bridgedb/I18n.py:41 +msgid "[This is an automated message; please do not reply.]" +msgstr "" + +#: lib/bridgedb/I18n.py:43 +msgid "" +"Another way to find public bridge addresses is to visit\n" +"https://bridges.torproject.org/. The answers you get from that page\n" +"will change every few days, so check back periodically if you need more\n" +"bridge addresses." +msgstr "" + +#: lib/bridgedb/I18n.py:48 +msgid "(no bridges currently available)" +msgstr "" + +#: lib/bridgedb/I18n.py:50 +msgid "(e-mail requests not currently supported)" +msgstr ""

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 31 Aug '12

31 Aug '12

commit 5062a96cedc4fc9ded5bee02b9deff8d6c47e930 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 31 16:15:08 2012 +0000 Update translations for orbot_completed --- values-fa/strings.xml | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/values-fa/strings.xml b/values-fa/strings.xml index f7c8033..43a8b8a 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -1,14 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">رباط پیازی</string> - <string name="internal_web_url">http://orbot/</string> + <string name="internal_web_url">https://guardianproject.info/apps/orbot/</string> <string name="default_web_url">https://check.torproject.org/?lang=fa_IR</string> <string name="secure_default_web_url">https://check.torproject.org/?lang=fa_IR</string> <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> - <string name="control_permission_label">شروع و پایان Tor</string> + <string name="control_permission_label">شروع و پایان تور</string> <string name="tor_proxy_service_process">سرويس پروکسی تور</string> <string name="status_starting_up">رباط پیازی درحال آغاز است...</string> - <string name="status_activated">پیوسته به شبکه Tor</string> + <string name="status_activated">پیوسته به شبکه تور</string> <string name="status_disabled">رباط پیازی غیرفعال شده است.</string> <string name="status_shutting_down">رباط پیازی در حال بسته شدن است.</string> <string name="tor_process_starting">شروع کلاینت تور...</string> @@ -56,7 +56,7 @@ <string name="btn_cancel">لغو</string>  <string name="wizard_details">برخی جزییات درباره رباط پیازی</string> - <string name="wizard_details_msg">رباط پیازی اپلیکیشنی با متن-باز است که شامل Tor, LibEvent و Privoxy. این اپلیکیشن، HTTP پروکسی (8118) محلی و SOCKS پروکسی (9050) را در شبکه Tor در دسترس قرار می دهد. اوربات همچنین قادر است بر روی ابزار root شده، تمام ترافیک اینترنت را از Tor ارسال کند.</string> + <string name="wizard_details_msg">رباط پیازی اپلیکیشنی با متن-باز است که شامل تور, LibEvent و Privoxy. این اپلیکیشن، HTTP پروکسی (8118) محلی و SOCKS پروکسی (9050) را در شبکه Tor در دسترس قرار می دهد. اوربات همچنین قادر است بر روی ابزار root شده، تمام ترافیک اینترنت را از Tor ارسال کند.</string> <string name="wizard_permissions_root">مجوز صادر گردید</string> <string name="wizard_permissions_stock">مجوزهای رباط پیازی</string> <string name="wizard_premissions_msg_root">بسیار عالی! اینطور که معلوم است شما دارای مجوز root برای فعال کردن رباط پیازی هستید. این امکان را بخوبی مورد استفاده قرار خواهیم داد.</string> @@ -113,7 +113,7 @@ <string name="pref_transparent_tethering_summary"> - از طریق یو اس بی Tethering برای دستگاه های وای فای و تور فعال کردن پروکسی شفاف \n(به ری استارت نیاز دارند)</string> <string name="button_grant_superuser">درخواست دسترسی برای سوپریوزر</string> <string name="pref_select_apps">انتخاب برنامه ها</string> - <string name="pref_select_apps_summary">Tor انتخاب اپلیکیشن برای مسیریابی از طریق </string> + <string name="pref_select_apps_summary">تور انتخاب اپلیکیشن برای مسیریابی از طریق </string> <string name="pref_node_configuration">تنظیمات گره</string> <string name="pref_node_configuration_summary">اینها تنظیمات پیشرفته ای هستند که ممکن است گمنامی شما را کاهش دهند</string> <string name="pref_entrance_node">گره های ورودی</string> @@ -187,7 +187,7 @@ <string name="the_tor_license">گواهی تور</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software:</string> - <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> + <string name="tor_version">تور v0.2.3.10: https://www.torproject.org</string> <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> @@ -206,7 +206,7 @@ <string name="notification_using_bridges">پل ها فعال شدند!</string> <string name="default_bridges"/> <string name="set_locale_title">زبان محلی را مشخص کنید</string> - <string name="set_locale_summary">زبان محلی Orbot را انتخاب کنید</string> + <string name="set_locale_summary">زبان محلی رباط پیازی را انتخاب کنید</string> <string name="wizard_locale_title">انتخاب زبان</string> <string name="wizard_locale_msg">زبان کنونی را تعویض و یا به شکل پیشفرض رهایش کنید</string> <string name="powered_by">نیرو گرفته از پروژه تور</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 31 Aug '12

31 Aug '12

commit bc21182e4ace94043d79ddad5d90558c72232b4f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 31 16:15:06 2012 +0000 Update translations for orbot --- values-fa/strings.xml | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/values-fa/strings.xml b/values-fa/strings.xml index f7c8033..43a8b8a 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -1,14 +1,14 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">رباط پیازی</string> - <string name="internal_web_url">http://orbot/</string> + <string name="internal_web_url">https://guardianproject.info/apps/orbot/</string> <string name="default_web_url">https://check.torproject.org/?lang=fa_IR</string> <string name="secure_default_web_url">https://check.torproject.org/?lang=fa_IR</string> <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> - <string name="control_permission_label">شروع و پایان Tor</string> + <string name="control_permission_label">شروع و پایان تور</string> <string name="tor_proxy_service_process">سرويس پروکسی تور</string> <string name="status_starting_up">رباط پیازی درحال آغاز است...</string> - <string name="status_activated">پیوسته به شبکه Tor</string> + <string name="status_activated">پیوسته به شبکه تور</string> <string name="status_disabled">رباط پیازی غیرفعال شده است.</string> <string name="status_shutting_down">رباط پیازی در حال بسته شدن است.</string> <string name="tor_process_starting">شروع کلاینت تور...</string> @@ -56,7 +56,7 @@ <string name="btn_cancel">لغو</string>  <string name="wizard_details">برخی جزییات درباره رباط پیازی</string> - <string name="wizard_details_msg">رباط پیازی اپلیکیشنی با متن-باز است که شامل Tor, LibEvent و Privoxy. این اپلیکیشن، HTTP پروکسی (8118) محلی و SOCKS پروکسی (9050) را در شبکه Tor در دسترس قرار می دهد. اوربات همچنین قادر است بر روی ابزار root شده، تمام ترافیک اینترنت را از Tor ارسال کند.</string> + <string name="wizard_details_msg">رباط پیازی اپلیکیشنی با متن-باز است که شامل تور, LibEvent و Privoxy. این اپلیکیشن، HTTP پروکسی (8118) محلی و SOCKS پروکسی (9050) را در شبکه Tor در دسترس قرار می دهد. اوربات همچنین قادر است بر روی ابزار root شده، تمام ترافیک اینترنت را از Tor ارسال کند.</string> <string name="wizard_permissions_root">مجوز صادر گردید</string> <string name="wizard_permissions_stock">مجوزهای رباط پیازی</string> <string name="wizard_premissions_msg_root">بسیار عالی! اینطور که معلوم است شما دارای مجوز root برای فعال کردن رباط پیازی هستید. این امکان را بخوبی مورد استفاده قرار خواهیم داد.</string> @@ -113,7 +113,7 @@ <string name="pref_transparent_tethering_summary"> - از طریق یو اس بی Tethering برای دستگاه های وای فای و تور فعال کردن پروکسی شفاف \n(به ری استارت نیاز دارند)</string> <string name="button_grant_superuser">درخواست دسترسی برای سوپریوزر</string> <string name="pref_select_apps">انتخاب برنامه ها</string> - <string name="pref_select_apps_summary">Tor انتخاب اپلیکیشن برای مسیریابی از طریق </string> + <string name="pref_select_apps_summary">تور انتخاب اپلیکیشن برای مسیریابی از طریق </string> <string name="pref_node_configuration">تنظیمات گره</string> <string name="pref_node_configuration_summary">اینها تنظیمات پیشرفته ای هستند که ممکن است گمنامی شما را کاهش دهند</string> <string name="pref_entrance_node">گره های ورودی</string> @@ -187,7 +187,7 @@ <string name="the_tor_license">گواهی تور</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software:</string> - <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> + <string name="tor_version">تور v0.2.3.10: https://www.torproject.org</string> <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> @@ -206,7 +206,7 @@ <string name="notification_using_bridges">پل ها فعال شدند!</string> <string name="default_bridges"/> <string name="set_locale_title">زبان محلی را مشخص کنید</string> - <string name="set_locale_summary">زبان محلی Orbot را انتخاب کنید</string> + <string name="set_locale_summary">زبان محلی رباط پیازی را انتخاب کنید</string> <string name="wizard_locale_title">انتخاب زبان</string> <string name="wizard_locale_msg">زبان کنونی را تعویض و یا به شکل پیشفرض رهایش کنید</string> <string name="powered_by">نیرو گرفته از پروژه تور</string>

1 0

[flashproxy/master] Comment typo, thanks arma.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit 64a9fde70c5e78ad2a4116c9058ac82b8491da76 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Aug 31 04:52:22 2012 -0700 Comment typo, thanks arma. --- facilitator/facilitator | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 3695b52..9d8d3af 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -18,7 +18,7 @@ DEFAULT_LOG_FILENAME = "facilitator.log" # Don't indulge clients for more than this many seconds. CLIENT_TIMEOUT = 1.0 -# Buffer no many than this many bytes when trying to read a line. +# Buffer no more than this many bytes when trying to read a line. READLINE_MAX_LENGTH = 10240 LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"

1 0

[flashproxy/master] Add readline abstraction.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit d3e4263f443da5760fe7ed533fa1dbd48e4bc54a Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 7 07:31:31 2012 -0700 Add readline abstraction. --- facilitator | 42 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 3 deletions(-) diff --git a/facilitator b/facilitator index 26c964d..16782cc 100755 --- a/facilitator +++ b/facilitator @@ -16,6 +16,8 @@ DEFAULT_LOG_FILENAME = "facilitator.log" # Don't indulge clients for more than this many seconds. CLIENT_TIMEOUT = 1.0 +# Buffer no many than this many bytes when trying to read a line. +READLINE_MAX_LENGTH = 10240 LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" @@ -115,6 +117,8 @@ def format_addr(addr): class Handler(SocketServer.StreamRequestHandler): def __init__(self, *args, **kwargs): self.deadline = time.time() + CLIENT_TIMEOUT + # Buffer for readline. + self.buffer = "" SocketServer.StreamRequestHandler.__init__(self, *args, **kwargs) def recv(self): @@ -123,13 +127,45 @@ class Handler(SocketServer.StreamRequestHandler): return self.connection.recv(1024) def readline(self): + # A line already buffered? + i = self.buffer.find("\n") + if i >= 0: + line = self.buffer[:i+1] + self.buffer = self.buffer[i+1:] + return line + + auxbuf = [] + buflen = len(self.buffer) while True: - self.connection.settimeout(timeout) + data = self.recv() + if not data: + if self.buffer or auxbuf: + raise socket.error("readline: stream does not end with a newline") + else: + return "" + i = data.find("\n") + if i >= 0: + line = self.buffer + "".join(auxbuf) + data[:i+1] + self.buffer = data[i+1:] + return line + else: + auxbuf.append(data) + buflen += len(data) + if buflen >= READLINE_MAX_LENGTH: + raise socket.error("readline: refusing to buffer %d bytes (last read was %d bytes)" % (buflen, len(data))) def handle(self): + num_lines = 0 while True: - data = self.recv() - print repr(data) + try: + line = self.readline() + if not line: + break + num_lines += 1 + except socket.error, e: + log("socket error after reading %d lines: %s" % (num_lines, str(e))) + break + print "line", repr(line) class Server(SocketServer.ThreadingMixIn, SocketServer.TCPServer): allow_reuse_address = True

1 0

[flashproxy/master] Add skeleton facilitator test.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit b9e9ed718794e485b7bf3079d9e4d5c30e4d6c14 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 7 02:14:07 2012 -0700 Add skeleton facilitator test. --- Makefile | 1 + facilitator-test | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index a12a9f3..3a15e54 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ clean: rm -rf dist test: + ./facilitator-test ./flashproxy-client-test ./flashproxy-test.js diff --git a/facilitator-test b/facilitator-test new file mode 100755 index 0000000..bdc064d --- /dev/null +++ b/facilitator-test @@ -0,0 +1,45 @@ +#!/usr/bin/env python + +import socket +import subprocess +import time +import unittest + +FACILITATOR_HOST = "127.0.0.1" +FACILITATOR_PORT = 9002 + +def gimme_socket(host, port): + addrinfo = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM, socket.IPPROTO_TCP)[0] + s = socket.socket(addrinfo[0], addrinfo[1], addrinfo[2]) + s.settimeout(10.0) + s.connect(addrinfo[4]) + return s + +class FacilitatorTest(unittest.TestCase): + def gimme_socket(self): + return gimme_socket(FACILITATOR_HOST, FACILITATOR_PORT) + + def setUp(self): + self.process = subprocess.Popen(["./facilitator", "-d", "-p", str(FACILITATOR_PORT), "-r", "0.0.0.0:0", "-l", "/dev/null"]) + time.sleep(0.1) + + def tearDown(self): + self.process.terminate() + + def test_timeout(self): + """Test that the socket will not accept slow writes indefinitely. + Successive sends should not reset the timeout counter.""" + s = self.gimme_socket() + time.sleep(0.3) + s.send("w") + time.sleep(0.3) + s.send("w") + time.sleep(0.3) + s.send("w") + time.sleep(0.3) + s.send("w") + time.sleep(0.3) + self.assertRaises(socket.error, s.send, "w") + +if __name__ == "__main__": + unittest.main()

1 0

[flashproxy/master] Parse input commands.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit 12fe309124e0f2099716db600fa0e5d68fac30b3 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 13 04:07:31 2012 -0700 Parse input commands. --- facilitator | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 1 deletions(-) diff --git a/facilitator b/facilitator index 16782cc..90fb1d8 100755 --- a/facilitator +++ b/facilitator @@ -114,6 +114,65 @@ def format_addr(addr): else: return u"%s:%d" % (host, port) +def skip_space(pos, line): + """Skip a (possibly empty) sequence of space characters (the ASCII character + '\x20' exactly). Returns a pair (pos, num_skipped).""" + begin = pos + while pos < len(line) and line[pos] == "\x20": + pos += 1 + return pos, pos - begin + +TOKEN_CHARS = set("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-") +def get_token(pos, line): + begin = pos + while pos < len(line) and line[pos] in TOKEN_CHARS: + pos += 1 + if begin == pos: + raise ValueError("No token found at position %d" % pos) + return pos, line[begin:pos] + +def get_quoted_string(pos, line): + chars = [] + if not (pos < len(line) and line[pos] == '"'): + raise ValueError("Expected '\"' at beginning of quoted string.") + pos += 1 + while pos < len(line) and line[pos] != '"': + if line[pos] == '\\': + pos += 1 + if not (pos < len(line)): + raise ValueError("End of line after backslash in quoted string") + chars.append(line[pos]) + pos += 1 + if not (pos < len(line) and line[pos] == '"'): + raise ValueError("Expected '\"' at end of quoted string.") + pos += 1 + return pos, "".join(chars) + +def parse_command(line): + """A line is a command followed by zero or more key-value pairs. Like so: + COMMAND KEY="VALUE" KEY="\"ESCAPED\" VALUE" + Values must be quoted. Any byte value may be escaped with a backslash. + Returns a pair: (COMMAND, ((KEY1, VALUE1), (KEY2, VALUE2), ...)). + """ + pos = 0 + pos, skipped = skip_space(pos, line) + pos, command = get_token(pos, line) + + pairs = [] + while True: + pos, skipped = skip_space(pos, line) + if not (pos < len(line)): + break + if skipped == 0: + raise ValueError("Expected space before key-value pair") + pos, key = get_token(pos, line) + if not (pos < len(line) and line[pos] == '='): + raise ValueError("No '=' found after key") + pos += 1 + pos, value = get_quoted_string(pos, line) + pairs.append((key, value)) + return command, tuple(pairs) + class Handler(SocketServer.StreamRequestHandler): def __init__(self, *args, **kwargs): self.deadline = time.time() + CLIENT_TIMEOUT @@ -165,7 +224,13 @@ class Handler(SocketServer.StreamRequestHandler): except socket.error, e: log("socket error after reading %d lines: %s" % (num_lines, str(e))) break - print "line", repr(line) + self.handle_line(line) + + def handle_line(self, line): + if not (len(line) > 0 and line[-1] == '\n'): + raise ValueError("No newline at end of string returned by readline") + command, pairs = parse_command(line[:-1]) + print command, pairs class Server(SocketServer.ThreadingMixIn, SocketServer.TCPServer): allow_reuse_address = True

1 0

[flashproxy/master] Add a test for readline limit.
by dcf＠torproject.org 31 Aug '12

31 Aug '12

commit ed2506d10deaf8979e56ac57be3b8d3dc25e5b7e Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 7 07:48:39 2012 -0700 Add a test for readline limit. --- facilitator-test | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/facilitator-test b/facilitator-test index bdc064d..4e2ec56 100755 --- a/facilitator-test +++ b/facilitator-test @@ -41,5 +41,17 @@ class FacilitatorTest(unittest.TestCase): time.sleep(0.3) self.assertRaises(socket.error, s.send, "w") + def test_readline_limit(self): + """Test that reads won't buffer indefinitely.""" + s = self.gimme_socket() + buflen = 0 + try: + while buflen + 1024 < 200000: + s.send("X" * 1024) + buflen += 1024 + self.fail("should have raised a socket error") + except socket.error: + pass + if __name__ == "__main__": unittest.main()

1 0