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

Change modules/sts.py to reference connection_params, fix some typos and logig

Browse source 
issues
This commit is contained in:
jesopo 2018-11-05 20:51:33 +00:00
parent ea3ed99a9e
commit 257659aa73
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
modules/sts.py
View file

@ -10,22 +10,21 @@ class Module(ModuleManager.BaseModule):
def _remove_policy(self, server): def _remove_policy(self, server):
server.del_setting("sts-policy") server.del_setting("sts-policy")
def _set_policy(self, server, port, duration, one_shot): def set_policy(self, server, port, duration):
expiration = None expiration = None
self._set_policy(server, { self._set_policy(server, {
"port": port, "port": port,
"from": time.time(), "from": time.time(),
"duration": duration, "duration": duration})
"one-shot": one_shot}) def change_duration(self, server, info):
def _change_duration(self, server, info):
duration = int(info["duration"]) duration = int(info["duration"])
if duration == 0: if duration == 0:
self._remove_policy(server) self._remove_policy(server)
else: else:
port = event["server"].port port = server.connection_params.port
if "port" in info: if "port" in info:
port = int(info["port"]) port = int(info["port"])
self._set_policy(server, port, duration, False) self.set_policy(server, port, duration)
def _get_sts(self, capabilities): def _get_sts(self, capabilities):
return capabilities.get("sts", capabilities.get("draft/sts", None)) return capabilities.get("sts", capabilities.get("draft/sts", None))
@ -35,37 +34,32 @@ class Module(ModuleManager.BaseModule):
sts = self._get_sts(event["capabilities"]) sts = self._get_sts(event["capabilities"])
if sts: if sts:
info = utils.parse.keyvalue(sts, delimiter=",") info = utils.parse.keyvalue(sts, delimiter=",")
if not event["server"].tls: if not event["server"].connection_params.tls:
self._set_policy(event["server"], int(info["port"]), self.set_policy(event["server"], int(info["port"]), None)
None, True)
event["server"].disconnect() event["server"].disconnect()
self.bot.reconnect(event["server"].id, self.bot.reconnect(event["server"].id,
event["server"].connection_params) event["server"].connection_params)
else: else:
self._change_duration(event["server"], info) self.change_duration(event["server"], info)
@utils.hook("received.cap.new") @utils.hook("received.cap.new")
def on_cap_new(self, event): def on_cap_new(self, event):
sts = self._get_sts(event["capabilities"]) sts = self._get_sts(event["capabilities"])
if sts and event["server"].tls: if sts and event["server"].connection_params.tls:
info = utils.parse.keyvalue(sts, delimiter=",") info = utils.parse.keyvalue(sts, delimiter=",")
if event["server"].tls: self.change_duration(event["server"], info)
self._change_duration(event["server"], info)
@utils.hook("new.server") @utils.hook("new.server")
def new_server(self, event): def new_server(self, event):
sts_policy = self._get_policy(event["server"]) sts_policy = self._get_policy(event["server"])
if sts_policy: if sts_policy:
if sts_policy["one-shot"]: if not event["server"].connection_params.tls:
self._remove_policy(event["server"])
if not event["server"].tls:
expiration = sts_policy["from"]+sts_policy
if not sts_policy["duration"] or time.time() <= ( if not sts_policy["duration"] or time.time() <= (
sts_policy["from"]+sts_policy["duration"]): sts_policy["from"]+sts_policy["duration"]):
self.log.trace("Applying STS policy for '%s'", self.log.trace("Applying STS policy for '%s'",
[str(event["server"])]) [str(event["server"])])
event["server"].tls = True event["server"].connection_params.tls = True
event["server"].port = sts_policy["port"] event["server"].connection_params.port = sts_policy["port"]
@utils.hook("server.disconnect") @utils.hook("server.disconnect")
def on_disconnect(self, event): def on_disconnect(self, event):