Browse Source
interface: clean-up proxy username/pw handling
3.3.3.1
SomberNight
6 years ago
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
1 changed files with
4 additions and
9 deletions
-
electrum/interface.py
|
|
|
@ -62,16 +62,11 @@ class Interface(PrintError): |
|
|
|
self.blockchain = None |
|
|
|
self.network = network |
|
|
|
if proxy: |
|
|
|
proxy['user'] = proxy.get('user', '') |
|
|
|
if proxy['user'] == '': |
|
|
|
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: |
|
|
|
username, pw = proxy.get('user'), proxy.get('password') |
|
|
|
if not username or not pw: |
|
|
|
auth = None |
|
|
|
else: |
|
|
|
auth = aiorpcx.socks.SOCKSUserAuth(username, pw) |
|
|
|
if proxy['mode'] == "socks4": |
|
|
|
self.proxy = aiorpcx.socks.SOCKSProxy((proxy['host'], int(proxy['port'])), aiorpcx.socks.SOCKS4a, auth) |
|
|
|
elif proxy['mode'] == "socks5": |
|
|
|
|
