diff options
| author |  jesopo | 2019-01-23 22:08:26 +0000 |
|---|---|---|
| committer | jesopo | 2019-01-23 22:08:26 +0000 |
| commit | 6fef7fd0c6187f95080c8f95250bc743e1007561 (patch) | |
| tree | db1458f1537978f177e05ec98334f04e787ff755 /modules/rest_api.py | |
| parent | Also pass `method` to `StdOut`/`StdErr` `Send()` when a `send.stdout` or (diff) | |
| signature | ||
INFO log when we get a HTTP request with an API key (including the key's
comment) (rest_api.py)
Diffstat (limited to 'modules/rest_api.py')
| -rw-r--r-- | modules/rest_api.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/rest_api.py b/modules/rest_api.py index 2914f5d3..4a71e834 100644 --- a/modules/rest_api.py +++ b/modules/rest_api.py @@ -27,6 +27,10 @@ class Handler(http.server.BaseHTTPRequestHandler): key_setting = _bot.get_setting("api-key-%s" % key, {}) 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 path.startswith("/api/"): event_response = None @@ -63,14 +67,14 @@ class Handler(http.server.BaseHTTPRequestHandler): def do_GET(self): parsed = urllib.parse.urlparse(self.path) 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): parsed = urllib.parse.urlparse(self.path) post_params = self._decode_params(parsed.query) content_length = int(self.headers.get("content-length", 0)) 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): _log.info("[HTTP] " + format, args) |