Skip to content

Commit

Permalink
Fixed some print language
Browse files Browse the repository at this point in the history
  • Loading branch information
jc0b committed May 26, 2024
1 parent 2ef603f commit 91c306d
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions nudge-auto-updater.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def get_config(config_file_name, is_config_specified) -> dict:
logging.info(f"Successfully loaded {config_file_name}!")
return result
except yaml.YAMLError as e:
logging.error(f"Unable to load {config_file_name}")
logging.error(f"Unable to load {config_file_name}: {e}")
sys.exit(1)
except ModuleNotFoundError as e:
# import unsuccessful
Expand Down Expand Up @@ -459,7 +459,7 @@ def check_deadline_urgent(conditions, cves_scores, cves, name, days, conjunction
return False, "", []
result1, met_cve_conditions1 = check_cve_scores(conditions, cves_scores, name, days, conjunction)
result2, met_cve_conditions2 = check_cve_numbers(conditions, cves, name, days, conjunction, result1)
s = f'CVE urgency is {name}! Installation will be required in {days} day(s).'
s = f'CVE urgency is "{name}"! Installation will be required in {days} day(s).'
if conjunction:
result = result1 and result2
else:
Expand Down Expand Up @@ -492,7 +492,7 @@ def check_cve_scores(conditions, cves, name, days, conjunction, found=False):
l.append(cves[cve][score])
l.sort(reverse=True)
if l[0] >= conditions[f"max_{score}"]:
s = f'Max {score} of {l[0]} is higher than or equal to threshold {conditions[f"max_{score}"]}.'
s = f'Max {score} of {l[0]} is greater than or equal to threshold {conditions[f"max_{score}"]}.'
met_cve_conditions.append(s)
disj = True
else:
Expand All @@ -502,7 +502,7 @@ def check_cve_scores(conditions, cves, name, days, conjunction, found=False):
for cve in cves:
l.append(cves[cve][score])
if (sum(l) / len(l)) >= conditions[f"average_{score}"]:
s = f'Average {score} of {(sum(l) / len(l))} is higher or equal to than threshold {conditions[f"average_{score}"]}.'
s = f'Average {score} of {(sum(l) / len(l))} is greater or equal to than threshold {conditions[f"average_{score}"]}.'
met_cve_conditions.append(s)
disj = True
else:
Expand All @@ -514,22 +514,22 @@ def check_cve_scores(conditions, cves, name, days, conjunction, found=False):
l.append(read_formula(formula["formula"], cve, cves[cve]))
if formula["comparison"] == "average":
if (sum(l) / len(l)) >= formula["threshold"]:
s = f'CVEs had an average score for formula {formula["formula"]} ({(sum(l) / len(l))}) higher than or equal to threshold {formula["threshold"]}.'
s = f'CVEs had an average score for formula {formula["formula"]} ({(sum(l) / len(l))}) greater than or equal to threshold {formula["threshold"]}.'
met_cve_conditions.append(s)
disj = True
else:
conj = False
if formula["comparison"] == "max":
l.sort(reverse=True)
if l[0] >= formula["threshold"]:
s = f'CVEs had an max score for formula {formula["formula"]} ({l[0]}) higher than or equal to threshold {formula["threshold"]}.'
s = f'CVEs had an max score for formula {formula["formula"]} ({l[0]}) greater than or equal to threshold {formula["threshold"]}.'
met_cve_conditions.append(s)
disj = True
else:
conj = False
if formula["comparison"] == "sum":
if sum(l) >= formula["threshold"]:
s = f'CVEs had an summed score for formula {formula["formula"]} ({sum(l)}) higher than or equal to threshold {formula["threshold"]}.'
s = f'CVEs had an summed score for formula {formula["formula"]} ({sum(l)}) greater than or equal to threshold {formula["threshold"]}.'
met_cve_conditions.append(s)
disj = True
else:
Expand All @@ -539,7 +539,7 @@ def check_cve_scores(conditions, cves, name, days, conjunction, found=False):
if len(l) >= n:
l.sort(reverse=True)
if l[n-1] >= formula["threshold"]:
s = f' At least {n} CVEs had a score for formula {formula["formula"]} higher than or equal to the threshold {formula["threshold"]}.'
s = f' At least {n} CVEs had a score for formula {formula["formula"]} greater than or equal to the threshold {formula["threshold"]}.'
met_cve_conditions.append(s)
disj = True
else:
Expand All @@ -554,21 +554,21 @@ def check_cve_numbers(conditions, cves, name, days, conjunction, found=False):
met_cve_conditions = []
if "number_CVEs" in conditions:
if len(cves) >= conditions["number_CVEs"]:
s = f'Number of CVEs ({len(cves)}) is higher than or equal to threshold {conditions["number_CVEs"]}.'
s = f'Number of CVEs ({len(cves)}) is greater than or equal to threshold {conditions["number_CVEs"]}.'
met_cve_conditions.append(s)
disj = True
else:
conj = False
if "number_actively_exploited_CVEs" in conditions:
if sum(cves.values()) >= conditions[f"number_actively_exploited_CVEs"]:
s = f'Number of actively exploited CVEs ({sum(cves.values())}) is higher than or equal to threshold {conditions["number_actively_exploited_CVEs"]}.'
s = f'Number of actively exploited CVEs ({sum(cves.values())}) is greater than or equal to threshold {conditions["number_actively_exploited_CVEs"]}.'
met_cve_conditions.append(s)
disj = True
else:
conj = False
if "fraction_actively_exploited_CVEs" in conditions:
if (sum(cves.values()) / len(cves)) >= conditions["fraction_actively_exploited_CVEs"]:
s = f'Fraction of actively exploited CVEs ({(sum(cves.values()) / len(cves))}) is higher than or equal to threshold {conditions["fraction_actively_exploited_CVEs"]}.'
s = f'Fraction of actively exploited CVEs ({(sum(cves.values()) / len(cves))}) is greater than or equal to threshold {conditions["fraction_actively_exploited_CVEs"]}.'
met_cve_conditions.append(s)
disj = True
else:
Expand Down

0 comments on commit 91c306d

Please sign in to comment.