switch to new config objects
This commit is contained in:
@@ -18,12 +18,9 @@ import logging
|
||||
import logging.handlers
|
||||
import sys
|
||||
|
||||
from json import loads
|
||||
from re import sub
|
||||
|
||||
from pymodmilter import Rule, ModifyMilter
|
||||
from pymodmilter import ModifyMilter
|
||||
from pymodmilter import __version__ as version
|
||||
from pymodmilter.actions import Action
|
||||
from pymodmilter.config import ModifyMilterConfig
|
||||
|
||||
|
||||
def main():
|
||||
@@ -63,13 +60,6 @@ def main():
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
loglevels = {
|
||||
"error": logging.ERROR,
|
||||
"warning": logging.WARNING,
|
||||
"info": logging.INFO,
|
||||
"debug": logging.DEBUG
|
||||
}
|
||||
|
||||
root_logger = logging.getLogger()
|
||||
root_logger.setLevel(logging.DEBUG)
|
||||
|
||||
@@ -92,148 +82,32 @@ def main():
|
||||
logger.setLevel(logging.INFO)
|
||||
|
||||
try:
|
||||
try:
|
||||
with open(args.config, "r") as fh:
|
||||
config = sub(r"(?m)^\s*#.*\n?", "", fh.read())
|
||||
config = loads(config)
|
||||
except Exception as e:
|
||||
for num, line in enumerate(config.splitlines()):
|
||||
logger.error(f"{num+1}: {line}")
|
||||
raise RuntimeError(
|
||||
f"unable to parse config file: {e}")
|
||||
|
||||
if "global" not in config:
|
||||
config["global"] = {}
|
||||
|
||||
if args.debug:
|
||||
loglevel = logging.DEBUG
|
||||
else:
|
||||
if "loglevel" not in config["global"]:
|
||||
config["global"]["loglevel"] = "info"
|
||||
loglevel = loglevels[config["global"]["loglevel"]]
|
||||
|
||||
logger.setLevel(loglevel)
|
||||
|
||||
logger.debug("prepar milter configuration")
|
||||
cfg = ModifyMilterConfig(args.cfgfile, args.debug)
|
||||
|
||||
if "pretend" not in config["global"]:
|
||||
config["global"]["pretend"] = False
|
||||
if not args.debug:
|
||||
logger.setLevel(cfg["loglevel"])
|
||||
|
||||
if args.socket:
|
||||
socket = args.socket
|
||||
elif "socket" in config["global"]:
|
||||
socket = config["global"]["socket"]
|
||||
elif "socket" in cfg:
|
||||
socket = cfg["socket"]
|
||||
else:
|
||||
raise RuntimeError(
|
||||
"listening socket is neither specified on the command line "
|
||||
"nor in the configuration file")
|
||||
|
||||
if "local_addrs" in config["global"]:
|
||||
local_addrs = config["global"]["local_addrs"]
|
||||
else:
|
||||
local_addrs = [
|
||||
"::1/128",
|
||||
"127.0.0.0/8",
|
||||
"10.0.0.0/8",
|
||||
"172.16.0.0/12",
|
||||
"192.168.0.0/16"]
|
||||
|
||||
if "rules" not in config:
|
||||
raise RuntimeError(
|
||||
"mandatory config section 'rules' not found")
|
||||
|
||||
if not config["rules"]:
|
||||
if not cfg["rules"]:
|
||||
raise RuntimeError("no rules configured")
|
||||
|
||||
logger.debug("initialize rules ...")
|
||||
logger.debug("initializing rules ...")
|
||||
|
||||
rules = []
|
||||
for rule_idx, rule in enumerate(config["rules"]):
|
||||
if "name" in rule:
|
||||
rule_name = rule["name"]
|
||||
else:
|
||||
rule_name = f"Rule #{rule_idx}"
|
||||
|
||||
logger.debug(f"prepare rule {rule_name} ...")
|
||||
|
||||
if "actions" not in rule:
|
||||
for rule_cfg in cfg["rules"]:
|
||||
if not rule_cfg["actions"]:
|
||||
raise RuntimeError(
|
||||
f"{rule_name}: mandatory config "
|
||||
f"section 'actions' not found")
|
||||
f"{rule_cfg['name']}: no actions configured")
|
||||
|
||||
if not rule["actions"]:
|
||||
raise RuntimeError("{rule_name}: no actions configured")
|
||||
|
||||
if args.debug:
|
||||
rule_loglevel = logging.DEBUG
|
||||
elif "loglevel" in rule:
|
||||
rule_loglevel = loglevels[rule["loglevel"]]
|
||||
else:
|
||||
rule_loglevel = loglevels[config["global"]["loglevel"]]
|
||||
|
||||
if "pretend" in rule:
|
||||
rule_pretend = rule["pretend"]
|
||||
else:
|
||||
rule_pretend = config["global"]["pretend"]
|
||||
|
||||
actions = []
|
||||
for action_idx, action in enumerate(rule["actions"]):
|
||||
if "name" in action:
|
||||
action_name = f"{rule_name}: {action['name']}"
|
||||
else:
|
||||
action_name = f"Action #{action_idx}"
|
||||
|
||||
if args.debug:
|
||||
action_loglevel = logging.DEBUG
|
||||
elif "loglevel" in action:
|
||||
action_loglevel = loglevels[action["loglevel"]]
|
||||
else:
|
||||
action_loglevel = rule_loglevel
|
||||
|
||||
if "pretend" in action:
|
||||
action_pretend = action["pretend"]
|
||||
else:
|
||||
action_pretend = rule_pretend
|
||||
|
||||
if "type" not in action:
|
||||
raise RuntimeError(
|
||||
f"{rule_name}: {action_name}: mandatory config "
|
||||
f"section 'actions' not found")
|
||||
|
||||
if "conditions" not in action:
|
||||
action["conditions"] = {}
|
||||
|
||||
try:
|
||||
actions.append(
|
||||
Action(
|
||||
name=action_name,
|
||||
local_addrs=local_addrs,
|
||||
conditions=action["conditions"],
|
||||
action_type=action["type"],
|
||||
args=action,
|
||||
loglevel=action_loglevel,
|
||||
pretend=action_pretend))
|
||||
except RuntimeError as e:
|
||||
logger.error(f"{action_name}: {e}")
|
||||
sys.exit(253)
|
||||
|
||||
if "conditions" not in rule:
|
||||
rule["conditions"] = {}
|
||||
|
||||
try:
|
||||
rules.append(
|
||||
Rule(
|
||||
name=rule_name,
|
||||
local_addrs=local_addrs,
|
||||
conditions=rule["conditions"],
|
||||
actions=actions,
|
||||
loglevel=rule_loglevel,
|
||||
pretend=rule_pretend))
|
||||
except RuntimeError as e:
|
||||
logger.error(f"{rule_name}: {e}")
|
||||
sys.exit(254)
|
||||
|
||||
except RuntimeError as e:
|
||||
except (RuntimeError, AssertionError) as e:
|
||||
logger.error(e)
|
||||
sys.exit(255)
|
||||
|
||||
@@ -247,8 +121,7 @@ def main():
|
||||
stdouthandler.setLevel(logging.DEBUG)
|
||||
|
||||
logger.info("pymodmilter starting")
|
||||
ModifyMilter.set_rules(rules)
|
||||
ModifyMilter.set_loglevel(loglevel)
|
||||
ModifyMilter.set_config(cfg)
|
||||
|
||||
# register milter factory class
|
||||
Milter.factory = ModifyMilter
|
||||
|
||||
Reference in New Issue
Block a user