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

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 11 Mar '19

11 Mar '19

commit 0f16146abf74c14f32ff3caed0938e7bc0702c8f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 11 04:15:51 2019 +0000 Update translations for https_everywhere --- hi/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hi/https-everywhere.dtd b/hi/https-everywhere.dtd index 6f7f8f4ed..d5f302e2d 100644 --- a/hi/https-everywhere.dtd +++ b/hi/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "EFF को दान कीजिये"> <!ENTITY https-everywhere.menu.observatory "एसएसएल वेधशाला प्राथमिकताएं"> <!ENTITY https-everywhere.menu.globalEnable "हर जगह HTTPS सक्षम"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Encrypt All Sites Eligible (EASE)"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "एनक्रिप्ट सभी योग्य साईटें (ई.ए.एस.ई)"> <!ENTITY https-everywhere.menu.showCounter "काउंटर दिखाएँ"> <!ENTITY https-everywhere.menu.viewAllRules "सभी नियम देखें">

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 11 Mar '19

11 Mar '19

commit 7207b6c822c3ef830a1a01f13c1e70c1513c11e4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 11 01:19:44 2019 +0000 Update translations for tpo-web --- contents+zh-CN.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 6c7d509ed..42ac71eb5 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -64,6 +64,8 @@ msgid "" "<h4 class=\"text-primary\">Get Support <span class=\"oi oi-arrow-right p-1\"" " title=\"icon arrow-right\" aria-hidden=\"true\"></span></h4>" msgstr "" +"<h4 class=\"text-primary\">获取帮助<span class=\"oi oi-arrow-right p-1\" " +"title=\"icon arrow-right\" aria-hidden=\"true\"></span></h4>" #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body) msgid ""

1 0

[chutney/master] Python3 fix: open /dev/urandom in binary mode.
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit c7c0974d1736581cdb6cde473a468fab3d1ab964 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 12:18:14 2019 -0500 Python3 fix: open /dev/urandom in binary mode. We should really be using os.urandom(), but I'm going for small fixes here. --- scripts/chutney_tests/verify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/chutney_tests/verify.py b/scripts/chutney_tests/verify.py index 063bf8f..82394d2 100644 --- a/scripts/chutney_tests/verify.py +++ b/scripts/chutney_tests/verify.py @@ -54,7 +54,7 @@ def _verify_traffic(network): dot_reps = _calculate_reps(DOTDATALEN, randomlen) # make sure we get at least one dot per transmission dot_reps = min(reps, dot_reps) - with open('/dev/urandom', 'r') as randfp: + with open('/dev/urandom', 'rb') as randfp: tmpdata = randfp.read(randomlen) else: dot_reps = 0

1 0

[chutney/master] python3: filters aren't lists.
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit 386afd94bcaeda119cba7dac4e742dbc8205e265 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 12:24:04 2019 -0500 python3: filters aren't lists. The filter() builtin now returns a generator, rather than a list. We need to explicitly convert the generators to a list for python3. --- scripts/chutney_tests/verify.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/chutney_tests/verify.py b/scripts/chutney_tests/verify.py index 82394d2..3e0455d 100644 --- a/scripts/chutney_tests/verify.py +++ b/scripts/chutney_tests/verify.py @@ -76,6 +76,11 @@ def _verify_traffic(network): n._env['tag'].startswith('h') or ('hs' in n._env.keys() and n._env['hs'] == 1), network._nodes) + # Make sure these lists are actually lists. (It would probably + # be better to do list comprehensions here.) + client_list = list(client_list) + exit_list = list(exit_list) + hs_list = list(hs_list) if len(client_list) == 0: print(" Unable to verify network: no client nodes available") return False

1 0

[chutney/master] Python3: exec() now expects a string, not a file.
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit dce899f1322c11735ab25e11278f5ac13575d804 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 11:26:21 2019 -0500 Python3: exec() now expects a string, not a file. --- lib/chutney/TorNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index cc86960..8a2329a 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -1238,7 +1238,7 @@ def main(): args = parseArgs() f = open(args['network_cfg']) - result = runConfigFile(args['action'], f) + result = runConfigFile(args['action'], f.read()) if result is False: return -1 return 0

1 0

[chutney/master] Update "chutney" script to prefer python, then python3, then python2
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit 04f641def696dfa897255e7a34577e2a7e9863fb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 11:17:09 2019 -0500 Update "chutney" script to prefer python, then python3, then python2 --- chutney | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chutney b/chutney index 7c7e1df..fcd5ec5 100755 --- a/chutney +++ b/chutney @@ -10,7 +10,7 @@ then export CHUTNEY_PATH="`dirname $0`" fi -binaries="python2 python" +binaries="python python3 python2" if ! test "${PYTHON+y}" then

1 0

[chutney/master] Allow warnings from within runConfigFile
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit ced12d75dbbf305a4ddd2de37285a5216aee4d2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 11:33:32 2019 -0500 Allow warnings from within runConfigFile The lack of "global" here, and the lack of putting a warning count in the globals, was running us into trouble. --- lib/chutney/TorNet.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 8a2329a..82d50cf 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -399,6 +399,8 @@ class LocalNodeBuilder(NodeBuilder): If checkOnly, just make sure that the formatting is indeed possible. """ + global torrc_option_warn_count + fn_out = self._getTorrcFname() torrc_template = self._getTorrcTemplate() output = torrc_template.format(self._env) @@ -1190,7 +1192,9 @@ def runConfigFile(verb, data): _GLOBALS = dict(_BASE_ENVIRON=_BASE_ENVIRON, Node=Node, ConfigureNodes=ConfigureNodes, - _THE_NETWORK=_THE_NETWORK) + _THE_NETWORK=_THE_NETWORK, + torrc_option_warn_count=0, + TORRC_OPTION_WARN_LIMIT=10) exec(data, _GLOBALS) network = _GLOBALS['_THE_NETWORK']

1 0

[chutney/master] Python3: get socket errno from errno attr, not from subscripting
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit e54f24dfb49101bd73fb617e94ea6afd51ba1e90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 12:36:23 2019 -0500 Python3: get socket errno from errno attr, not from subscripting --- lib/chutney/Traffic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index 283f286..0c7776a 100644 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -213,7 +213,7 @@ class Source(Peer): debug("socket %d connecting to %r..."%(self.fd(),dest)) self.s.connect(dest) except socket.error as e: - if e[0] != errno.EINPROGRESS: + if e.errno != errno.EINPROGRESS: raise def on_readable(self): @@ -288,7 +288,7 @@ class Source(Peer): try: n = self.s.send(self.outbuf) except socket.error as e: - if e[0] == errno.ECONNREFUSED: + if e.errno == errno.ECONNREFUSED: debug("connection refused (fd=%d)" % self.fd()) return -1 raise

1 0

[chutney/master] Another python3 fix, about directory permissions made by os.makedirs
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit 49087abb2aba3c8acafd16287cc158f55d5ca6de Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 12:52:56 2019 -0500 Another python3 fix, about directory permissions made by os.makedirs In python3, os.makedir()'s mode argument doesn't affect any directory created except the last one in the path. --- lib/chutney/TorNet.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 82d50cf..ddcdc87 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -45,6 +45,10 @@ def mkdir_p(d, mode=448): 448 is the decimal representation of the octal number 0700. Since python2 only supports 0700 and python3 only supports 0o700, we can use neither. + + Note that python2 and python3 differ in how they create the + permissions for the intermediate directories. In python3, 'mode' + only sets the mode for the last directory created. """ try: os.makedirs(d, mode=mode) @@ -485,6 +489,8 @@ class LocalNodeBuilder(NodeBuilder): """Create the data directory (with keys subdirectory) for this node. """ datadir = self._env['dir'] + # We do this separately to make sure the permissions are correct. + mkdir_p(datadir) mkdir_p(os.path.join(datadir, 'keys')) def _makeHiddenServiceDir(self): @@ -495,6 +501,8 @@ class LocalNodeBuilder(NodeBuilder): path to the hidden service directory. """ datadir = self._env['dir'] + # We do this separately to make sure the permissions are correct. + mkdir_p(datadir) mkdir_p(os.path.join(datadir, self._env['hs_directory'])) def _genAuthorityKey(self):

1 0

[chutney/master] Python3: Various bytes/unicode fixes
by nickm＠torproject.org 11 Mar '19

11 Mar '19

commit 620efe453c30f47c784f5df287d2aea74f6e8dc4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 13:09:25 2019 -0500 Python3: Various bytes/unicode fixes --- lib/chutney/Traffic.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index 7b3e6d4..766766a 100644 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -41,15 +41,17 @@ def socks_cmd(addr_port): """ ver = 4 # Only SOCKSv4 for now. cmd = 1 # Stream connection. - user = '\x00' + user = b'\x00' dnsname = '' host, port = addr_port try: addr = socket.inet_aton(host) except socket.error: - addr = '\x00\x00\x00\x01' + addr = b'\x00\x00\x00\x01' dnsname = '%s\x00' % host debug("Socks 4a request to %s:%d" % (host, port)) + if type(dnsname) != type(b""): + dnsname = dnsname.encode("ascii") return struct.pack('!BBH', ver, cmd, port) + addr + user + dnsname @@ -133,7 +135,7 @@ class Sink(Peer): def __init__(self, tt, s): super(Sink, self).__init__(Peer.SINK, tt, s) - self.inbuf = '' + self.inbuf = b'' self.repetitions = self.tt.repetitions def on_readable(self): @@ -193,8 +195,8 @@ class Source(Peer): super(Source, self).__init__(Peer.SOURCE, tt) self.state = self.NOT_CONNECTED self.data = buf - self.outbuf = '' - self.inbuf = '' + self.outbuf = b'' + self.inbuf = b'' self.proxy = proxy self.repetitions = repetitions self._sent_no_bytes = 0 @@ -229,10 +231,10 @@ class Source(Peer): return -1 self.inbuf += inp if len(self.inbuf) == 8: - if ord(self.inbuf[0]) == 0 and ord(self.inbuf[1]) == 0x5a: + if self.inbuf[:2] == b'\x00\x5a': debug("proxy handshake successful (fd=%d)" % self.fd()) self.state = self.CONNECTED - self.inbuf = '' + self.inbuf = b'' debug("successfully connected (fd=%d)" % self.fd()) # if we have no reps or no data, skip sending actual data if self.want_to_write():

1 0