February 2019 - tor-commits - lists.torproject.org

[sbws/master] circuitbuilder: Stop raising exception on path invalid.
by juga＠torproject.org 15 Feb '19

15 Feb '19

commit 0773f09038b9422872302347df2ad52263f351e3 Author: juga0 <juga(a)riseup.net> Date: Wed Feb 6 17:15:19 2019 +0000 circuitbuilder: Stop raising exception on path invalid. Instead, return the reason why the circuit could not be built, as other errors do. --- sbws/lib/circuitbuilder.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py index 8efc8de..be10c2b 100644 --- a/sbws/lib/circuitbuilder.py +++ b/sbws/lib/circuitbuilder.py @@ -7,15 +7,6 @@ import logging log = logging.getLogger(__name__) -class PathLengthException(Exception): - def __init__(self, message=None, errors=None): - if message is not None: - super().__init__(message) - else: - super().__init__() - self.errors = errors - - def valid_circuit_length(path): return 0 < len(path) <= 8 @@ -66,7 +57,7 @@ class CircuitBuilder: was an error building the circuit. """ if not valid_circuit_length(path): - raise PathLengthException() + return None, "Can not build a circuit, invalid path." c = self.controller timeout = self.circuit_timeout fp_path = '[' + ' -> '.join([p for p in path]) + ']' @@ -142,7 +133,7 @@ class GapsCircuitBuilder(CircuitBuilder): chosen uniformally at random. A relay will not be in a circuit twice. ''' if not valid_circuit_length(path): - raise PathLengthException() + return None, "Can not build a circuit, invalid path." path = self._normalize_path(path) if path is None: return None

1 0

[sbws/master] Merge branch 'bug29295'
by juga＠torproject.org 15 Feb '19

15 Feb '19

commit f173396892c7d5f83d89c140fc6554c823b65412 Merge: 051773e 5105313 Author: juga0 <juga(a)riseup.net> Date: Fri Feb 15 17:42:36 2019 +0000 Merge branch 'bug29295' sbws/lib/circuitbuilder.py | 48 +++++++++------------------- tests/integration/lib/test_circuitbuilder.py | 19 +++++++++++ 2 files changed, 34 insertions(+), 33 deletions(-)

1 0

[sbws/master] tests: add circuitbuilder build_circuit test
by juga＠torproject.org 15 Feb '19

15 Feb '19

commit 51053135680a381d1df258e6f7ea859f5a9bfa43 Author: juga0 <juga(a)riseup.net> Date: Wed Feb 6 17:31:41 2019 +0000 tests: add circuitbuilder build_circuit test --- tests/integration/lib/test_circuitbuilder.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/integration/lib/test_circuitbuilder.py b/tests/integration/lib/test_circuitbuilder.py new file mode 100644 index 0000000..0b47e0a --- /dev/null +++ b/tests/integration/lib/test_circuitbuilder.py @@ -0,0 +1,19 @@ +"""Integration tests for circutibuilder.py""" + + +def test_build_circuit(cb): + # Path is empty + path = [] + circuit_id, _ = cb.build_circuit(path) + assert not circuit_id + # Valid path, not valid exit + path = ['117A456C911114076BEB4E757AC48B16CC0CCC5F', + '270A861ABED22EC2B625198BCCD7B2B9DBFFC93A'] + circuit_id, _ = cb.build_circuit(path) + assert not circuit_id + # Valid path and relays + # path with relay1mbyteMAB and exit1 + path = ['117A456C911114076BEB4E757AC48B16CC0CCC5F', + '270A861ABED22EC2B625198BCCD7B2B9DBFFC93C'] + circuit_id, _ = cb.build_circuit(path) + assert circuit_id

1 0

[sbws/master] docs: add verify option to man and example
by juga＠torproject.org 15 Feb '19

15 Feb '19

commit 216b29bd4ca1d3dc137d95ff2a17d916001114d1 Author: juga0 <juga(a)riseup.net> Date: Sat Dec 8 16:46:08 2018 +0000 docs: add verify option to man and example and explain how to disable certificate validation. Closes bug #28788. Bugfix v0.4.0. --- docs/source/examples/sbws.example.ini | 2 ++ docs/source/man_sbws.ini.rst | 3 +++ 2 files changed, 5 insertions(+) diff --git a/docs/source/examples/sbws.example.ini b/docs/source/examples/sbws.example.ini index 0130bdb..d11343a 100644 --- a/docs/source/examples/sbws.example.ini +++ b/docs/source/examples/sbws.example.ini @@ -10,3 +10,5 @@ foo = on [destinations.foo] # the domain and path to the 1GB file. url = https://example.com/does/not/exist.bin +# To disable certificate validation, uncomment the following +# verify = False \ No newline at end of file diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst index 0ea98b5..8f4d579 100644 --- a/docs/source/man_sbws.ini.rst +++ b/docs/source/man_sbws.ini.rst @@ -69,6 +69,9 @@ destinations.STR url = STR The URL to the destination. It must include a file path. It can use both http or https. + verify = BOOL + Whether or not to verify the destination certificate. + (Default: True) tor

1 0

[sbws/master] destination: add constant to verify destination
by juga＠torproject.org 15 Feb '19

15 Feb '19

commit 62b62ea4e4722e8297e2cf88c01bb33ad08fb970 Author: juga0 <juga(a)riseup.net> Date: Sat Dec 8 16:36:07 2018 +0000 destination: add constant to verify destination certificate by default. --- sbws/globals.py | 2 ++ sbws/lib/destination.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sbws/globals.py b/sbws/globals.py index 2277850..f4373b9 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -53,6 +53,8 @@ MAX_BW_DIFF_PERC = 50 BW_LINE_SIZE = 510 +DESTINATION_VERIFY_CERTIFICATE = True + def fail_hard(*a, **kw): ''' Log something ... and then exit as fast as possible ''' diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index 1b4c192..94622ff 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -6,6 +6,8 @@ from threading import RLock import requests from urllib.parse import urlparse from stem.control import EventType + +from sbws.globals import DESTINATION_VERIFY_CERTIFICATE import sbws.util.stem as stem_utils import sbws.util.requests as requests_utils @@ -14,7 +16,7 @@ log = logging.getLogger(__name__) def _parse_verify_option(conf_section): if 'verify' not in conf_section: - return True + return DESTINATION_VERIFY_CERTIFICATE try: return conf_section.getboolean('verify') except ValueError:

1 0

[sbws/master] Merge branch 'bug28788'
by juga＠torproject.org 15 Feb '19

15 Feb '19

commit 051773e45e0c677f84fbc83dd48020a4df8b310d Merge: 149e236 216b29b Author: juga0 <juga(a)riseup.net> Date: Fri Feb 15 17:38:21 2019 +0000 Merge branch 'bug28788' Solved conflicts in: docs/source/examples/sbws.example.ini sbws/globals.py applying both theirs and ours. docs/source/examples/sbws.example.ini | 5 ++++- docs/source/man_sbws.ini.rst | 3 +++ sbws/globals.py | 1 + sbws/lib/destination.py | 11 +++++++++-- 4 files changed, 17 insertions(+), 3 deletions(-) diff --cc docs/source/examples/sbws.example.ini index cf6ff79,d11343a..1325bc8 --- a/docs/source/examples/sbws.example.ini +++ b/docs/source/examples/sbws.example.ini @@@ -10,31 -10,5 +10,34 @@@ foo = o [destinations.foo] # the domain and path to the 1GB file. url = https://example.com/does/not/exist.bin + + +## The following logging options are set by default. +## There is no need to change them unless other options are prefered. +; [logging] +; # Whether or not to log to a rotating file the directory paths.log_dname +; to_file = yes +; # Whether or not to log to stdout +; to_stdout = yes +; # Whether or not to log to syslog +; # NOTE that when sbws is launched by systemd, stdout goes to journal and +; # syslog. +; to_syslog = no + +; # Level to log at. Debug, info, warning, error, critical. +; # `level` must be set to the lower of all the handler levels. +; level = debug +; to_file_level = debug +; to_stdout_level = info +; to_syslog_level = info +; # Format string to use when logging +; format = %(module)s[%(process)s]: <%(levelname)s> %(message)s +; # verbose formatter useful for debugging +; to_file_format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s +; # Not adding %(asctime)s to to stdout since it'll go to syslog when using +; # systemd, and it'll have already the date. +; to_stdout_format = ${format} - ; to_syslog_format = ${format} ++; to_syslog_format = ${format} ++ + # To disable certificate validation, uncomment the following + # verify = False diff --cc sbws/globals.py index 5493b07,f4373b9..60e56f5 --- a/sbws/globals.py +++ b/sbws/globals.py @@@ -61,31 -53,7 +61,32 @@@ MAX_BW_DIFF_PERC = 5 BW_LINE_SIZE = 510 +# Metadata to send in every requests, so that data servers can know which +# scanners are using them. +# In Requests these keys are case insensitive. +HTTP_HEADERS = { + # This would be ignored if changing to HTTP/2 + 'Connection': 'keep-alive', + # Needs to get Tor version from the controller + 'User-Agent': 'sbws/{} ({}) Python/{} Requests/{} Stem/{} Tor/'.format( + __version__, platform.platform(), + platform.python_version(), + requests_version, stem_version), + # Organization defined names (:rfc:`7239`) + # Needs to get the nickname from the user config file. + 'Tor-Bandwidth-Scanner-Nickname': '{}', + 'Tor-Bandwidth-Scanner-UUID': '{}', + # In case of including IP address. + # 'Forwarded': 'for={}' # IPv6 part, if there's + } +# In the case of having ipv6 it's concatenated to forwarder. +IPV6_FORWARDED = ', for="[{}]"' + +HTTP_GET_HEADERS = { + 'Range': '{}', + 'Accept-Encoding': 'identity', +} + DESTINATION_VERIFY_CERTIFICATE = True def fail_hard(*a, **kw):

1 0

[sbws/master] destination: disable urllib3 warnings
by juga＠torproject.org 15 Feb '19

15 Feb '19

commit 4761f06765d03367803b38b4fd77535067bddec9 Author: juga0 <juga(a)riseup.net> Date: Sat Dec 8 16:38:45 2018 +0000 destination: disable urllib3 warnings when disabling destination certificate validation. --- sbws/lib/destination.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index 94622ff..02f56c9 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -18,7 +18,7 @@ def _parse_verify_option(conf_section): if 'verify' not in conf_section: return DESTINATION_VERIFY_CERTIFICATE try: - return conf_section.getboolean('verify') + verify = conf_section.getboolean('verify') except ValueError: log.warning( 'Currently sbws only supports verify=true/false, not a CA bundle ' @@ -28,6 +28,11 @@ def _parse_verify_option(conf_section): 'of testing. So we will allow this, but expect Requests to throw ' 'SSLError exceptions later. Have fun!', conf_section['verify']) return conf_section['verify'] + if not verify: + # disable urllib3 warning: InsecureRequestWarning + import urllib3 + urllib3.disable_warnings() + return verify def connect_to_destination_over_circuit(dest, circ_id, session, cont, max_dl):

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 15 Feb '19

15 Feb '19

commit d7482b1b15dd8b6c29cce8f161ecc9a2f5615d43 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 15 15:20:10 2019 +0000 Update translations for support-portal --- contents+ka.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 7884064f0..e781538b9 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -1,7 +1,7 @@ # Translators: # erinm, 2019 # Emma Peel, 2019 -# A. C., 2019 +# Georgianization, 2019 # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-28 19:24+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: A. C., 2019\n" +"Last-Translator: Georgianization, 2019\n" "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +26,7 @@ msgstr "რითი შეგვიძლია დაგეხმაროთ? #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.title) msgid "Tor Glossary" -msgstr "" +msgstr "Tor-სიტყვარი" #: https//support.torproject.org/glossary/ #: (content/glossary/contents+en.lrquestion.description)

1 0

[torspec/master] Document more differences between SOCKS5 RFCs and how Tor implements SOCKS5
by dgoulet＠torproject.org 15 Feb '19

15 Feb '19

commit 87abfd89e39e1d4c5d245e0e9f1e62989288701a Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Feb 12 19:12:03 2019 +0200 Document more differences between SOCKS5 RFCs and how Tor implements SOCKS5 --- socks-extensions.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/socks-extensions.txt b/socks-extensions.txt index ab37670..ed249ad 100644 --- a/socks-extensions.txt +++ b/socks-extensions.txt @@ -9,7 +9,7 @@ Tor's extensions to the SOCKS protocol been established, the client application uses the TCP stream as usual. Tor supports SOCKS4 as defined in [1], SOCKS4A as defined in [2], and - SOCKS5 as defined in [3]. + SOCKS5 as defined in [3] and [4]. The stickiest issue for Tor in supporting clients, in practice, is forcing DNS lookups to occur at the OR side: if clients do their own DNS lookup, @@ -30,13 +30,18 @@ Tor's extensions to the SOCKS protocol SOCKS5: - The (SOCKS5) "UDP ASSOCIATE" command is not supported. + - SOCKS5 BIND command is not supported. - IPv6 is not supported in CONNECT commands. + - SOCKS5 GSSAPI subnegotiation is not supported. - The "NO AUTHENTICATION REQUIRED" (SOCKS5) authentication method [00] is supported; and as of Tor 0.2.3.2-alpha, the "USERNAME/PASSWORD" (SOCKS5) authentication method [02] is supported too, and used as a method to implement stream isolation. As an extension to support some broken clients, - we allow clients to pass "USERNAME/PASSWORD" authentication to us even if - no authentication was selected. + we allow clients to pass "USERNAME/PASSWORD" authentication message to us + even if no authentication was selected. Furthermore, we allow + username/password fields of this message to be empty. This technically + violates RFC1929 [4], but ensures interoperability with somewhat broken + SOCKS5 client implementations. (For more information on stream isolation, see IsolateSOCKSAuth on the Tor manpage.) @@ -94,5 +99,6 @@ Tor's extensions to the SOCKS protocol References: [1] http://en.wikipedia.org/wiki/SOCKS#SOCKS4 [2] http://en.wikipedia.org/wiki/SOCKS#SOCKS4a - [3] SOCKS5: RFC1928 + [3] SOCKS5: RFC 1928 https://www.ietf.org/rfc/rfc1928.txt + [4] RFC 1929: https://www.ietf.org/rfc/rfc1929.txt

1 0

[torspec/master] Merge branch 'tor-github/pr/55'
by dgoulet＠torproject.org 15 Feb '19

15 Feb '19

commit 7e2e3308f5ebb2b4b4ff24d3307b56366c3e24e2 Merge: 4a3c358 87abfd8 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 15 09:39:52 2019 -0500 Merge branch 'tor-github/pr/55' socks-extensions.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)

1 0