use jsonschema to validate config and massive refactor
This commit is contained in:
@@ -12,204 +12,51 @@
|
||||
# along with PyMod-Milter. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
__all__ = [
|
||||
"ActionConfig",
|
||||
"Action"]
|
||||
__all__ = ["Action"]
|
||||
|
||||
import logging
|
||||
|
||||
from pymodmilter import BaseConfig
|
||||
from pymodmilter import modify, notify, storage
|
||||
from pymodmilter.base import CustomLogger
|
||||
from pymodmilter.conditions import ConditionsConfig, Conditions
|
||||
|
||||
|
||||
class ActionConfig(BaseConfig):
|
||||
TYPES = {"add_header": "_add_header",
|
||||
"mod_header": "_mod_header",
|
||||
"del_header": "_del_header",
|
||||
"add_disclaimer": "_add_disclaimer",
|
||||
"rewrite_links": "_rewrite_links",
|
||||
"store": "_store",
|
||||
"notify": "_notify",
|
||||
"quarantine": "_quarantine"}
|
||||
|
||||
def __init__(self, cfg, local_addrs, debug):
|
||||
super().__init__(cfg, debug)
|
||||
|
||||
self.local_addrs = local_addrs
|
||||
self.debug = debug
|
||||
|
||||
self.pretend = False
|
||||
if "pretend" in cfg:
|
||||
assert isinstance(cfg["pretend"], bool), \
|
||||
f"{self.name}: pretend: invalid value, should be bool"
|
||||
self.pretend = cfg["pretend"]
|
||||
|
||||
assert "type" in cfg, \
|
||||
f"{self.name}: mandatory parameter 'type' not found"
|
||||
assert isinstance(cfg["type"], str), \
|
||||
f"{self.name}: type: invalid value, should be string"
|
||||
assert cfg["type"] in ActionConfig.TYPES, \
|
||||
f"{self.name}: type: invalid action type"
|
||||
|
||||
getattr(self, ActionConfig.TYPES[cfg["type"]])(cfg)
|
||||
|
||||
if "conditions" in cfg:
|
||||
assert isinstance(cfg["conditions"], dict), \
|
||||
f"{self.name}: conditions: invalid value, should be dict"
|
||||
cfg["conditions"]["name"] = f"{self.name}: condition"
|
||||
if "loglevel" not in cfg["conditions"]:
|
||||
cfg["conditions"]["loglevel"] = self.loglevel
|
||||
self.conditions = ConditionsConfig(
|
||||
cfg["conditions"], local_addrs, debug)
|
||||
else:
|
||||
self.conditions = None
|
||||
|
||||
self.logger.debug(f"{self.name}: pretend={self.pretend}, "
|
||||
f"loglevel={self.loglevel}, "
|
||||
f"type={cfg['type']}, "
|
||||
f"args={self.args}")
|
||||
|
||||
def _add_header(self, cfg):
|
||||
self.action = modify.AddHeader
|
||||
self.add_string_arg(cfg, ["field", "value"])
|
||||
|
||||
def _mod_header(self, cfg):
|
||||
self.action = modify.ModHeader
|
||||
args = ["field", "value"]
|
||||
if "search" in cfg:
|
||||
args.append("search")
|
||||
|
||||
self.add_string_arg(cfg, args)
|
||||
|
||||
def _del_header(self, cfg):
|
||||
self.action = modify.DelHeader
|
||||
args = ["field"]
|
||||
if "value" in cfg:
|
||||
args.append("value")
|
||||
|
||||
self.add_string_arg(cfg, args)
|
||||
|
||||
def _add_disclaimer(self, cfg):
|
||||
self.action = modify.AddDisclaimer
|
||||
if "error_policy" not in cfg:
|
||||
cfg["error_policy"] = "wrap"
|
||||
|
||||
self.add_string_arg(
|
||||
cfg, ["action", "html_template", "text_template",
|
||||
"error_policy"])
|
||||
assert self.args["action"] in ["append", "prepend"], \
|
||||
f"{self.name}: action: invalid value, " \
|
||||
f"should be 'append' or 'prepend'"
|
||||
assert self.args["error_policy"] in ("wrap",
|
||||
"ignore",
|
||||
"reject"), \
|
||||
f"{self.name}: error_policy: invalid value, " \
|
||||
f"should be 'wrap', 'ignore' or 'reject'"
|
||||
|
||||
def _rewrite_links(self, cfg):
|
||||
self.action = modify.RewriteLinks
|
||||
self.add_string_arg(cfg, "repl")
|
||||
|
||||
def _store(self, cfg):
|
||||
assert "storage_type" in cfg, \
|
||||
f"{self.name}: mandatory parameter 'storage_type' not found"
|
||||
assert isinstance(cfg["storage_type"], str), \
|
||||
f"{self.name}: storage_type: invalid value, " \
|
||||
f"should be string"
|
||||
|
||||
if "original" in cfg:
|
||||
self.add_bool_arg(cfg, "original")
|
||||
|
||||
if cfg["storage_type"] == "file":
|
||||
self.action = storage.FileMailStorage
|
||||
self.add_string_arg(cfg, "directory")
|
||||
|
||||
if "metavar" in cfg:
|
||||
self.add_string_arg(cfg, "metavar")
|
||||
|
||||
else:
|
||||
raise RuntimeError(
|
||||
f"{self.name}: storage_type: invalid storage type")
|
||||
|
||||
def _notify(self, cfg):
|
||||
self.action = notify.EMailNotification
|
||||
|
||||
args = ["smtp_host", "envelope_from", "from_header", "subject",
|
||||
"template"]
|
||||
if "repl_img" in cfg:
|
||||
args.append("repl_img")
|
||||
self.add_string_arg(cfg, args)
|
||||
|
||||
self.add_int_arg(cfg, "smtp_port")
|
||||
|
||||
if "embed_imgs" in cfg:
|
||||
assert isinstance(cfg["embed_imgs"], list) and all(
|
||||
[isinstance(img, str) for img in cfg["embed_imgs"]]), \
|
||||
f"{self.name}: embed_imgs: invalid value, " \
|
||||
f"should be list of strings"
|
||||
self.args["embed_imgs"] = cfg["embed_imgs"]
|
||||
|
||||
def _quarantine(self, cfg):
|
||||
self.action = storage.Quarantine
|
||||
assert "storage" in cfg, \
|
||||
f"{self.name}: mandatory parameter 'storage' not found"
|
||||
assert isinstance(cfg["storage"], dict), \
|
||||
f"{self.name}: storage: invalid value, " \
|
||||
f"should be dict"
|
||||
cfg["storage"]["type"] = "store"
|
||||
cfg["storage"]["name"] = f"{self.name}: storage"
|
||||
|
||||
args = ["storage"]
|
||||
if "notification" in cfg:
|
||||
assert isinstance(cfg["notification"], dict), \
|
||||
f"{self.name}: notification: invalid value, " \
|
||||
f"should be dict"
|
||||
cfg["notification"]["type"] = "notify"
|
||||
cfg["notification"]["name"] = f"{self.name}: notification"
|
||||
args.append("notification")
|
||||
|
||||
for arg in args:
|
||||
if "loglevel" not in cfg[arg]:
|
||||
cfg[arg]["loglevel"] = self.loglevel
|
||||
if "pretend" not in cfg[arg]:
|
||||
cfg[arg]["pretend"] = self.pretend
|
||||
|
||||
self.args[arg] = ActionConfig(
|
||||
cfg[arg], self.local_addrs, self.debug)
|
||||
|
||||
if "milter_action" in cfg:
|
||||
self.add_string_arg(cfg, "milter_action")
|
||||
self.args["milter_action"] = self.args["milter_action"].upper()
|
||||
assert self.args["milter_action"] in ["REJECT", "DISCARD",
|
||||
"ACCEPT"], \
|
||||
f"{self.name}: milter_action: invalid value, " \
|
||||
f"should be 'ACCEPT', 'REJECT' or 'DISCARD'"
|
||||
if self.args["milter_action"] == "REJECT":
|
||||
if "reject_reason" in cfg:
|
||||
self.add_string_arg(cfg, "reject_reason")
|
||||
|
||||
if "whitelist" in cfg:
|
||||
wl = {"whitelist": cfg["whitelist"]}
|
||||
wl["name"] = f"{self.name}: whitelist"
|
||||
if "loglevel" not in wl:
|
||||
wl["loglevel"] = self.loglevel
|
||||
self.args["whitelist"] = ConditionsConfig(
|
||||
wl, self.local_addrs, self.debug)
|
||||
from pymodmilter.conditions import Conditions
|
||||
|
||||
|
||||
class Action:
|
||||
"""Action to implement a pre-configured action to perform on e-mails."""
|
||||
ACTION_TYPES = {
|
||||
"add_header": modify.Modify,
|
||||
"mod_header": modify.Modify,
|
||||
"del_header": modify.Modify,
|
||||
"add_disclaimer": modify.Modify,
|
||||
"rewrite_links": modify.Modify,
|
||||
"store": storage.Store,
|
||||
"notify": notify.Notify,
|
||||
"quarantine": storage.Quarantine}
|
||||
|
||||
def __init__(self, cfg):
|
||||
self.logger = cfg.logger
|
||||
if cfg.conditions is None:
|
||||
self.conditions = None
|
||||
else:
|
||||
self.conditions = Conditions(cfg.conditions)
|
||||
def __init__(self, cfg, local_addrs, debug):
|
||||
self.cfg = cfg
|
||||
self.logger = logging.getLogger(cfg["name"])
|
||||
self.logger.setLevel(cfg.get_loglevel(debug))
|
||||
|
||||
self.pretend = cfg.pretend
|
||||
self.name = cfg.name
|
||||
self.action = cfg.action(**cfg.args)
|
||||
self.conditions = cfg["conditions"] if "conditions" in cfg else None
|
||||
if self.conditions is not None:
|
||||
self.conditions["name"] = f"{cfg['name']}: conditions"
|
||||
self.conditions["loglevel"] = cfg["loglevel"]
|
||||
self.conditions = Conditions(self.conditions, local_addrs, debug)
|
||||
|
||||
action_type = cfg["type"]
|
||||
self.action = self.ACTION_TYPES[action_type](
|
||||
cfg, local_addrs, debug)
|
||||
|
||||
def __str__(self):
|
||||
cfg = []
|
||||
for key in ["name", "loglevel", "pretend", "type"]:
|
||||
value = self.cfg[key]
|
||||
cfg.append(f"{key}={value}")
|
||||
if self.conditions is not None:
|
||||
cfg.append(f"conditions={self.conditions}")
|
||||
cfg.append(f"action={self.action}")
|
||||
return "Action(" + ", ".join(cfg) + ")"
|
||||
|
||||
def headersonly(self):
|
||||
"""Return the needs of this action."""
|
||||
@@ -218,8 +65,7 @@ class Action:
|
||||
def execute(self, milter):
|
||||
"""Execute configured action."""
|
||||
logger = CustomLogger(
|
||||
self.logger, {"qid": milter.qid, "name": self.name})
|
||||
self.logger, {"qid": milter.qid, "name": self.cfg["name"]})
|
||||
if self.conditions is None or \
|
||||
self.conditions.match(milter):
|
||||
return self.action.execute(
|
||||
milter=milter, pretend=self.pretend, logger=logger)
|
||||
return self.action.execute(milter)
|
||||
|
||||
Reference in New Issue
Block a user