1 files changed, 32 insertions, 10 deletions
diff --git a/src/mailman_pgp/workflows/key_change.py b/src/mailman_pgp/workflows/key_change.py
index 290e504..2ef82a8 100644
--- a/src/mailman_pgp/workflows/key_change.py
+++ b/src/mailman_pgp/workflows/key_change.py
@@ -32,6 +32,7 @@ from mailman_pgp.model.address import PGPAddress
 from mailman_pgp.model.list import PGPMailingList
 from mailman_pgp.pgp.wrapper import PGPWrapper
 from mailman_pgp.utils.email import copy_headers
+from mailman_pgp.workflows.mod_approval import ModeratorApprovalMixin
 
 CHANGE_CONFIRM_REQUEST = """\
 ----------
@@ -46,12 +47,7 @@ Token: {}
 """
 
 
-@public
-@implementer(IWorkflow)
-class KeyChangeWorkflow(Workflow):
-    name = 'pgp-key-change-workflow'
-    description = ''
-    initial_state = 'change_key'
+class KeyChangeBase(Workflow):
     save_attributes = (
         'address_key',
         'pubkey_key'
@@ -116,16 +112,17 @@ class KeyChangeWorkflow(Workflow):
         raise StopIteration
 
     def _step_receive_confirmation(self):
-        with transaction():
-            self.pgp_address.key = self.pubkey
-            self.pgp_address.key_confirmed = True
-
         pendings = getUtility(IPendings)
         if self.token is not None:
             pendings.confirm(self.token)
             self.token = None
             self.token_owner = TokenOwner.no_one
 
+    def _step_do_change(self):
+        with transaction():
+            self.pgp_address.key = self.pubkey
+            self.pgp_address.key_confirmed = True
+
     @classmethod
     def pendable_class(cls):
         @implementer(IPendable)
@@ -133,3 +130,28 @@ class KeyChangeWorkflow(Workflow):
             PEND_TYPE = KeyChangeWorkflow.name
 
         return Pendable
+
+
+@public
+@implementer(IWorkflow)
+class KeyChangeWorkflow(KeyChangeBase):
+    name = 'pgp-key-change-workflow'
+    description = ''
+    initial_state = 'prepare'
+
+    def _step_prepare(self):
+        self.push('do_change')
+        self.push('change_key')
+
+
+@public
+@implementer(IWorkflow)
+class KeyChangeModWorkflow(KeyChangeBase, ModeratorApprovalMixin):
+    name = 'pgp-key-change-mod-workflow'
+    description = ''
+    initial_state = 'prepare'
+
+    def _step_prepare(self):
+        self.push('do_change')
+        self.push('mod_approval')
+        self.push('change_key')