amorfo77/parsedmarc
1
0
Fork 0
mirror of https://github.com/domainaware/parsedmarc.git synced 2026-07-10 18:55:09 +00:00
Code Issues Projects Releases Wiki Activity

* added output_{json,csv}_{aggregate,forensic}_file command line args

Browse Source 
* refactored save_output() to support output_*
This commit is contained in:
atanas argirov
2020-12-28 15:57:32 +00:00
parent 3f1e25e315
commit 83e229aeb1
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parsedmarc/__init__.py
+9 -5
View File
@@ -1235,7 +1235,11 @@ def watch_inbox(host, username, password, callback, port=None, ssl=True,
logger.warning("IMAP connection timeout. Reconnecting...")
def save_output(results, output_directory="output"):
def save_output(results, output_directory="output", \
output_json_aggregate_file="aggregate.json", \
output_json_forensic_file="forensic.json", \
output_csv_aggregate_file="aggregate.csv", \
output_csv_forensic_file="forensic.csv"):
"""
Save report data in the given directory
@@ -1253,22 +1257,22 @@ def save_output(results, output_directory="output"):
else:
os.makedirs(output_directory)
with open("{0}".format(os.path.join(output_directory, "aggregate.json")),
with open("{0}".format(os.path.join(output_directory, output_json_aggregate_file)),
"w", newline="\n", encoding="utf-8") as agg_json:
agg_json.write(json.dumps(aggregate_reports, ensure_ascii=False,
indent=2))
with open("{0}".format(os.path.join(output_directory, "aggregate.csv")),
with open("{0}".format(os.path.join(output_directory, output_csv_aggregate_file)),
"w", newline="\n", encoding="utf-8") as agg_csv:
csv = parsed_aggregate_reports_to_csv(aggregate_reports)
agg_csv.write(csv)
with open("{0}".format(os.path.join(output_directory, "forensic.json")),
with open("{0}".format(os.path.join(output_directory, output_json_forensic_file)),
"w", newline="\n", encoding="utf-8") as for_json:
for_json.write(json.dumps(forensic_reports, ensure_ascii=False,
indent=2))
with open("{0}".format(os.path.join(output_directory, "forensic.csv")),
with open("{0}".format(os.path.join(output_directory, output_csv_forensic_file)),
"w", newline="\n", encoding="utf-8") as for_csv:
csv = parsed_forensic_reports_to_csv(forensic_reports)
for_csv.write(csv)
parsedmarc/cli.py
+13 -1
View File
@@ -82,7 +82,7 @@ def _main():
if opts.save_aggregate:
for report in reports_["aggregate_reports"]:
try:
if opts.elasticsearch_hosts:
opts.elasticsearch_hosts:
shards = opts.elasticsearch_number_of_shards
replicas = opts.elasticsearch_number_of_replicas
elastic.save_aggregate_report_to_elasticsearch(
@@ -160,6 +160,14 @@ def _main():
help=strip_attachment_help, action="store_true")
arg_parser.add_argument("-o", "--output",
help="write output files to the given directory")
arg_parser.add_argument("--output-json-aggregate-file",
help="output aggregate JSON file")
arg_parser.add_argument("--output-json-forensic-file",
help="output forensic JSON file")
arg_parser.add_argument("--output-csv-aggregate-file",
help="output aggregate CSV file")
arg_parser.add_argument("--output-csv-forensic-file",
help="output forensic CSV file")
arg_parser.add_argument("-n", "--nameservers", nargs="+",
help="nameservers to query")
arg_parser.add_argument("-t", "--dns_timeout",
@@ -188,6 +196,10 @@ def _main():
offline=args.offline,
strip_attachment_payloads=args.strip_attachment_payloads,
output=args.output,
output_json_aggregate_file=args.output_json_aggregate_file,
output_json_forensic_file=args.output_json_forensic_file,
output_csv_aggregate_file=args.output_csv_aggregate_file,
output_csv_forensic_file=args.output_csv_forensic_file,
nameservers=args.nameservers,
silent=args.silent,
dns_timeout=args.dns_timeout,