forked from Dniel97/artemis
Pokken: added check for ssl cert/key
This commit is contained in:
parent
0da3053454
commit
abe1fa7853
@ -5,7 +5,7 @@ import yaml
|
|||||||
import logging, coloredlogs
|
import logging, coloredlogs
|
||||||
from logging.handlers import TimedRotatingFileHandler
|
from logging.handlers import TimedRotatingFileHandler
|
||||||
from titles.pokken.proto import jackal_pb2
|
from titles.pokken.proto import jackal_pb2
|
||||||
from google.protobuf import text_format
|
from os import path
|
||||||
|
|
||||||
from core.config import CoreConfig
|
from core.config import CoreConfig
|
||||||
from titles.pokken.config import PokkenConfig
|
from titles.pokken.config import PokkenConfig
|
||||||
@ -42,12 +42,19 @@ class PokkenServlet(resource.Resource):
|
|||||||
|
|
||||||
def setup(self):
|
def setup(self):
|
||||||
if self.game_cfg.server.enable:
|
if self.game_cfg.server.enable:
|
||||||
if self.core_cfg.server.is_develop and self.game_cfg.server.ssl_enable:
|
key_exists = path.exists(self.game_cfg.server.ssl_key)
|
||||||
|
cert_exists = path.exists(self.game_cfg.server.ssl_cert)
|
||||||
|
|
||||||
|
if self.core_cfg.server.is_develop and self.game_cfg.server.ssl_enable and key_exists and cert_exists:
|
||||||
endpoints.serverFromString(reactor, f"ssl:{self.game_cfg.server.port}"\
|
endpoints.serverFromString(reactor, f"ssl:{self.game_cfg.server.port}"\
|
||||||
f":interface={self.game_cfg.server.hostname}:privateKey={self.game_cfg.server.ssl_key}:"\
|
f":interface={self.game_cfg.server.hostname}:privateKey={self.game_cfg.server.ssl_key}:"\
|
||||||
f"certKey={self.game_cfg.server.ssl_cert}")\
|
f"certKey={self.game_cfg.server.ssl_cert}")\
|
||||||
.listen(server.Site(PokkenServlet(self.core_cfg, self.config_dir)))
|
.listen(server.Site(PokkenServlet(self.core_cfg, self.config_dir)))
|
||||||
|
|
||||||
|
elif self.core_cfg.server.is_develop and self.game_cfg.server.ssl_enable:
|
||||||
|
self.logger.error(f"Could not find cert at {self.game_cfg.server.ssl_key} or key at {self.game_cfg.server.ssl_cert}, Pokken not running.")
|
||||||
|
return
|
||||||
|
|
||||||
else:
|
else:
|
||||||
endpoints.serverFromString(reactor, f"tcp:{self.game_cfg.server.port}"\
|
endpoints.serverFromString(reactor, f"tcp:{self.game_cfg.server.port}"\
|
||||||
f":interface={self.game_cfg.server.hostname}")\
|
f":interface={self.game_cfg.server.hostname}")\
|
||||||
|
Loading…
Reference in New Issue
Block a user