Merge branch 'dmarc' of gitlab.com:msapiro/mailman into dmarc

2 files changed, 12 insertions, 5 deletions

diff --git a/src/mailman/model/mailinglist.py b/src/mailman/model/mailinglist.py
index eec58ad04..1a97d6506 100644
--- a/src/mailman/model/mailinglist.py
+++ b/src/mailman/model/mailinglist.py
@@ -33,9 +33,9 @@ from mailman.interfaces.digests import DigestFrequency
 from mailman.interfaces.domain import IDomainManager
 from mailman.interfaces.languages import ILanguageManager
 from mailman.interfaces.mailinglist import (
-    IAcceptableAlias, IAcceptableAliasSet, IHeaderMatch, IHeaderMatchList,
-    IListArchiver, IListArchiverSet, IMailingList, Personalization,
-    ReplyToMunging, SubscriptionPolicy)
+    DMARCModerationAction, FromIsList, IAcceptableAlias, IAcceptableAliasSet,
+    IHeaderMatch, IHeaderMatchList, IListArchiver, IListArchiverSet,
+    IMailingList, Personalization, ReplyToMunging, SubscriptionPolicy)
 from mailman.interfaces.member import (
     AlreadySubscribedError, MemberRole, MissingPreferredAddressError,
     SubscriptionEvent)
@@ -127,6 +127,13 @@ class MailingList(Model):
     forward_unrecognized_bounces_to = Column(
         Enum(UnrecognizedBounceDisposition))
     process_bounces = Column(Boolean)
+    # DMARC
+    dmarc_moderation_action = Column(Enum(DMARCModerationAction))
+    dmarc_quarantine_moderation_action = Column(Boolean)
+    dmarc_none_moderation_action = Column(Boolean)
+    dmarc_moderation_notice = Column(SAUnicode)
+    dmarc_wrapped_message_text = Column(SAUnicode)
+    from_is_list = Column(Enum(FromIsList))
     # Miscellaneous
     default_member_action = Column(Enum(Action))
     default_nonmember_action = Column(Enum(Action))
diff --git a/src/mailman/model/pending.py b/src/mailman/model/pending.py
index 7e7f0b2eb..3df28af06 100644
--- a/src/mailman/model/pending.py
+++ b/src/mailman/model/pending.py
@@ -24,7 +24,7 @@ from mailman import public
 from mailman.config import config
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
-from mailman.database.types import SAUnicode
+from mailman.database.types import SAUnicode, SAUnicodeLarge
 from mailman.interfaces.pending import (
     IPendable, IPended, IPendedKeyValue, IPendings)
 from mailman.utilities.datetime import now
@@ -47,7 +47,7 @@ class PendedKeyValue(Model):
 
     id = Column(Integer, primary_key=True)
     key = Column(SAUnicode, index=True)
-    value = Column(SAUnicode, index=True)
+    value = Column(SAUnicodeLarge, index=True)
     pended_id = Column(Integer, ForeignKey('pended.id'), index=True)
 
     def __init__(self, key, value):