Added CLI, improved error handling, small bugfixes
This commit is contained in:
346
pyquarantine/cli.py
Normal file
346
pyquarantine/cli.py
Normal file
@@ -0,0 +1,346 @@
|
||||
#!/usr/bin/env python2
|
||||
#
|
||||
# PyQuarantine-Milter is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# PyQuarantine-Milter is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with PyQuarantineMilter. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
import argparse
|
||||
import logging
|
||||
import logging.handlers
|
||||
import sys
|
||||
import time
|
||||
|
||||
import pyquarantine
|
||||
|
||||
|
||||
|
||||
def _get_quarantine_obj(config, quarantine):
|
||||
if quarantine not in config.keys():
|
||||
raise RuntimeError("invalid quarantine '{}'".format(quarantine))
|
||||
return config[quarantine]["quarantine_obj"]
|
||||
|
||||
|
||||
|
||||
def _get_whitelist_obj(config, quarantine):
|
||||
if quarantine not in config.keys():
|
||||
raise RuntimeError("invalid quarantine '{}'".format(quarantine))
|
||||
return config[quarantine]["whitelist_obj"]
|
||||
|
||||
|
||||
|
||||
def print_table(headers, keys, data):
|
||||
if len(data) == 0:
|
||||
return
|
||||
|
||||
# calculate length of each column
|
||||
column_lengths = []
|
||||
column_formats = []
|
||||
for idx, header in enumerate(headers):
|
||||
length = len(header)
|
||||
key = keys[idx]
|
||||
value_length=len((max(data.items(), key=lambda (k, v): len(v[key])))[1][key])
|
||||
if value_length > length: length = value_length
|
||||
column_lengths.append(length)
|
||||
column_formats.append("{{:<{}}}".format(length))
|
||||
|
||||
# define row format
|
||||
row_format = " | ".join(column_formats)
|
||||
|
||||
# define header/body separator
|
||||
separators = []
|
||||
for length in column_lengths:
|
||||
separators.append("-" * length)
|
||||
separator = "-+-".join(separators)
|
||||
|
||||
# print header and separator
|
||||
print(row_format.format(*headers))
|
||||
print(separator)
|
||||
|
||||
# print data
|
||||
for key, value in data.items():
|
||||
row = []
|
||||
for entry in keys:
|
||||
row.append(value[entry])
|
||||
print(row_format.format(*row))
|
||||
|
||||
|
||||
|
||||
def list_quarantines(config, args):
|
||||
if args.batch:
|
||||
print("\n".join(config.keys()))
|
||||
else:
|
||||
print_table(
|
||||
["Name", "Quarantine", "Notification", "Action"],
|
||||
["name", "quarantine_type", "notification_type", "action"],
|
||||
config
|
||||
)
|
||||
return 0
|
||||
|
||||
|
||||
|
||||
def list_quarantine_emails(config, args):
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# get quarantine object
|
||||
quarantine = _get_quarantine_obj(config, args.quarantine)
|
||||
if quarantine == None:
|
||||
raise RuntimeError("quarantine type is set to None, unable to list e-mails")
|
||||
|
||||
# find emails and transform some metadata values to strings
|
||||
emails = quarantine.find(mailfrom=args.mailfrom, recipients=args.recipients, older_than=args.older_than)
|
||||
for quarantine_id, metadata in emails.items():
|
||||
emails[quarantine_id]["quarantine_id"] = quarantine_id
|
||||
emails[quarantine_id]["recipient_str"] = ", ".join(metadata["recipients"])
|
||||
emails[quarantine_id]["date_str"] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(metadata["date"]))
|
||||
|
||||
if args.batch:
|
||||
print("\n".join(emails.keys()))
|
||||
else:
|
||||
if len(emails) == 0: logger.info("quarantine '{}' is empty".format(args.quarantine))
|
||||
print_table(
|
||||
["Quarantine-ID", "From", "Recipient(s)", "Date"],
|
||||
["quarantine_id", "from", "recipient_str", "date_str"],
|
||||
emails
|
||||
)
|
||||
|
||||
|
||||
|
||||
def list_whitelist(config, args):
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# get whitelist object
|
||||
whitelist = _get_whitelist_obj(config, args.quarantine)
|
||||
if whitelist == None:
|
||||
raise RuntimeError("whitelist type is set to None, unable to list entries")
|
||||
|
||||
# find whitelist entries
|
||||
entries = whitelist.find(mailfrom=args.mailfrom, recipients=args.recipients, older_than=args.older_than)
|
||||
if len(entries) == 0:
|
||||
logger.info("whitelist of quarantine '{}' is empty".format(args.quarantine))
|
||||
else:
|
||||
# transform some values to strings
|
||||
for entry_id, entry in entries.items():
|
||||
entries[entry_id]["id"] = str(entry["id"])
|
||||
entries[entry_id]["created_str"] = entry["created"].strftime('%Y-%m-%d %H:%M:%S')
|
||||
entries[entry_id]["last_used_str"] = entry["last_used"].strftime('%Y-%m-%d %H:%M:%S')
|
||||
entries[entry_id]["permanent_str"] = str(entry["permanent"])
|
||||
|
||||
print_table(
|
||||
["ID", "From", "To", "Created", "Last used", "Comment", "Permanent"],
|
||||
["id", "mailfrom", "recipient", "created_str", "last_used_str", "comment", "permanent_str"],
|
||||
entries
|
||||
)
|
||||
|
||||
|
||||
|
||||
def add_whitelist_entry(config, args):
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# get whitelist object
|
||||
whitelist = _get_whitelist_obj(config, args.quarantine)
|
||||
if whitelist == None:
|
||||
raise RuntimeError("whitelist type is set to None, unable to add entries")
|
||||
|
||||
# check existing entries
|
||||
entries = whitelist.check(args.mailfrom, args.recipient)
|
||||
if len(entries) > 0:
|
||||
# check if the exact entry exists already
|
||||
for entry in entries.values():
|
||||
if entry["mailfrom"] == args.mailfrom and entry["recipient"] == args.recipient:
|
||||
raise RuntimeError("an entry with this from/to combination already exists")
|
||||
if not args.force:
|
||||
# the entry is already covered by others
|
||||
for entry_id, entry in entries.items():
|
||||
entries[entry_id]["created_str"] = entry["created"].strftime('%Y-%m-%d %H:%M:%S')
|
||||
entries[entry_id]["last_used_str"] = entry["last_used"].strftime('%Y-%m-%d %H:%M:%S')
|
||||
entries[entry_id]["permanent_str"] = str(entry["permanent"])
|
||||
print_table(
|
||||
["From", "To", "Created", "Last used", "Comment", "Permanent"],
|
||||
["mailfrom", "recipient", "created_str", "last_used_str", "comment", "permanent_str"],
|
||||
entries
|
||||
)
|
||||
print("")
|
||||
raise RuntimeError("from/to combination is already covered by the entries above, use --force to override.")
|
||||
# add entry to whitelist
|
||||
whitelist.add(args.mailfrom, args.recipient, args.comment, args.permanent)
|
||||
logger.info("successfully added whitelist entry")
|
||||
|
||||
|
||||
|
||||
def delete_whitelist_entry(config, args):
|
||||
logger = logging.getLogger(__name__)
|
||||
whitelist = _get_whitelist_obj(config, args.quarantine)
|
||||
if whitelist == None:
|
||||
raise RuntimeError("whitelist type is set to None, unable to delete entries")
|
||||
whitelist.delete(args.whitelist_id)
|
||||
logger.info("successfully deleted whitelist entry")
|
||||
|
||||
|
||||
|
||||
def release_email(config, args):
|
||||
logger = logging.getLogger(__name__)
|
||||
quarantine = _get_quarantine_obj(config, args.quarantine)
|
||||
if quarantine == None:
|
||||
raise RuntimeError("quarantine type is set to None, unable to release e-mail")
|
||||
quarantine.release(args.quarantine_id, args.recipient)
|
||||
logger.info("successfully released e-mail [quarantine-id: {}] to '{}' from quarantine '{}'".format(args.quarantine_id, args.recipient, args.quarantine))
|
||||
|
||||
|
||||
|
||||
def delete_email(config, args):
|
||||
logger = logging.getLogger(__name__)
|
||||
quarantine = _get_quarantine_obj(config, args.quarantine)
|
||||
if quarantine == None:
|
||||
raise RuntimeError("quarantine type is set to None, unable to delete e-mail")
|
||||
quarantine.delete(args.quarantine_id, args.recipient)
|
||||
logger.info("successfully deleted e-mail [quarantine-id: {}] to '{}' from quarantine '{}'".format(args.quarantine_id, args.recipient, args.quarantine))
|
||||
|
||||
|
||||
|
||||
class StdErrFilter(logging.Filter):
|
||||
def filter(self, rec):
|
||||
return rec.levelno in (logging.ERROR, logging.WARNING)
|
||||
|
||||
|
||||
|
||||
class StdOutFilter(logging.Filter):
|
||||
def filter(self, rec):
|
||||
return rec.levelno in (logging.DEBUG, logging.INFO)
|
||||
|
||||
|
||||
|
||||
def main():
|
||||
"PyQuarantine command-line interface."
|
||||
# parse command line
|
||||
formatter_class = lambda prog: argparse.HelpFormatter(prog, max_help_position=50, width=140)
|
||||
parser = argparse.ArgumentParser(description="PyQuarantine CLI", formatter_class=formatter_class)
|
||||
parser.add_argument("-c", "--config", help="Config files to read.", nargs="+", metavar="CFG",
|
||||
default=pyquarantine.QuarantineMilter.get_configfiles())
|
||||
parser.add_argument("-d", "--debug", help="Log debugging messages.", action="store_true")
|
||||
parser.set_defaults(syslog=False)
|
||||
subparsers = parser.add_subparsers()
|
||||
# list command
|
||||
list_parser = subparsers.add_parser("list", help="List available quarantines.", formatter_class=formatter_class)
|
||||
list_parser.add_argument("-b", "--batch", help="Print results using only quarantine names, each on a new line.", action="store_true")
|
||||
list_parser.set_defaults(func=list_quarantines)
|
||||
|
||||
# quarantine command group
|
||||
quarantine_parser = subparsers.add_parser("quarantine", description="Manage quarantines.", help="Manage quarantines.", formatter_class=formatter_class)
|
||||
quarantine_subparsers = quarantine_parser.add_subparsers()
|
||||
# quarantine list command
|
||||
quarantine_list_parser = quarantine_subparsers.add_parser("list", description="List e-mails in quarantines.", help="List e-mails in quarantine.", formatter_class=formatter_class)
|
||||
quarantine_list_parser.add_argument("quarantine", metavar="QUARANTINE", help="Quarantine name.")
|
||||
quarantine_list_parser.add_argument("-f", "--from", dest="mailfrom", help="Filter e-mails by from address.", default=None, nargs="+")
|
||||
quarantine_list_parser.add_argument("-t", "--to", dest="recipients", help="Filter e-mails by recipient address.", default=None, nargs="+")
|
||||
quarantine_list_parser.add_argument("-o", "--older-than", dest="older_than", help="Filter e-mails by age (days).", default=None, type=float)
|
||||
quarantine_list_parser.add_argument("-b", "--batch", help="Print results using only e-mail quarantine IDs, each on a new line.", action="store_true")
|
||||
quarantine_list_parser.set_defaults(func=list_quarantine_emails)
|
||||
# quarantine release command
|
||||
quarantine_release_parser = quarantine_subparsers.add_parser("release", description="Release e-mail from quarantine.", help="Release e-mail from quarantine.", formatter_class=formatter_class)
|
||||
quarantine_release_parser.add_argument("quarantine", metavar="QUARANTINE", help="Quarantine name.")
|
||||
quarantine_release_parser.add_argument("quarantine_id", metavar="ID", help="Quarantine ID.")
|
||||
quarantine_release_parser.add_argument("-n", "--disable-syslog", dest="syslog", help="Disable syslog messages.", action="store_false")
|
||||
quarantine_release_parser_group = quarantine_release_parser.add_mutually_exclusive_group(required=True)
|
||||
quarantine_release_parser_group.add_argument("-t", "--to", dest="recipient", help="Release e-mail for one recipient address.")
|
||||
quarantine_release_parser_group.add_argument("-a", "--all", help="Release e-mail for all recipients.", action="store_true")
|
||||
quarantine_release_parser.set_defaults(func=release_email)
|
||||
# quarantine delete command
|
||||
quarantine_delete_parser = quarantine_subparsers.add_parser("delete", description="Delete e-mail from quarantine.", help="Delete e-mail from quarantine.", formatter_class=formatter_class)
|
||||
quarantine_delete_parser.add_argument("quarantine", metavar="QUARANTINE", help="Quarantine name.")
|
||||
quarantine_delete_parser.add_argument("quarantine_id", metavar="ID", help="Quarantine ID.")
|
||||
quarantine_delete_parser.add_argument("-n", "--disable-syslog", dest="syslog", help="Disable syslog messages.", action="store_false")
|
||||
quarantine_delete_parser_group = quarantine_delete_parser.add_mutually_exclusive_group(required=True)
|
||||
quarantine_delete_parser_group.add_argument("-t", "--to", dest="recipient", help="Delete e-mail for one recipient address.")
|
||||
quarantine_delete_parser_group.add_argument("-a", "--all", help="Delete e-mail for all recipients.", action="store_true")
|
||||
quarantine_delete_parser.set_defaults(func=delete_email)
|
||||
|
||||
# whitelist command group
|
||||
whitelist_parser = subparsers.add_parser("whitelist", description="Manage whitelists.", help="Manage whitelists.", formatter_class=formatter_class)
|
||||
whitelist_subparsers = whitelist_parser.add_subparsers()
|
||||
# whitelist list command
|
||||
whitelist_list_parser = whitelist_subparsers.add_parser("list", description="List whitelist entries.", help="List whitelist entries.", formatter_class=formatter_class)
|
||||
whitelist_list_parser.add_argument("quarantine", metavar="QUARANTINE", help="Quarantine name.")
|
||||
whitelist_list_parser.add_argument("-f", "--from", dest="mailfrom", help="Filter entries by from address.", default=None, nargs="+")
|
||||
whitelist_list_parser.add_argument("-t", "--to", dest="recipients", help="Filter entries by recipient address.", default=None, nargs="+")
|
||||
whitelist_list_parser.add_argument("-o", "--older-than", dest="older_than", help="Filter e-mails by last used date (days).", default=None, type=float)
|
||||
whitelist_list_parser.set_defaults(func=list_whitelist)
|
||||
# whitelist add command
|
||||
whitelist_add_parser = whitelist_subparsers.add_parser("add", description="Add whitelist entry.", help="Add whitelist entry.", formatter_class=formatter_class)
|
||||
whitelist_add_parser.add_argument("quarantine", metavar="QUARANTINE", help="Quarantine name.")
|
||||
whitelist_add_parser.add_argument("-f", "--from", dest="mailfrom", help="From address.", required=True)
|
||||
whitelist_add_parser.add_argument("-t", "--to", dest="recipient", help="Recipient address.", required=True)
|
||||
whitelist_add_parser.add_argument("-c", "--comment", help="Comment.", default="added by CLI", required=False)
|
||||
whitelist_add_parser.add_argument("-p", "--permanent", help="Add a permanent entry.", action="store_true")
|
||||
whitelist_add_parser.add_argument("--force", help="Force adding an entry, even if already covered by another entry.", action="store_true")
|
||||
whitelist_add_parser.set_defaults(func=add_whitelist_entry)
|
||||
# whitelist delete command
|
||||
whitelist_delete_parser = whitelist_subparsers.add_parser("delete", description="Delete whitelist entry.", help="Delete whitelist entry.", formatter_class=formatter_class)
|
||||
whitelist_delete_parser.add_argument("quarantine", metavar="QUARANTINE", help="Quarantine name.")
|
||||
whitelist_delete_parser.add_argument("whitelist_id", metavar="ID", help="Whitelist ID.")
|
||||
whitelist_delete_parser.set_defaults(func=delete_whitelist_entry)
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
# setup logging
|
||||
loglevel = logging.INFO
|
||||
root_logger = logging.getLogger()
|
||||
root_logger.setLevel(loglevel)
|
||||
|
||||
# setup console log
|
||||
if args.debug:
|
||||
formatter = logging.Formatter("%(levelname)s: [%(name)s] - %(message)s")
|
||||
else:
|
||||
formatter = logging.Formatter("%(levelname)s: %(message)s")
|
||||
# stdout
|
||||
stdouthandler = logging.StreamHandler(sys.stdout)
|
||||
stdouthandler.setLevel(logging.DEBUG)
|
||||
stdouthandler.setFormatter(formatter)
|
||||
stdouthandler.addFilter(StdOutFilter())
|
||||
root_logger.addHandler(stdouthandler)
|
||||
# stderr
|
||||
stderrhandler = logging.StreamHandler(sys.stderr)
|
||||
stderrhandler.setLevel(logging.WARNING)
|
||||
stderrhandler.setFormatter(formatter)
|
||||
stderrhandler.addFilter(StdErrFilter())
|
||||
root_logger.addHandler(stderrhandler)
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# try to generate milter configs
|
||||
try:
|
||||
config = pyquarantine.generate_milter_config(config_files=args.config, configtest=True)
|
||||
except RuntimeError as e:
|
||||
logger.error(e)
|
||||
sys.exit(255)
|
||||
|
||||
if args.syslog:
|
||||
# setup syslog
|
||||
sysloghandler = logging.handlers.SysLogHandler(address="/dev/log", facility=logging.handlers.SysLogHandler.LOG_MAIL)
|
||||
sysloghandler.setLevel(loglevel)
|
||||
if args.debug:
|
||||
formatter = logging.Formatter("pyquarantine: [%(name)s] [%(levelname)s] %(message)s")
|
||||
else:
|
||||
formatter = logging.Formatter("pyquarantine: %(message)s")
|
||||
sysloghandler.setFormatter(formatter)
|
||||
root_logger.addHandler(sysloghandler)
|
||||
|
||||
# call the commands function
|
||||
try:
|
||||
args.func(config, args)
|
||||
except RuntimeError as e:
|
||||
logger.error(e)
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Reference in New Issue
Block a user