Skip to content

updates process_reports to respect newly added prettify_json option #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 2, 2025
Merged

updates process_reports to respect newly added prettify_json option #617

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c67e0d
updates process_reports to respect newly added prettify_json option
macmandr197 Oct 8, 2025
d877beb
removes duplicate definition
macmandr197 Oct 10, 2025
6d41f0d
removes redundant option
macmandr197 Oct 28, 2025
69db637
fixes typo
macmandr197 Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions parsedmarc/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ def _main():
"""Called when the module is executed"""

def process_reports(reports_):
output_str = "{0}\n".format(json.dumps(reports_, ensure_ascii=False, indent=2))
indent_value = 2 if opts.prettify_json else None
output_str = "{0}\n".format(json.dumps(reports_, ensure_ascii=False, indent=indent_value))

if not opts.silent:
print(output_str)
Expand Down Expand Up @@ -189,8 +190,9 @@ def process_reports(reports_):

try:
if opts.webhook_aggregate_url:
indent_value = 2 if opts.prettify_json else None
webhook_client.save_aggregate_report_to_webhook(
json.dumps(report, ensure_ascii=False, indent=2)
json.dumps(report, ensure_ascii=False, indent=indent_value)
)
except Exception as error_:
logger.error("Webhook Error: {0}".format(error_.__str__()))
Expand Down Expand Up @@ -271,8 +273,9 @@ def process_reports(reports_):

try:
if opts.webhook_forensic_url:
indent_value = 2 if opts.prettify_json else None
webhook_client.save_forensic_report_to_webhook(
json.dumps(report, ensure_ascii=False, indent=2)
json.dumps(report, ensure_ascii=False, indent=indent_value)
)
except Exception as error_:
logger.error("Webhook Error: {0}".format(error_.__str__()))
Expand Down Expand Up @@ -353,8 +356,9 @@ def process_reports(reports_):

try:
if opts.webhook_smtp_tls_url:
indent_value = 2 if opts.prettify_json else None
webhook_client.save_smtp_tls_report_to_webhook(
json.dumps(report, ensure_ascii=False, indent=2)
json.dumps(report, ensure_ascii=False, indent=indent_value)
)
except Exception as error_:
logger.error("Webhook Error: {0}".format(error_.__str__()))
Expand Down Expand Up @@ -475,6 +479,12 @@ def process_reports(reports_):
"--debug", action="store_true", help="print debugging information"
)
arg_parser.add_argument("--log-file", default=None, help="output logging to a file")
arg_parser.add_argument(
"--no-prettify-json",
action="store_false",
dest="prettify_json",
help="output JSON in a single line without indentation"
)
arg_parser.add_argument("-v", "--version", action="version", version=__version__)

aggregate_reports = []
Expand Down Expand Up @@ -504,6 +514,7 @@ def process_reports(reports_):
dns_timeout=args.dns_timeout,
debug=args.debug,
verbose=args.verbose,
prettify_json=args.prettify_json,
save_aggregate=False,
save_forensic=False,
save_smtp_tls=False,
Expand Down Expand Up @@ -614,7 +625,7 @@ def process_reports(reports_):
webhook_aggregate_url=None,
webhook_forensic_url=None,
webhook_smtp_tls_url=None,
webhook_timeout=60,
webhook_timeout=60
)
args = arg_parser.parse_args()

Expand Down Expand Up @@ -701,6 +712,8 @@ def process_reports(reports_):
opts.reverse_dns_map_path = general_config["reverse_dns_path"]
if "reverse_dns_map_url" in general_config:
opts.reverse_dns_map_url = general_config["reverse_dns_url"]
if "prettify_json" in general_config:
opts.prettify_json = general_config.getboolean("prettify_json")

if "mailbox" in config.sections():
mailbox_config = config["mailbox"]
Expand Down