Bitmessage/PyBitmessage-2024-12-19
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 52 Actions Packages Projects Releases 5 Wiki Activity

* API settings parse from "keys.dat" either.

Browse Source 
Signed-off-by: peter-tank <30540412+peter-tank@users.noreply.github.com>
This commit is contained in:
peter-tank 2018-07-22 13:18:17 +08:00
parent 073009e0ec
commit 1d46013dfe
No known key found for this signature in database
GPG Key ID: 5C422EFEA3A30F52
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/bitmessagecli.py
View File

@ -230,7 +230,7 @@ class Config(object):
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "client.dat" # for initial default value self.config_file = "client.dat" # for initial default value
self.conn = 'HTTP://127.0.0.1:8445/' # default API uri self.conn = 'HTTP://127.0.0.1:8442/' # default API uri
self.createParser() self.createParser()
self.createArguments() self.createArguments()
@ -261,7 +261,7 @@ class Config(object):
# action = self.subparsers.add_parser('api', help='Set API settings.') # action = self.subparsers.add_parser('api', help='Set API settings.')
action.add_argument('--api_username', help='BMs API basic auth user name.', default=None, metavar='username') action.add_argument('--api_username', help='BMs API basic auth user name.', default=None, metavar='username')
action.add_argument('--api_password', help='BMs API basic auth password.', default=None, metavar='password') action.add_argument('--api_password', help='BMs API basic auth password.', default=None, metavar='password')
action.add_argument('--api_path', help='BMs API host address.', default='127.0.0.1:8445', metavar='ip:port') action.add_argument('--api_path', help='BMs API host address.', default=None, metavar='ip:port')
action.add_argument('--api_type', help='BMs API hosts type.', default='HTTP', choices=["HTTP", "HTTPS"]) action.add_argument('--api_type', help='BMs API hosts type.', default='HTTP', choices=["HTTP", "HTTPS"])
# proxy settings # proxy settings
@ -2413,11 +2413,13 @@ if __name__ == "__main__":
import bmsettings as conninit import bmsettings as conninit
bms_allow = True bms_allow = True
if hasattr(conninit, 'apiData'): if hasattr(conninit, 'apiData'):
config.conn = conninit.apiData() apiData = conninit.apiData()
print ' BMs host uri:', config.conn, '\n' print ' BMs host uri from "keys.dat":', apiData, '\n'
if apiData:
config.conn = apiData
except Exception as err: except Exception as err:
print ' Depends check failed, command "bmSettings" disabled. (%s)' % err print ' Depends check failed, command "bmSettings" disabled. (%s)' % err
pass
try: try:
print '- Try to get socks module for proxied...' print '- Try to get socks module for proxied...'
@ -2443,10 +2445,25 @@ if __name__ == "__main__":
proxy[key] = getattr(config, key) proxy[key] = getattr(config, key)
config.proxy = proxy config.proxy = proxy
if getattr(config, 'api_path', None): if getattr(config, 'api_path', None):
print '- API settings from command line or overide by "client.dat".'
if getattr(config, 'api_username', None) and getattr(config, 'api_password', None): if getattr(config, 'api_username', None) and getattr(config, 'api_password', None):
config.conn = '%s://%s:%s@%s/' % (config.api_type, config.api_username, config.api_password, config.api_path) config.conn = '%s://%s:%s@%s/' % (config.api_type, config.api_username, config.api_password, config.api_path)
else: else:
config.conn = '%s://%s/' % (config.api_type, config.api_path) config.conn = '%s://%s/' % (config.api_type, config.api_path)
elif config.conn: # default or from "keys.dat"
print '- API settings from BMs config file "keys.dat" or default.'
uri = config.conn
scheme, netloc, path, x, xx, xxx = urlparse(uri)
api_username = urlparse(uri).username
api_password = urlparse(uri).password
is_https = scheme == 'https'
config.api_type = 'HTTPS' if is_https else 'HTTP'
if api_username and api_password:
config.api_username = api_username
config.api_password = api_password
netloc = netloc.split('@')[1]
config.api_path = netloc
actions = Actions() actions = Actions()
start() start()