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

[tor/master] Log the origin address of controller connections
by nickm＠torproject.org 25 Oct '13

25 Oct '13

commit 4b8282e50cce1c63afbf7f501de1312a6f283387 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 25 11:52:02 2013 -0400 Log the origin address of controller connections Resolves 9698; patch from "sigpipe". --- changes/bug9698 | 3 +++ src/or/connection.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug9698 b/changes/bug9698 new file mode 100644 index 0000000..ee5c4f6 --- /dev/null +++ b/changes/bug9698 @@ -0,0 +1,3 @@ + o Minor features: + - When receiving a new controller connection, log the origin address. + Resolves ticket 9698; patch from "sigpipe". diff --git a/src/or/connection.c b/src/or/connection.c index 8cf23ab..648fa32 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -334,7 +334,6 @@ control_connection_new(int socket_family) tor_malloc_zero(sizeof(control_connection_t)); connection_init(time(NULL), TO_CONN(control_conn), CONN_TYPE_CONTROL, socket_family); - log_notice(LD_CONTROL, "New control connection opened."); return control_conn; } @@ -1377,11 +1376,17 @@ connection_handle_listener_read(connection_t *conn, int new_type) TO_ENTRY_CONN(newconn)->socks_request->socks_prefer_no_auth = TO_LISTENER_CONN(conn)->socks_prefer_no_auth; } + if (new_type == CONN_TYPE_CONTROL) { + log_notice(LD_CONTROL, "New control connection opened from %s.", + fmt_and_decorate_addr(&addr)); + } } else if (conn->socket_family == AF_UNIX) { /* For now only control ports can be Unix domain sockets * and listeners at the same time */ tor_assert(conn->type == CONN_TYPE_CONTROL_LISTENER); + tor_assert(new_type == CONN_TYPE_CONTROL); + log_notice(LD_CONTROL, "New control connection opened."); newconn = connection_new(new_type, conn->socket_family); newconn->s = news;

1 0

[obfs-flash/master] work around tpo bug #10017 by extending StandardIO to take stdin/stdout fd params
by infinity0＠torproject.org 25 Oct '13

25 Oct '13

commit 6ac8b1c0db7366a70bcc9734c00ec2e19b8806e9 Author: Ximin Luo <infinity0(a)gmx.com> Date: Wed Oct 23 21:11:33 2013 +0100 work around tpo bug #10017 by extending StandardIO to take stdin/stdout fd params --- obfs-flash-client | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/obfs-flash-client b/obfs-flash-client index 24a2d67..93d2223 100755 --- a/obfs-flash-client +++ b/obfs-flash-client @@ -175,6 +175,46 @@ class SOCKS4WrapperFactory(Factory): self.remote_host = remote_host self.remote_port = remote_port +if sys.platform == "win32": + # TODO(infinity0): push this upstream to Twisted + from twisted.internet import _pollingfile + import msvcrt + + _StandardIO = StandardIO + class StandardIO(_StandardIO): + + def __init__(self, proto, stdin=None, stdout=None, reactor=None): + """ + Start talking to standard IO with the given protocol. + + Also, put it stdin/stdout/stderr into binary mode. + """ + if reactor is None: + import twisted.internet.reactor + reactor = twisted.internet.reactor + + _pollingfile._PollingTimer.__init__(self, reactor) + self.proto = proto + + fdstdin = stdin or sys.stdin.fileno() + fdstdout = stdout or sys.stdout.fileno() + + for stdfd in (fdstdin, fdstdout): + msvcrt.setmode(stdfd, os.O_BINARY) + + hstdin = msvcrt.get_osfhandle(fdstdin) + self.stdin = _pollingfile._PollableReadPipe( + hstdin, self.dataReceived, self.readConnectionLost) + + hstdout = msvcrt.get_osfhandle(fdstdout) + self.stdout = _pollingfile._PollableWritePipe( + hstdout, self.writeConnectionLost) + + self._addPollableResource(self.stdin) + self._addPollableResource(self.stdout) + + self.proto.makeConnection(self) + def pt_launch_child(reactor, client, methodnames, cmdline): """Launch a child PT and ensure it has the right transport methods.""" cur_env = pt_child_env(ManagedTransportProtocolV1.protocol_version)

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 24 Oct '13

24 Oct '13

commit 180ce0a6b7f8d4c9f8691fd986744aefa63ff0ef Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 24 23:15:56 2013 +0000 Update translations for liveusb-creator --- fa/fa.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index 320a2f7..094279a 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -8,13 +8,14 @@ # zendegi <hamahangi(a)posteo.eu>, 2013 # Joe.Ironsmith <joe_ironsmith(a)yahoo.com>, 2012 # mohammad.s.n, 2013 +# Mohammad Hosseini <PersianPolaris(a)Gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-09-09 11:21+0200\n" -"PO-Revision-Date: 2013-10-22 13:10+0000\n" -"Last-Translator: mohammad.s.n\n" +"PO-Revision-Date: 2013-10-24 22:50+0000\n" +"Last-Translator: Mohammad Hosseini <PersianPolaris(a)Gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -156,7 +157,7 @@ msgstr "درایو از نوع Loopback است. راه‌اندازی دوبار #: ../liveusb/creator.py:808 #, python-format msgid "Entering unmount_device for '%(device)s'" -msgstr "" +msgstr "وارد کردن دستگاه هاي وصل نشده براي '%(device)s'" #: ../liveusb/creator.py:1182 msgid "Error probing device"

1 0

r26396: {website} revert r26332 (website/trunk/about/en)
by Roger Dingledine 24 Oct '13

24 Oct '13

Author: arma Date: 2013-10-24 20:53:45 +0000 (Thu, 24 Oct 2013) New Revision: 26396 Modified: website/trunk/about/en/sponsors.wml Log: revert r26332 Modified: website/trunk/about/en/sponsors.wml =================================================================== --- website/trunk/about/en/sponsors.wml 2013-10-24 17:17:23 UTC (rev 26395) +++ website/trunk/about/en/sponsors.wml 2013-10-24 20:53:45 UTC (rev 26396) @@ -32,7 +32,8 @@ <h3><i>Asparagales</i> (up to $500k)</h3> <ul> <li>Internews Europe (2006-2008)</li> - <li><a href="http://nsf.gov/">National Science Foundation</a> (2009-2012)</li> + <li><a href="http://nsf.gov/">National Science Foundation</a> via Drexel University (2009-2011)</li> + <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-2012)</li> <li><a href="http://www.knightfoundation.org/">The Knight Foundation</a> (2012-2012)</li> <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-2012)</li> </ul>

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 24 Oct '13

24 Oct '13

commit c6726c721a80343f613c7ebc31700596451514eb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 24 17:45:49 2013 +0000 Update translations for torcheck_completed --- zh_CN/torcheck.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/zh_CN/torcheck.po b/zh_CN/torcheck.po index 05c81d9..9780770 100644 --- a/zh_CN/torcheck.po +++ b/zh_CN/torcheck.po @@ -4,6 +4,7 @@ # Translators: # simabull tsai, 2013 # simabull tsai, 2013 +# simabull tsai, 2013 # kwh <14alpaca(a)gmail.com>, 2013 # Kevin Chen, 2011 # xtoaster <zhazhenzhong(a)gmail.com>, 2012 @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-10-11 22:00+0000\n" -"Last-Translator: kwh <14alpaca(a)gmail.com>\n" +"PO-Revision-Date: 2013-10-24 17:40+0000\n" +"Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,7 +24,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "恭喜您。这个浏览器已经在使用Tor。" +msgstr "恭喜。该浏览器已配置为使用 Tor 网络。" msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -61,10 +62,10 @@ msgid "Your IP address appears to be: " msgstr "你的 IP 地址显示为：" msgid "Are you using Tor?" -msgstr "你是否正在使用Tor?" +msgstr "是否正在使用 Tor？" msgid "This page is also available in the following languages:" -msgstr "该页面在以下语言中同样可用：" +msgstr "该页面提供以下语言：" msgid "For more information about this exit relay, see:" -msgstr "想了解关于更多的信息关于这个退出节点，请看：" +msgstr "有关该出口节点的更多信息，请参阅："

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 24 Oct '13

24 Oct '13

commit 1aa6210cd8a0e5aa21c175ff710f26484b8ee15e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 24 17:45:45 2013 +0000 Update translations for torcheck --- zh_CN/torcheck.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/zh_CN/torcheck.po b/zh_CN/torcheck.po index 05c81d9..9780770 100644 --- a/zh_CN/torcheck.po +++ b/zh_CN/torcheck.po @@ -4,6 +4,7 @@ # Translators: # simabull tsai, 2013 # simabull tsai, 2013 +# simabull tsai, 2013 # kwh <14alpaca(a)gmail.com>, 2013 # Kevin Chen, 2011 # xtoaster <zhazhenzhong(a)gmail.com>, 2012 @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-10-11 22:00+0000\n" -"Last-Translator: kwh <14alpaca(a)gmail.com>\n" +"PO-Revision-Date: 2013-10-24 17:40+0000\n" +"Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,7 +24,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "恭喜您。这个浏览器已经在使用Tor。" +msgstr "恭喜。该浏览器已配置为使用 Tor 网络。" msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -61,10 +62,10 @@ msgid "Your IP address appears to be: " msgstr "你的 IP 地址显示为：" msgid "Are you using Tor?" -msgstr "你是否正在使用Tor?" +msgstr "是否正在使用 Tor？" msgid "This page is also available in the following languages:" -msgstr "该页面在以下语言中同样可用：" +msgstr "该页面提供以下语言：" msgid "For more information about this exit relay, see:" -msgstr "想了解关于更多的信息关于这个退出节点，请看：" +msgstr "有关该出口节点的更多信息，请参阅："

1 0

r26395: {website} one too many " (website/trunk/about/en)
by Andrew Lewman 24 Oct '13

24 Oct '13

Author: phobos Date: 2013-10-24 17:17:23 +0000 (Thu, 24 Oct 2013) New Revision: 26395 Modified: website/trunk/about/en/sponsors.wml Log: one too many " Modified: website/trunk/about/en/sponsors.wml =================================================================== --- website/trunk/about/en/sponsors.wml 2013-10-24 17:06:49 UTC (rev 26394) +++ website/trunk/about/en/sponsors.wml 2013-10-24 17:17:23 UTC (rev 26395) @@ -76,7 +76,7 @@ non-financial contributions: coding, testing, documenting, educating, researching, and running the relays that make up the Tor network. </p> - <p>Further details about our funding can be found on our "<a href="<page about/financials>">Financial Reports</a> page. + <p>Further details about our funding can be found on our <a href="<page about/financials>">Financial Reports</a> page. </p> </div>

1 0

r26394: {website} try to address point 1 in ticket #10013. (website/trunk/about/en)
by Andrew Lewman 24 Oct '13

24 Oct '13

Author: phobos Date: 2013-10-24 17:06:49 +0000 (Thu, 24 Oct 2013) New Revision: 26394 Modified: website/trunk/about/en/sponsors.wml Log: try to address point 1 in ticket #10013. Modified: website/trunk/about/en/sponsors.wml =================================================================== --- website/trunk/about/en/sponsors.wml 2013-10-24 15:28:12 UTC (rev 26393) +++ website/trunk/about/en/sponsors.wml 2013-10-24 17:06:49 UTC (rev 26394) @@ -76,6 +76,8 @@ non-financial contributions: coding, testing, documenting, educating, researching, and running the relays that make up the Tor network. </p> + <p>Further details about our funding can be found on our "<a href="<page about/financials>">Financial Reports</a> page. + </p> </div>  <div id = "sidecol">

1 0

[stem/master] Citing version when additions or changes to our API were made
by atagar＠torproject.org 24 Oct '13

24 Oct '13

commit 1c853f222c9d0093656c3b53832bbacf23e90acd Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 24 09:38:41 2013 -0700 Citing version when additions or changes to our API were made Using sphinx's versionadded and versionchanged to note the version when our API has changed. --- stem/control.py | 7 +++++++ stem/descriptor/remote.py | 2 ++ stem/response/__init__.py | 8 ++++++++ stem/util/connection.py | 12 +++++++++++- 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/stem/control.py b/stem/control.py index 16f8892..1d4ecc8 100644 --- a/stem/control.py +++ b/stem/control.py @@ -739,6 +739,9 @@ class Controller(BaseController): call fails for any reason (error response, control port closed, initiated, etc). + .. versionchanged:: 1.1.0 + Added the get_bytes argument. + :param str,list params: GETINFO option or options to be queried :param object default: response if the query fails :param bool get_bytes: provides **bytes** values rather than a **str** under python 3.x @@ -1015,6 +1018,8 @@ class Controller(BaseController): running locally. Also, most of its checks are platform dependent, and hence are not entirely reliable. + .. versionadded:: 1.1.0 + :param object default: response if the query fails :returns: str with the username tor is running as @@ -1048,6 +1053,8 @@ class Controller(BaseController): locally. Also, most of its checks are platform dependent, and hence are not entirely reliable. + .. versionadded:: 1.1.0 + :param object default: response if the query fails :returns: int with our process' pid diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index aa4d00c..e1ebfb2 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -59,6 +59,8 @@ itself... |- get_key_certificates - provides present authority key certificates +- query - request an arbitrary descriptor resource +.. versionadded:: 1.1.0 + .. data:: MAX_FINGERPRINTS Maximum number of descriptors that can requested at a time by their diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 3381573..7298abe 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -139,6 +139,8 @@ class ControlMessage(object): """ Provides a ControlMessage for the given content. + .. versionadded:: 1.1.0 + :param str content: message to construct the message from :param str msg_type: type of tor reply to parse the content as :param kwargs: optional keyword arguments to be passed to the parser method @@ -199,6 +201,9 @@ class ControlMessage(object): 2.x and **unicode** in python 3.x). The **content** however is **bytes** if **get_bytes** is **True**. + .. versionchanged:: 1.1.0 + Added the get_bytes argument. + :param bool get_bytes: provides **bytes** for the **content** rather than a **str** :returns: **list** of (str, str, str) tuples for the components of this message @@ -213,6 +218,9 @@ class ControlMessage(object): """ Provides the unparsed content read from the control socket. + .. versionchanged:: 1.1.0 + Added the get_bytes argument. + :param bool get_bytes: if **True** then this provides **bytes** rather than a **str** :returns: **str** of the socket data used to generate this message diff --git a/stem/util/connection.py b/stem/util/connection.py index 0b93130..d21ab0d 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -22,6 +22,8 @@ Connection and networking based utility functions. Method for resolving a process' connections. + .. versionadded:: 1.1.0 + ================= =========== Resolver Description ================= =========== @@ -133,10 +135,14 @@ def get_connections(resolver, process_pid = None, process_name = None): * remote_port (int) * protocol (str, generally either 'tcp' or 'udp') + .. versionadded:: 1.1.0 + :param Resolver resolver: method of connection resolution to use :param int process_pid: pid of the process to retrieve :param str process_name: name of the process to retrieve + :returns: **list** of Connection instances + :raises: * **ValueError** if using **Resolver.PROC** or **Resolver.BSD_PROCSTAT** and the process_pid wasn't provided @@ -225,10 +231,12 @@ def get_system_resolvers(system = None): """ Provides the types of connection resolvers likely to be available on this platform. + .. versionadded:: 1.1.0 + :param str system: system to get resolvers for, this is determined by platform.system() if not provided - :returns: **list** of Resolvers likely to be available on this platform + :returns: **list** of :data:`~stem.util.connection.Resolver` instances available on this platform """ if system is None: @@ -360,6 +368,8 @@ def is_private_address(address): * Private ranges: 10.*, 172.16.* - 172.31.*, 192.168.* * Loopback: 127.* + .. versionadded:: 1.1.0 + :param str address: string to be checked :returns: **True** if input is in a private range, **False** otherwise

1 0

[doctor/master] Shortening cert expiration warning to be on the order of weeks
by atagar＠torproject.org 24 Oct '13

24 Oct '13

commit 81afac04de02e2707704a3c76ec1bcb3db23dae6 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 24 08:37:57 2013 -0700 Shortening cert expiration warning to be on the order of weeks Our certificate expiration warnings were unhelpfully early. Authority operators don't want to rotate their certs two or three months earlier than necessary, so changing the duration we check for from... * 2 weeks * 2 months * 3 months ... to... * 1 week * 2 weeks * 3 weeks Hopefully this should largely address https://trac.torproject.org/9103. --- consensus_health_checker.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 8a3a9c9..0127f2c 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -362,12 +362,12 @@ def certificate_expiration(latest_consensus, consensuses, votes): cert_expiration = vote.directory_authorities[0].key_certificate.expires expiration_label = '%s (%s)' % (authority, cert_expiration.strftime('%Y-%m-%d %H-%M-%S')) - if (cert_expiration - current_time) <= datetime.timedelta(days = 14): + if (cert_expiration - current_time) <= datetime.timedelta(days = 7): + issues.append(Issue(Runlevel.WARNING, 'CERTIFICATE_ABOUT_TO_EXPIRE', duration = 'one week', authority = expiration_label)) + elif (cert_expiration - current_time) <= datetime.timedelta(days = 14): issues.append(Issue(Runlevel.WARNING, 'CERTIFICATE_ABOUT_TO_EXPIRE', duration = 'two weeks', authority = expiration_label)) - elif (cert_expiration - current_time) <= datetime.timedelta(days = 60): - issues.append(Issue(Runlevel.NOTICE, 'CERTIFICATE_ABOUT_TO_EXPIRE', duration = 'two months', authority = expiration_label)) - elif (cert_expiration - current_time) <= datetime.timedelta(days = 90): - issues.append(Issue(Runlevel.NOTICE, 'CERTIFICATE_ABOUT_TO_EXPIRE', duration = 'three months', authority = expiration_label)) + elif (cert_expiration - current_time) <= datetime.timedelta(days = 21): + issues.append(Issue(Runlevel.NOTICE, 'CERTIFICATE_ABOUT_TO_EXPIRE', duration = 'three weeks', authority = expiration_label)) return issues

1 0