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

Merge pull request #1413 from saber28/patch-1

Browse source 
Improve Orbot Compatibility
This commit is contained in:
ZeroNet 2018-05-22 11:24:27 +02:00 committed by GitHub
commit 9fb7e1b46d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Tor/TorManager.py
View file

@ -183,12 +183,13 @@ class TorManager(object):
# Auth cookie file # Auth cookie file
res_protocol = self.send("PROTOCOLINFO", conn) res_protocol = self.send("PROTOCOLINFO", conn)
cookie_match = re.search('COOKIEFILE="(.*?)"', res_protocol) cookie_match = re.search('COOKIEFILE="(.*?)"', res_protocol)
if cookie_match:
if config.tor_password:
res_auth = self.send('AUTHENTICATE "%s"' % config.tor_password, conn)
elif cookie_match:
cookie_file = cookie_match.group(1).decode("string-escape") cookie_file = cookie_match.group(1).decode("string-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, conn)
elif config.tor_password:
res_auth = self.send('AUTHENTICATE "%s"' % config.tor_password, conn)
else: else:
res_auth = self.send("AUTHENTICATE", conn) res_auth = self.send("AUTHENTICATE", conn)