Record DMARC report errors, allow additional options for DKIM policy override.

This commit is contained in:
David Baer
2020-01-23 12:50:28 -05:00
parent 00a988744e
commit 9491d5d25d
3 changed files with 21 additions and 9 deletions

View File

@@ -24,9 +24,19 @@ def init_model():
Alignment = Enum('r', 's', name='alignment')
Disposition = Enum('none', 'quarantine', 'reject', name='disposition')
DMARCResult = Enum('pass', 'fail', name='dmarc_result')
PolicyOverride = Enum('forwarded', 'sampled_out', 'trusted_forwarder', 'other', name='policy_override')
SPFResultType = Enum('none', 'neutral', 'pass', 'fail', 'softfail', 'temperror', 'permerror', name='spf_result')
DKIMResultType = Enum('none', 'pass', 'fail', 'policy', 'neutral', 'temperror', 'permerror', name='dkim_result')
PolicyOverride = Enum(
'forwarded', 'sampled_out', 'trusted_forwarder',
'mailing_list', 'local_policy', 'other',
name='policy_override'
)
SPFResultType = Enum(
'none', 'neutral', 'pass', 'fail', 'softfail', 'temperror', 'permerror',
name='spf_result'
)
DKIMResultType = Enum(
'none', 'pass', 'fail', 'policy', 'neutral', 'temperror', 'permerror',
name='dkim_result'
)
class INET(satypes.TypeDecorator):
impl = satypes.CHAR
@@ -59,6 +69,8 @@ class ReportError(DeclarativeBase):
report_id = Column(Integer, ForeignKey(Report.id, onupdate='CASCADE', ondelete='CASCADE'), nullable=False)
error = Column(String, nullable=False)
report = relationship(Report, backref='errors')
class ReportRecord(DeclarativeBase):
__tablename__ = 'report_records'
id = Column(Integer, primary_key=True)
@@ -87,6 +99,7 @@ class DKIMResult(DeclarativeBase):
id = Column(Integer, primary_key=True)
record_id = Column(Integer, ForeignKey(ReportRecord.id, onupdate='CASCADE', ondelete='CASCADE'), nullable=False)
domain = Column(String, nullable=False)
selector = Column(String, nullable=True)
result = Column(DKIMResultType, nullable=False)
human_result = Column(String, nullable=True)