Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Make sure bot.lock is released in do_GET

Browse source
This commit is contained in:
jesopo 2018-10-04 17:18:24 +01:00
parent fdddb33f32
commit 7fc0359e3d
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
modules/rest_api.py
View file

@ -8,34 +8,36 @@ class Handler(http.server.BaseHTTPRequestHandler):
timeout = 10
def do_GET(self):
_bot.lock.acquire()
parsed = urllib.parse.urlparse(self.path)
query = parsed.query
get_params = urllib.parse.parse_qs(query)
response = ""
code = 404
if not "key" in get_params or not _bot.get_setting(
"api-key-%s" % get_params["key"][0], False):
code = 401
else:
if parsed.path.startswith("/api/"):
_, _, endpoint = parsed.path[1:].partition("/")
response = _events.on("api").on(endpoint).call_for_result(
params=get_params, path=endpoint.split("/"))
if response:
response = json.dumps(response, sort_keys=True, indent=4)
code = 200
self.send_response(code)
self.send_header("Content-type", "application/json")
self.end_headers()
try:
parsed = urllib.parse.urlparse(self.path)
query = parsed.query
get_params = urllib.parse.parse_qs(query)
response = ""
code = 404
if not "key" in get_params or not _bot.get_setting(
"api-key-%s" % get_params["key"][0], False):
code = 401
else:
if parsed.path.startswith("/api/"):
_, _, endpoint = parsed.path[1:].partition("/")
response = _events.on("api").on(endpoint).call_for_result(
params=get_params, path=endpoint.split("/"))
if response:
response = json.dumps(response, sort_keys=True,
indent=4)
code = 200
self.send_response(code)
self.send_header("Content-type", "application/json")
self.end_headers()
self.wfile.write(response.encode("utf8"))
except:
pass
_bot.lock.release()
finally:
_bot.lock.release()
@utils.export("botset", {"setting": "rest-api",
"help": "Enable/disable REST API",