rpc works with authentication
This commit is contained in:
Alex Grintsvayg
parent
53acb2d9cd
commit
05725e0dc9
4 changed files with 30 additions and 37 deletions
|
|
@ -261,7 +261,6 @@ class Daemon(AuthJSONRPCServer):
|
|||
|
||||
self.analytics_manager = analytics_manager
|
||||
self.lbryid = conf.settings.lbryid
|
||||
self.daemon_conf = conf.settings.get_conf_filename()
|
||||
|
||||
self.wallet_user = None
|
||||
self.wallet_password = None
|
||||
|
|
@ -1357,7 +1356,8 @@ class Daemon(AuthJSONRPCServer):
|
|||
fn = self.callable_methods.get(p['function'])
|
||||
if fn is None:
|
||||
return self._render_response(
|
||||
"Function '" + p['function'] + "' is not a valid function")
|
||||
"No help available for '" + p['function'] + "'. It is not a valid function."
|
||||
)
|
||||
return self._render_response(textwrap.dedent(fn.__doc__))
|
||||
else:
|
||||
return self._render_response(textwrap.dedent(self.jsonrpc_help.__doc__))
|
||||
|
|
@ -2220,29 +2220,26 @@ class Daemon(AuthJSONRPCServer):
|
|||
|
||||
"""
|
||||
|
||||
exclude_previous = True
|
||||
force = False
|
||||
log_type = None
|
||||
|
||||
if p:
|
||||
if 'name_prefix' in p:
|
||||
log_type = p['name_prefix'] + '_api'
|
||||
elif 'log_type' in p:
|
||||
log_type = p['log_type'] + '_api'
|
||||
else:
|
||||
log_type = None
|
||||
|
||||
if 'exclude_previous' in p:
|
||||
exclude_previous = p['exclude_previous']
|
||||
else:
|
||||
exclude_previous = True
|
||||
|
||||
if 'message' in p:
|
||||
log.info("Upload log message: " + str(p['message']))
|
||||
|
||||
if 'force' in p:
|
||||
force = p['force']
|
||||
else:
|
||||
force = False
|
||||
else:
|
||||
log_type = "api"
|
||||
exclude_previous = True
|
||||
|
||||
d = self._upload_log(log_type=log_type, exclude_previous=exclude_previous, force=force)
|
||||
d.addCallback(lambda _: self._render_response(True))
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import os
|
|||
import sys
|
||||
|
||||
from lbrynet import conf
|
||||
from lbrynet.lbrynet_daemon.auth.client import LBRYAPIClient
|
||||
from lbrynet.lbrynet_daemon.auth.client import JSONRPCException, LBRYAPIClient
|
||||
from lbrynet.lbrynet_daemon.Daemon import LOADING_WALLET_CODE
|
||||
from jsonrpc.common import RPCError
|
||||
from urllib2 import URLError
|
||||
|
|
@ -26,6 +26,7 @@ def main():
|
|||
return 1
|
||||
|
||||
conf.initialize_settings()
|
||||
conf.update_settings_from_file()
|
||||
api = LBRYAPIClient.get_client()
|
||||
|
||||
# TODO: check if port is bound. Error if its not
|
||||
|
|
@ -67,13 +68,7 @@ def main():
|
|||
print result
|
||||
else:
|
||||
print json.dumps(result, sort_keys=True, indent=2, separators=(',', ': '))
|
||||
except RPCError as err:
|
||||
handle_error(err, api, method)
|
||||
except KeyError as err:
|
||||
handle_error(err, api, method)
|
||||
|
||||
|
||||
def handle_error(err, api, method):
|
||||
except (RPCError, KeyError, JSONRPCException) as err:
|
||||
# TODO: The api should return proper error codes
|
||||
# and messages so that they can be passed along to the user
|
||||
# instead of this generic message.
|
||||
|
|
@ -83,6 +78,7 @@ def handle_error(err, api, method):
|
|||
if hasattr(err, 'msg'):
|
||||
print "Here's the traceback for the error you encountered:"
|
||||
print err.msg
|
||||
return 1
|
||||
|
||||
|
||||
def guess_type(x):
|
||||
|
|
|
|||
|
|
@ -37,22 +37,22 @@ class AuthAPIClient(object):
|
|||
raise AttributeError # Python internal stuff
|
||||
|
||||
def f(*args):
|
||||
return self.call(name, args)
|
||||
return self.call(name, args[0] if args else {})
|
||||
|
||||
return f
|
||||
|
||||
def call(self, method, params={}):
|
||||
self.__id_count += 1
|
||||
pre_auth_postdata = {
|
||||
pre_auth_post_data = {
|
||||
'version': '1.1',
|
||||
'method': method,
|
||||
'params': params,
|
||||
'params': [params],
|
||||
'id': self.__id_count
|
||||
}
|
||||
to_auth = get_auth_message(pre_auth_postdata)
|
||||
to_auth = get_auth_message(pre_auth_post_data)
|
||||
token = self.__api_key.get_hmac(to_auth)
|
||||
pre_auth_postdata.update({'hmac': token})
|
||||
postdata = json.dumps(pre_auth_postdata)
|
||||
pre_auth_post_data.update({'hmac': token})
|
||||
post_data = json.dumps(pre_auth_post_data)
|
||||
service_url = self.__service_url
|
||||
auth_header = self.__auth_header
|
||||
cookies = self.__cookies
|
||||
|
|
@ -60,7 +60,7 @@ class AuthAPIClient(object):
|
|||
|
||||
req = requests.Request(method='POST',
|
||||
url=service_url,
|
||||
data=postdata,
|
||||
data=post_data,
|
||||
headers={
|
||||
'Host': host,
|
||||
'User-Agent': USER_AGENT,
|
||||
|
|
@ -97,7 +97,6 @@ class AuthAPIClient(object):
|
|||
def config(cls, key_name=None, key=None, pw_path=None,
|
||||
timeout=HTTP_TIMEOUT,
|
||||
connection=None, count=0,
|
||||
service=None,
|
||||
cookies=None, auth=None,
|
||||
url=None, login_url=None):
|
||||
|
||||
|
|
@ -153,8 +152,7 @@ class AuthAPIClient(object):
|
|||
assert cookies.get(LBRY_SECRET, False), "Missing cookie"
|
||||
secret = cookies.get(LBRY_SECRET)
|
||||
api_key = APIKey(secret, api_key_name)
|
||||
return cls(api_key, timeout, conn, id_count, service, cookies,
|
||||
auth_header, url, service_url)
|
||||
return cls(api_key, timeout, conn, id_count, cookies, auth_header, url, service_url)
|
||||
|
||||
|
||||
class LBRYAPIClient(object):
|
||||
|
|
|
|||
|
|
@ -141,6 +141,7 @@ class AuthJSONRPCServer(AuthorizedBase):
|
|||
self._set_headers(request, message, True)
|
||||
self._render_message(request, message)
|
||||
return server.NOT_DONE_YET
|
||||
else:
|
||||
session.touch()
|
||||
|
||||
request.content.seek(0, 0)
|
||||
|
|
@ -284,6 +285,7 @@ class AuthJSONRPCServer(AuthorizedBase):
|
|||
return False
|
||||
|
||||
def _verify_token(self, session_id, message, token):
|
||||
assert token is not None, InvalidAuthenticationToken
|
||||
to_auth = get_auth_message(message)
|
||||
api_key = self.sessions.get(session_id)
|
||||
assert api_key.compare_hmac(to_auth, token), InvalidAuthenticationToken
|
||||
|
|
|
|||
Loading…
Reference in a new issue