diff --git a/checks/categories.py b/checks/categories.py index e8e216116..5687ec563 100644 --- a/checks/categories.py +++ b/checks/categories.py @@ -2179,8 +2179,8 @@ def __init__(self): label="detail mail auth spf label", explanation="detail mail auth spf exp", tech_string="detail mail auth spf tech table", - worst_status=scoring.MAIL_AUTH_SPF_WORST_STATUS, - full_score=scoring.MAIL_AUTH_SPF_PASS, + worst_status=scoring.MAIL_AUTH_TLSRPT_WORST_STATUS_WORST_STATUS, + full_score=scoring.MAIL_AUTH_TLSRPT_PASS, model_score_field="spf_score", ) # Fix for one line, one value data. @@ -2250,13 +2250,13 @@ def result_bad_redirect(self, tech_data): class MailAuthTlsRptExists(Subtest): def __init__(self): super().__init__( - name="spf", + name="tlsrpt", label="detail mail auth tlsrpt label", explanation="detail mail auth tlsrpt exp", tech_string="detail mail auth tlsrpt tech table", worst_status=scoring.MAIL_AUTH_SPF_WORST_STATUS, full_score=scoring.MAIL_AUTH_SPF_PASS, - model_score_field="spf_score", + model_score_field="tlsrpt_score", ) # Fix for one line, one value data. self.tech_data = [[self.tech_data]] diff --git a/checks/scoring.py b/checks/scoring.py index e716656c8..fabe55e5e 100644 --- a/checks/scoring.py +++ b/checks/scoring.py @@ -235,6 +235,11 @@ MAIL_AUTH_SPF_ERROR = NO_POINTS MAIL_AUTH_SPF_WORST_STATUS = STATUS_FAIL +MAIL_AUTH_TLSRPT_PASS = NO_POINTS +MAIL_AUTH_TLSRPT_FAIL = NO_POINTS # TLS-RPT fail does not give a points penalty +MAIL_AUTH_TLSRPT_ERROR = NO_POINTS +MAIL_AUTH_TLSRPT_WORST_STATUS = STATUS_FAIL + MAIL_AUTH_SPF_POLICY_PASS = FULL_WEIGHT_POINTS MAIL_AUTH_SPF_POLICY_PARTIAL = LESS_WEIGHT_POINTS MAIL_AUTH_SPF_POLICY_FAIL = NO_POINTS