3 files changed, 108 insertions, 2 deletions

diff --git a/src/mailman_pgp/commands/eml_key.py b/src/mailman_pgp/commands/eml_key.py
index 9a64fc7..2bc00c7 100644
--- a/src/mailman_pgp/commands/eml_key.py
+++ b/src/mailman_pgp/commands/eml_key.py
@@ -253,6 +253,16 @@ def _cmd_change(pgp_list, mlist, msg, msgdata, arguments, results):
 
 
 def _cmd_revoke(pgp_list, mlist, msg, msgdata, arguments, results):
+    """
+    `key revoke` command.
+
+    Used when a user has to revoke a part of a key used for a `PGPAddress`.
+
+     * This command message CAN be encrypted to the list key, in which case it
+     will be decrypted.
+     * This command message MUST have at least one revocation certificate
+     attached.
+    """
     if len(arguments) != 1:
         print('Extraneous argument/s: ' + ','.join(arguments[1:]),
               file=results)
@@ -260,7 +270,7 @@ def _cmd_revoke(pgp_list, mlist, msg, msgdata, arguments, results):
 
     email = get_email(msg)
     if not email:
-        print('No email to change key of.', file=results)
+        print('No email to revoke key of.', file=results)
         return ContinueProcessing.no
 
     pgp_address = PGPAddress.for_email(email)
diff --git a/src/mailman_pgp/commands/tests/test_key.py b/src/mailman_pgp/commands/tests/test_key.py
index d89c43d..900af7b 100644
--- a/src/mailman_pgp/commands/tests/test_key.py
+++ b/src/mailman_pgp/commands/tests/test_key.py
@@ -872,6 +872,102 @@ class TestAfterSubscription(unittest.TestCase):
                 'Need a key which can be used to encrypt communications.',
                 results_msg.get_payload())
 
+    def test_revoke_extra_arg(self):
+        message = _create_plain('bart@example.com', 'test@example.com',
+                                'key revoke extra arguments', '')
+        mm_config.switchboards['command'].enqueue(message,
+                                                  listid='test.example.com')
+        make_testable_runner(CommandRunner, 'command').run()
+
+        items = get_queue_messages('virgin', expected_count=1)
+        results_msg = items[0].msg
+
+        self.assertIn('Extraneous argument/s: extra,arguments',
+                      results_msg.get_payload())
+
+    def test_revoke_no_email(self):
+        message = _create_mixed('', 'test@example.com', 'key revoke')
+
+        mm_config.switchboards['command'].enqueue(message,
+                                                  listid='test.example.com')
+        make_testable_runner(CommandRunner, 'command').run()
+        items = get_queue_messages('virgin', expected_count=1)
+        results_msg = items[0].msg
+
+        self.assertIn('No email to revoke key of.', results_msg.get_payload())
+
+    def test_revoke_no_pgp_address(self):
+        message = _create_mixed('bart@example.com', 'test@example.com',
+                                'key revoke')
+
+        mm_config.switchboards['command'].enqueue(message,
+                                                  listid='test.example.com')
+        make_testable_runner(CommandRunner, 'command').run()
+        items = get_queue_messages('virgin', expected_count=1)
+        results_msg = items[0].msg
+
+        self.assertIn('A pgp enabled address not found.',
+                      results_msg.get_payload())
+
+    def test_revoke_no_key_set(self):
+        bart = getUtility(IUserManager).create_address('bart@example.com',
+                                                       'Bart Person')
+        with transaction() as t:
+            pgp_address = PGPAddress(bart)
+            t.add(pgp_address)
+
+        message = _create_mixed('bart@example.com', 'test@example.com',
+                                'key revoke')
+
+        mm_config.switchboards['command'].enqueue(message,
+                                                  listid='test.example.com')
+        make_testable_runner(CommandRunner, 'command').run()
+        items = get_queue_messages('virgin', expected_count=1)
+        results_msg = items[0].msg
+
+        self.assertIn("You currently don't have a key set.",
+                      results_msg.get_payload())
+
+    def test_revoke_key_not_confirmed(self):
+        bart = getUtility(IUserManager).create_address('bart@example.com',
+                                                       'Bart Person')
+        with transaction() as t:
+            pgp_address = PGPAddress(bart)
+            pgp_address.key = self.bart_key.pubkey
+            t.add(pgp_address)
+
+        message = _create_mixed('bart@example.com', 'test@example.com',
+                                'key revoke')
+
+        mm_config.switchboards['command'].enqueue(message,
+                                                  listid='test.example.com')
+        make_testable_runner(CommandRunner, 'command').run()
+        items = get_queue_messages('virgin', expected_count=1)
+        results_msg = items[0].msg
+
+        self.assertIn('Your key is currently not confirmed.',
+                      results_msg.get_payload())
+
+    def test_revoke_no_revocs(self):
+        bart = getUtility(IUserManager).create_address('bart@example.com',
+                                                       'Bart Person')
+        with transaction() as t:
+            pgp_address = PGPAddress(bart)
+            pgp_address.key = self.bart_key.pubkey
+            pgp_address.key_confirmed = True
+            t.add(pgp_address)
+
+        message = _create_plain('bart@example.com', 'test@example.com',
+                                'key revoke', '')
+        mm_config.switchboards['command'].enqueue(message,
+                                                  listid='test.example.com')
+        make_testable_runner(CommandRunner, 'command').run()
+        items = get_queue_messages('virgin', expected_count=1)
+        results_msg = items[0].msg
+
+        self.assertIn('No key revocations attached? Send a key revocation.',
+                      results_msg.get_payload())
+
     def test_revoke_resets(self):
         bart = getUtility(IUserManager).create_address('bart@example.com',
                                                        'Bart Person')
diff --git a/src/mailman_pgp/pgp/mime.py b/src/mailman_pgp/pgp/mime.py
index 837e619..03177ab 100644
--- a/src/mailman_pgp/pgp/mime.py
+++ b/src/mailman_pgp/pgp/mime.py
@@ -63,7 +63,7 @@ class MIMEWrapper:
 
     def _is_mime(self):
         is_multipart = self.msg.is_multipart()
-        payloads = len(self.msg.get_payload())
+        payloads = len(self.msg.get_payload()) if self.msg.get_payload() else 0
 
         return is_multipart and payloads == 2