AaronFiore/electrum
1
0
Fork 0
Code Activity

interface: clean-up proxy username/pw handling

Browse Source
This commit is contained in:
SomberNight
2018-08-29 18:59:47 +02:00
parent 6700364ac8
commit a4ffa0b22a
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
electrum/interface.py
View File

@@ -62,16 +62,11 @@ class Interface(PrintError):
self.blockchain = None self.blockchain = None
self.network = network self.network = network
if proxy: if proxy:
proxy['user'] = proxy.get('user', '') username, pw = proxy.get('user'), proxy.get('password')
if proxy['user'] == '': if not username or not pw:
proxy['user'] = 'sampleuser' # aiorpcx doesn't allow empty user
proxy['password'] = proxy.get('password', '')
if proxy['password'] == '':
proxy['password'] = 'samplepassword'
try:
auth = aiorpcx.socks.SOCKSUserAuth(proxy['user'], proxy['password'])
except KeyError:
auth = None auth = None
else:
auth = aiorpcx.socks.SOCKSUserAuth(username, pw)
if proxy['mode'] == "socks4": if proxy['mode'] == "socks4":
self.proxy = aiorpcx.socks.SOCKSProxy((proxy['host'], int(proxy['port'])), aiorpcx.socks.SOCKS4a, auth) self.proxy = aiorpcx.socks.SOCKSProxy((proxy['host'], int(proxy['port'])), aiorpcx.socks.SOCKS4a, auth)
elif proxy['mode'] == "socks5": elif proxy['mode'] == "socks5":