From 61511d9e5c366f882939ddf78413b8a5f8a59941 Mon Sep 17 00:00:00 2001 From: Roberto Polli Date: Tue, 14 Nov 2023 19:33:27 +0100 Subject: [PATCH] Fix #15, #16. No duplicate safety version. Pre-commit. --- parse_scripts/bandit.py | 7 +++---- parse_scripts/safety.py | 13 ++++++------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/parse_scripts/bandit.py b/parse_scripts/bandit.py index 4994d11..3591267 100644 --- a/parse_scripts/bandit.py +++ b/parse_scripts/bandit.py @@ -1,3 +1,4 @@ +import ast import json from datetime import datetime, timezone from os import environ @@ -36,18 +37,16 @@ def bandit_annotation(result): def bandit_error(error): - from ast import parse - title = "Error processing file (not a python file?)" start_line, end_line = 1, 1 message = error["reason"] try: - parse(Path(error["filename"]).read_text()) + ast.parse(Path(error["filename"]).read_text()) except SyntaxError as e: title = "invalid syntax" end_line = start_line = e.lineno message = e.msg - except Exception as e: # nosec - I really want to ignore further exceptions here. + except Exception: # nosec - I really want to ignore further exceptions here. # Use default error values pass diff --git a/parse_scripts/safety.py b/parse_scripts/safety.py index b524443..7341776 100644 --- a/parse_scripts/safety.py +++ b/parse_scripts/safety.py @@ -43,17 +43,16 @@ def vulnerabilities_to_annotations(data): def statistics(data): stats = { + "OS_TYPE": data["telemetry"]["os_type"], + "PACKAGES_FOUND": data["packages_found"], + "PYTHON_VERSION": data["telemetry"]["python_version"], + "REMEDIATIONS_RECOMMENDED": data["remediations_recommended"], + "SAFETY_COMMAND": data["telemetry"]["safety_command"], + "SAFETY_VERSION": data["telemetry"]["safety_version"] or data["safety_version"], "SCANNED": data["scanned"], - "SAFETY_VERSION": data["safety_version"], "TIMESTAP": data["timestamp"], - "PACKAGES_FOUND": data["packages_found"], "VULNERABILITIES_FOUND": data["vulnerabilities_found"], "VULNERABILITIES_IGNORED": data["vulnerabilities_ignored"], - "REMEDIATIONS_RECOMMENDED": data["remediations_recommended"], - "OS_TYPE": data["telemetry"]["os_type"], - "PYTHON_VERSION": data["telemetry"]["python_version"], - "SAFETY_COMMAND": data["telemetry"]["safety_command"], - "SAFETY_VERSION": data["telemetry"]["safety_version"], } return stats