oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Py3 encoding support in TorManager

Browse source
This commit is contained in:
shortcutme 2019-03-16 00:05:23 +01:00
parent c8fc1ebefa
commit 8220272953
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Tor/TorManager.py
View file

@ -147,9 +147,9 @@ class TorManager(object):
if config.tor_password: if config.tor_password:
res_auth = self.send('AUTHENTICATE "%s"' % config.tor_password, conn) res_auth = self.send('AUTHENTICATE "%s"' % config.tor_password, conn)
elif cookie_match: elif cookie_match:
cookie_file = cookie_match.group(1).decode("string-escape") cookie_file = cookie_match.group(1).encode("ascii").decode("unicode_escape")
auth_hex = binascii.b2a_hex(open(cookie_file, "rb").read()) auth_hex = binascii.b2a_hex(open(cookie_file, "rb").read())
res_auth = self.send("AUTHENTICATE %s" % auth_hex, conn) res_auth = self.send("AUTHENTICATE %s" % auth_hex.decode("utf8"), conn)
else: else:
res_auth = self.send("AUTHENTICATE", conn) res_auth = self.send("AUTHENTICATE", conn)
@ -160,15 +160,15 @@ class TorManager(object):
version = re.search('version=([0-9\.]+)', res_version).group(1) version = re.search('version=([0-9\.]+)', res_version).group(1)
assert float(version.replace(".", "0", 2)) >= 207.5, "Tor version >=0.2.7.5 required, found: %s" % version assert float(version.replace(".", "0", 2)) >= 207.5, "Tor version >=0.2.7.5 required, found: %s" % version
self.setStatus(u"Connected (%s)" % res_auth) self.setStatus("Connected (%s)" % res_auth)
self.event_started.set(True) self.event_started.set(True)
self.starting = False self.starting = False
self.connecting = False self.connecting = False
self.conn = conn self.conn = conn
except Exception, err: except Exception as err:
self.conn = None self.conn = None
self.setStatus(u"Error (%s)" % str(err).decode("utf8", "ignore")) self.setStatus("Error (%s)" % str(err))
self.log.error(u"Tor controller connect error: %s" % Debug.formatException(str(err).decode("utf8", "ignore"))) self.log.error("Tor controller connect error: %s" % Debug.formatException(str(err)))
self.enabled = False self.enabled = False
return self.conn return self.conn
@ -244,7 +244,7 @@ class TorManager(object):
try: try:
conn.sendall(b"%s\r\n" % cmd.encode("utf8")) conn.sendall(b"%s\r\n" % cmd.encode("utf8"))
while not back.endswith("250 OK\r\n"): while not back.endswith("250 OK\r\n"):
back += conn.recv(1024 * 64).decode("utf8", "ignore") back += conn.recv(1024 * 64).decode("utf8")
break break
except Exception as err: except Exception as err:
self.log.error("Tor send error: %s, reconnecting..." % err) self.log.error("Tor send error: %s, reconnecting..." % err)