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

One-shot STS policies should still be cleared if a reconnect fails

Browse source
This commit is contained in:
jesopo 2018-11-05 13:14:00 +00:00
parent 5981bfa04c
commit 061a4ede23
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/sts.py
View file

@ -38,16 +38,13 @@ class Module(ModuleManager.BaseModule):
@utils.hook("new.server") @utils.hook("new.server")
def new_server(self, event): def new_server(self, event):
sts_policy = event["server"].get_setting("sts-policy") sts_policy = event["server"].get_setting("sts-policy")
if sts_policy and not event["server"].tls: if sts_policy:
if sts_policy["one-shot"]:
event["server"].del_setting("sts-policy")
if not event["server"].tls:
expiration = sts_policy["expiration"] expiration = sts_policy["expiration"]
if not expiration or time.time() <= expiration: if not expiration or time.time() <= expiration:
self.log.debug("Applying STS policy for '%s'", self.log.debug("Applying STS policy for '%s'",
[str(event["server"])]) [str(event["server"])])
event["server"].tls = True event["server"].tls = True
event["server"].port = sts_policy["port"] event["server"].port = sts_policy["port"]
@utils.hook("received.numeric.001"):
def on_connect(self, event):
sts_policy = event["server"].get_setting("sts-policy")
if sts_policy and sts_policy["one-shot"]:
event["server"].del_setting("sts-policy")