spacefreak/pyquarantine-milter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

unintend some code

Browse Source
This commit is contained in:
Thomas Oettli
2022-01-05 17:26:58 +01:00
parent fc6af6eed0
commit 42e7e20c1a
1 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pyquarantine/config.py
View File

@@ -125,7 +125,8 @@ class ConditionsConfig(BaseConfig):
def __init__(self, config, rec=True): def __init__(self, config, rec=True):
super().__init__(config) super().__init__(config)
if rec: if not rec:
return
if "whitelist" in self: if "whitelist" in self:
self["whitelist"] = WhitelistConfig(self["whitelist"]) self["whitelist"] = WhitelistConfig(self["whitelist"])
@@ -247,7 +248,8 @@ class QuarantineConfig(BaseConfig):
def __init__(self, config, rec=True): def __init__(self, config, rec=True):
super().__init__(config) super().__init__(config)
if rec: if not rec:
return
if "metadata" not in self["store"]: if "metadata" not in self["store"]:
self["store"]["metadata"] = True self["store"]["metadata"] = True
self["store"] = StoreConfig(self["store"]) self["store"] = StoreConfig(self["store"])
@@ -283,7 +285,8 @@ class ActionConfig(BaseConfig):
def __init__(self, config, rec=True): def __init__(self, config, rec=True):
super().__init__(config) super().__init__(config)
if rec: if not rec:
return
if "conditions" in self: if "conditions" in self:
self["conditions"] = ConditionsConfig(self["conditions"]) self["conditions"] = ConditionsConfig(self["conditions"])
self["action"] = self.ACTION_TYPES[self["type"]](self["options"]) self["action"] = self.ACTION_TYPES[self["type"]](self["options"])
@@ -303,7 +306,8 @@ class RuleConfig(BaseConfig):
def __init__(self, config, rec=True): def __init__(self, config, rec=True):
super().__init__(config) super().__init__(config)
if rec: if not rec:
return
if "conditions" in self: if "conditions" in self:
self["conditions"] = ConditionsConfig(self["conditions"]) self["conditions"] = ConditionsConfig(self["conditions"])
@@ -339,7 +343,8 @@ class QuarantineMilterConfig(BaseConfig):
def __init__(self, config, rec=True): def __init__(self, config, rec=True):
super().__init__(config) super().__init__(config)
if rec: if not rec:
return
rules = [] rules = []
for idx, rule in enumerate(self["rules"]): for idx, rule in enumerate(self["rules"]):
if "loglevel" not in rule: if "loglevel" not in rule: