Merge branch 'feature/key-revocation'

3 files changed, 145 insertions, 15 deletions

diff --git a/src/mailman_pgp/workflows/tests/test_base.py b/src/mailman_pgp/workflows/tests/test_base.py
index 31b3d05..3904105 100644
--- a/src/mailman_pgp/workflows/tests/test_base.py
+++ b/src/mailman_pgp/workflows/tests/test_base.py
@@ -37,8 +37,8 @@ from mailman_pgp.pgp.wrapper import PGPWrapper
 from mailman_pgp.testing.layers import PGPConfigLayer
 from mailman_pgp.testing.pgp import load_key
 from mailman_pgp.workflows.base import (PGPMixin)
-from mailman_pgp.workflows.pubkey import (ConfirmPubkeyMixin, KEY_REQUEST,
-                                          SetPubkeyMixin)
+from mailman_pgp.workflows.key_confirm import ConfirmPubkeyMixin
+from mailman_pgp.workflows.key_set import KEY_REQUEST, SetPubkeyMixin
 
 
 class PubkeyMixinTestSetup():
@@ -49,13 +49,14 @@ class PubkeyMixinTestSetup():
 
         self.list_key = load_key('ecc_p256.priv.asc')
 
-        self.pgp_list = PGPMailingList.for_list(self.mlist)
-        self.pgp_list.key = self.list_key
+        with transaction():
+            self.pgp_list = PGPMailingList.for_list(self.mlist)
+            self.pgp_list.key = self.list_key
 
         self.um = getUtility(IUserManager)
 
         self.sender_key = load_key('rsa_1024.priv.asc')
-        self.sender = self.um.create_address('rsa-1024b@example.org')
+        self.sender = self.um.create_address('anne@example.org')
 
 
 @implementer(IWorkflow)
@@ -78,13 +79,13 @@ class PGPTestWorkflow(SubscriptionBase, PGPMixin, SetPubkeyMixin,
         SubscriptionBase.__init__(self, mlist, subscriber)
         SetPubkeyMixin.__init__(self, pubkey=pubkey)
         ConfirmPubkeyMixin.__init__(self, pre_confirmed=pubkey_pre_confirmed)
-        PGPMixin.__init__(self)
+        PGPMixin.__init__(self, mlist)
 
     def _step_prepare(self):
         self.push('do_subscription')
         self.push('pubkey_confirmation')
         self.push('pubkey_checks')
-        self.push('pgp_prepare')
+        self.push('create_address')
         self.push('sanity_checks')
 
 
@@ -93,7 +94,7 @@ class TestPGPMixin(PubkeyMixinTestSetup, unittest.TestCase):
 
     def test_create_address(self):
         workflow = PGPTestWorkflow(self.mlist, self.sender)
-        workflow.run_thru('pgp_prepare')
+        workflow.run_thru('create_address')
         pgp_address = PGPAddress.for_address(self.sender)
         self.assertIsNotNone(pgp_address)
 
@@ -102,7 +103,7 @@ class TestPGPMixin(PubkeyMixinTestSetup, unittest.TestCase):
         with transaction() as t:
             pgp_address = PGPAddress(self.sender)
             t.add(pgp_address)
-        workflow.run_thru('pgp_prepare')
+        workflow.run_thru('create_address')
         still = PGPAddress.for_address(self.sender)
         self.assertIsNotNone(still)
 
@@ -203,7 +204,7 @@ class TestBothPubkeyMixins(PubkeyMixinTestSetup, unittest.TestCase):
         self.assertIsNotNone(workflow.token)
         pendable = getUtility(IPendings).confirm(workflow.token, expunge=False)
         self.assertEqual(pendable['list_id'], 'test.example.com')
-        self.assertEqual(pendable['email'], 'rsa-1024b@example.org')
+        self.assertEqual(pendable['email'], 'anne@example.org')
         self.assertEqual(pendable['display_name'], '')
         self.assertEqual(pendable['when'], '2005-08-01T07:49:23')
         self.assertEqual(pendable['token_owner'], 'subscriber')
@@ -216,7 +217,7 @@ class TestBothPubkeyMixins(PubkeyMixinTestSetup, unittest.TestCase):
         self.assertIsNotNone(workflow.token)
         pendable = getUtility(IPendings).confirm(workflow.token, expunge=False)
         self.assertEqual(pendable['list_id'], 'test.example.com')
-        self.assertEqual(pendable['email'], 'rsa-1024b@example.org')
+        self.assertEqual(pendable['email'], 'anne@example.org')
         self.assertEqual(pendable['display_name'], '')
         self.assertEqual(pendable['when'], '2005-08-01T07:49:23')
         self.assertEqual(pendable['token_owner'], 'subscriber')
diff --git a/src/mailman_pgp/workflows/tests/test_key_change.py b/src/mailman_pgp/workflows/tests/test_key_change.py
index e469d51..5d4926a 100644
--- a/src/mailman_pgp/workflows/tests/test_key_change.py
+++ b/src/mailman_pgp/workflows/tests/test_key_change.py
@@ -25,13 +25,15 @@ from mailman.interfaces.usermanager import IUserManager
 from mailman.testing.helpers import get_queue_messages
 from zope.component import getUtility
 
+from mailman_pgp.config import mm_config
 from mailman_pgp.database import mm_transaction, transaction
 from mailman_pgp.model.address import PGPAddress
 from mailman_pgp.model.list import PGPMailingList
 from mailman_pgp.pgp.wrapper import PGPWrapper
 from mailman_pgp.testing.layers import PGPConfigLayer
 from mailman_pgp.testing.pgp import load_key
-from mailman_pgp.workflows.key_change import KeyChangeWorkflow
+from mailman_pgp.workflows.key_change import (KeyChangeModWorkflow,
+                                              KeyChangeWorkflow)
 
 
 class TestKeyChangeWorkflow(unittest.TestCase):
@@ -41,13 +43,18 @@ class TestKeyChangeWorkflow(unittest.TestCase):
         with mm_transaction():
             self.mlist = create_list('test@example.com',
                                      style_name='pgp-default')
-        self.pgp_list = PGPMailingList.for_list(self.mlist)
-        self.pgp_list.key = load_key('ecc_p256.priv.asc')
+        with transaction():
+            self.pgp_list = PGPMailingList.for_list(self.mlist)
+            self.pgp_list.key = load_key('ecc_p256.priv.asc')
 
         self.sender_key = load_key('rsa_1024.priv.asc')
         self.sender_new_key = load_key('ecc_p256.priv.asc')
         self.sender = getUtility(IUserManager).create_address(
-                'rsa-1024b@example.org')
+                'anne@example.org')
+
+    def test_has_workflows(self):
+        self.assertTrue(KeyChangeWorkflow.name, mm_config.workflows)
+        self.assertTrue(KeyChangeModWorkflow.name, mm_config.workflows)
 
     def test_pgp_address_none(self):
         workflow = KeyChangeWorkflow(self.mlist)
@@ -101,3 +108,19 @@ class TestKeyChangeWorkflow(unittest.TestCase):
         self.assertEqual(pgp_address.key_fingerprint,
                          self.sender_new_key.fingerprint)
         self.assertTrue(pgp_address.key_confirmed)
+
+    def test_confirm_mod(self):
+        with transaction() as t:
+            pgp_address = PGPAddress(self.sender)
+            pgp_address.key = self.sender_key.pubkey
+            pgp_address.key_confirmed = True
+            t.add(pgp_address)
+
+        workflow = KeyChangeModWorkflow(self.mlist, pgp_address,
+                                        self.sender_new_key.pubkey)
+        list(workflow)
+
+        token, token_owner, member = ISubscriptionManager(self.mlist).confirm(
+                workflow.token)
+        self.assertIsNotNone(token)
+        self.assertEqual(token_owner, TokenOwner.moderator)
diff --git a/src/mailman_pgp/workflows/tests/test_mod_approval.py b/src/mailman_pgp/workflows/tests/test_mod_approval.py
new file mode 100644
index 0000000..7d57a9b
--- /dev/null
+++ b/src/mailman_pgp/workflows/tests/test_mod_approval.py
@@ -0,0 +1,106 @@
+# Copyright (C) 2017 Jan Jancar
+#
+# This file is a part of the Mailman PGP plugin.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see <http://www.gnu.org/licenses/>.
+
+""""""
+from unittest import TestCase
+
+from mailman.app.lifecycle import create_list
+from mailman.interfaces.subscriptions import TokenOwner
+from mailman.interfaces.usermanager import IUserManager
+from mailman.interfaces.workflows import IWorkflow
+from mailman.testing.helpers import get_queue_messages
+from zope.component import getUtility
+from zope.interface import implementer
+
+from mailman_pgp.database import mm_transaction, transaction
+from mailman_pgp.model.address import PGPAddress
+from mailman_pgp.model.list import PGPMailingList
+from mailman_pgp.pgp.wrapper import PGPWrapper
+from mailman_pgp.testing.layers import PGPConfigLayer
+from mailman_pgp.testing.pgp import load_key
+from mailman_pgp.workflows.key_change import KeyChangeBase
+from mailman_pgp.workflows.mod_approval import (
+    ModeratorKeyChangeApprovalMixin)
+
+
+@implementer(IWorkflow)
+class PGPTestWorkflow(KeyChangeBase, ModeratorKeyChangeApprovalMixin):
+    name = 'test-workflow'
+    description = ''
+    initial_state = 'mod_approval'
+    save_attributes = (
+        'approved',
+    )
+
+    def __init__(self, mlist, pgp_address=None, pubkey=None,
+                 pre_approved=False):
+        KeyChangeBase.__init__(self, mlist, pgp_address, pubkey)
+        ModeratorKeyChangeApprovalMixin.__init__(self, pre_approved)
+
+
+class TestModeratorApprovalMixin(TestCase):
+    layer = PGPConfigLayer
+
+    def setUp(self):
+        with mm_transaction():
+            self.mlist = create_list('test@example.com',
+                                     style_name='pgp-default')
+        with transaction():
+            self.pgp_list = PGPMailingList.for_list(self.mlist)
+            self.pgp_list.key = load_key('ecc_p256.priv.asc')
+
+        self.sender_key = load_key('rsa_1024.priv.asc')
+        self.sender_new_key = load_key('ecc_p256.priv.asc')
+        self.sender = getUtility(IUserManager).create_address(
+                'anne@example.org')
+
+    def test_get_approval(self):
+        with transaction() as t:
+            pgp_address = PGPAddress(self.sender)
+            pgp_address.key = self.sender_key.pubkey
+            pgp_address.key_confirmed = True
+            t.add(pgp_address)
+
+        workflow = PGPTestWorkflow(self.mlist, pgp_address,
+                                   self.sender_new_key.pubkey)
+        list(workflow)
+        items = get_queue_messages('virgin', expected_count=1)
+        message = items[0].msg
+
+        self.assertEqual(message['Subject'],
+                         'New key change request from {}'.format(
+                                 pgp_address.email))
+        wrapped = PGPWrapper(message)
+        self.assertTrue(wrapped.has_keys())
+        keys = list(wrapped.keys())
+        self.assertEqual(len(keys), 1)
+        key = keys.pop()
+        self.assertEqual(key.fingerprint, self.sender_new_key.fingerprint)
+
+    def test_receive_approval(self):
+        with transaction() as t:
+            pgp_address = PGPAddress(self.sender)
+            pgp_address.key = self.sender_key.pubkey
+            pgp_address.key_confirmed = True
+            t.add(pgp_address)
+
+        workflow = PGPTestWorkflow(self.mlist, pgp_address,
+                                   self.sender_new_key.pubkey)
+        list(workflow)
+        get_queue_messages('virgin', expected_count=1)
+        list(workflow)
+        self.assertEqual(workflow.token_owner, TokenOwner.no_one)