diff options
Diffstat (limited to 'src/mailman_pgp/workflows/subscription.py')
| -rw-r--r-- | src/mailman_pgp/workflows/subscription.py | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/mailman_pgp/workflows/subscription.py b/src/mailman_pgp/workflows/subscription.py index c4138e6..ce02013 100644 --- a/src/mailman_pgp/workflows/subscription.py +++ b/src/mailman_pgp/workflows/subscription.py @@ -24,13 +24,15 @@ from mailman.workflows.common import (ConfirmationMixin, ModerationMixin, from public import public from zope.interface import implementer -from mailman_pgp.workflows.base import ConfirmPubkeyMixin, SetPubkeyMixin +from mailman_pgp.workflows.base import (ConfirmPubkeyMixin, PGPMixin, + SetPubkeyMixin) @public @implementer(ISubscriptionWorkflow) class OpenSubscriptionPolicy(SubscriptionBase, VerificationMixin, - SetPubkeyMixin, ConfirmPubkeyMixin): + SetPubkeyMixin, ConfirmPubkeyMixin, + PGPMixin): """""" name = 'pgp-policy-open' @@ -54,11 +56,13 @@ class OpenSubscriptionPolicy(SubscriptionBase, VerificationMixin, VerificationMixin.__init__(self, pre_verified=pre_verified) SetPubkeyMixin.__init__(self, pubkey=pubkey) ConfirmPubkeyMixin.__init__(self, pre_confirmed=pubkey_pre_confirmed) + PGPMixin.__init__(self) def _step_prepare(self): self.push('do_subscription') self.push('pubkey_confirmation') self.push('pubkey_checks') + self.push('pgp_prepare') self.push('verification_checks') self.push('sanity_checks') @@ -67,7 +71,7 @@ class OpenSubscriptionPolicy(SubscriptionBase, VerificationMixin, @implementer(ISubscriptionWorkflow) class ConfirmSubscriptionPolicy(SubscriptionBase, VerificationMixin, ConfirmationMixin, SetPubkeyMixin, - ConfirmPubkeyMixin): + ConfirmPubkeyMixin, PGPMixin): """""" name = 'pgp-policy-confirm' @@ -93,11 +97,13 @@ class ConfirmSubscriptionPolicy(SubscriptionBase, VerificationMixin, ConfirmationMixin.__init__(self, pre_confirmed=pre_confirmed) SetPubkeyMixin.__init__(self, pubkey=pubkey) ConfirmPubkeyMixin.__init__(self, pre_confirmed=pubkey_pre_confirmed) + PGPMixin.__init__(self) def _step_prepare(self): self.push('do_subscription') self.push('pubkey_confirmation') self.push('pubkey_checks') + self.push('pgp_prepare') self.push('confirmation_checks') self.push('verification_checks') self.push('sanity_checks') @@ -107,7 +113,7 @@ class ConfirmSubscriptionPolicy(SubscriptionBase, VerificationMixin, @implementer(ISubscriptionWorkflow) class ModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin, ModerationMixin, SetPubkeyMixin, - ConfirmPubkeyMixin): + ConfirmPubkeyMixin, PGPMixin): """""" name = 'pgp-policy-moderate' @@ -133,12 +139,14 @@ class ModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin, ModerationMixin.__init__(self, pre_approved=pre_approved) SetPubkeyMixin.__init__(self, pubkey=pubkey) ConfirmPubkeyMixin.__init__(self, pre_confirmed=pubkey_pre_confirmed) + PGPMixin.__init__(self) def _step_prepare(self): self.push('do_subscription') self.push('moderation_checks') self.push('pubkey_confirmation') self.push('pubkey_checks') + self.push('pgp_prepare') self.push('verification_checks') self.push('sanity_checks') @@ -147,7 +155,8 @@ class ModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin, @implementer(ISubscriptionWorkflow) class ConfirmModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin, ConfirmationMixin, ModerationMixin, - SetPubkeyMixin, ConfirmPubkeyMixin): + SetPubkeyMixin, ConfirmPubkeyMixin, + PGPMixin): """""" name = 'pgp-policy-confirm-moderate' @@ -175,12 +184,14 @@ class ConfirmModerationSubscriptionPolicy(SubscriptionBase, VerificationMixin, ModerationMixin.__init__(self, pre_approved=pre_approved) SetPubkeyMixin.__init__(self, pubkey=pubkey) ConfirmPubkeyMixin.__init__(self, pre_confirmed=pubkey_pre_confirmed) + PGPMixin.__init__(self) def _step_prepare(self): self.push('do_subscription') self.push('moderation_checks') self.push('pubkey_confirmation') self.push('pubkey_checks') + self.push('pgp_prepare') self.push('confirmation_checks') self.push('verification_checks') self.push('sanity_checks') |