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

INFO log when we get a HTTP request with an API key (including the key's

Browse source 
comment) (rest_api.py)
This commit is contained in:
jesopo 2019-01-23 22:08:26 +00:00
parent 26603c23ac
commit 6fef7fd0c6
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/rest_api.py
View file

@ -27,6 +27,10 @@ class Handler(http.server.BaseHTTPRequestHandler):
key_setting = _bot.get_setting("api-key-%s" % key, {}) key_setting = _bot.get_setting("api-key-%s" % key, {})
permissions = key_setting.get("permissions", []) permissions = key_setting.get("permissions", [])
if key_setting:
_log.info("[HTTP] %s from API key %s (%s)" %
(method, key, key_setting["comment"]))
if not authenticated or path in permissions or "*" in permissions: if not authenticated or path in permissions or "*" in permissions:
if path.startswith("/api/"): if path.startswith("/api/"):
event_response = None event_response = None
@ -63,14 +67,14 @@ class Handler(http.server.BaseHTTPRequestHandler):
def do_GET(self): def do_GET(self):
parsed = urllib.parse.urlparse(self.path) parsed = urllib.parse.urlparse(self.path)
get_params = self._decode_params(parsed.query) get_params = self._decode_params(parsed.query)
self._handle("get", parsed.path, params=get_params) self._handle("GET", parsed.path, params=get_params)
def do_POST(self): def do_POST(self):
parsed = urllib.parse.urlparse(self.path) parsed = urllib.parse.urlparse(self.path)
post_params = self._decode_params(parsed.query) post_params = self._decode_params(parsed.query)
content_length = int(self.headers.get("content-length", 0)) content_length = int(self.headers.get("content-length", 0))
post_body = self.rfile.read(content_length) post_body = self.rfile.read(content_length)
self._handle("post", parsed.path, data=post_body, params=post_params) self._handle("POST", parsed.path, data=post_body, params=post_params)
def log_message(self, format, *args): def log_message(self, format, *args):
_log.info("[HTTP] " + format, args) _log.info("[HTTP] " + format, args)