diff options
| author |  jesopo | 2019-02-10 12:38:53 +0000 |
|---|---|---|
| committer | jesopo | 2019-02-10 12:38:53 +0000 |
| commit | 1d206fe78f9e90e9bbb20df63e3e24774b4e24ec (patch) | |
| tree | 1fafcfd190f376d214c63cd4a4e903403abbbc00 | |
| parent | Abstract ssl socket wrapping away so we can reuse it (diff) | |
| signature | ||
Use newly abstracted away ssl_wrap (rest_api.py)
| -rw-r--r-- | modules/rest_api.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/rest_api.py b/modules/rest_api.py index a8411648..9efb2768 100644 --- a/modules/rest_api.py +++ b/modules/rest_api.py @@ -116,10 +116,12 @@ class Module(ModuleManager.BaseModule): self.httpd = None if self.bot.get_setting("rest-api", False): self.httpd = http.server.HTTPServer(("", 5000), Handler) - self.httpd.socket = ssl.wrap_socket(self.httpd.socket, - keyfile=self.bot.config["tls-api-key"], - certfile=self.bot.config["tls-api-certificate"], + + self.httpd.socket = utils.security.wrap_scket(self.httpd.socket, + cert=self.bot.config["tls-api-certificate"], + key=self.bot.config["tls-api-key"], server_side=True) + self.thread = threading.Thread(target=self.httpd.serve_forever) self.thread.daemon = True self.thread.start() |