1 files changed, 28 insertions, 38 deletions

diff --git a/src/mailman_pgp/model/list.py b/src/mailman_pgp/model/list.py
index 8448368..838bcab 100644
--- a/src/mailman_pgp/model/list.py
+++ b/src/mailman_pgp/model/list.py
@@ -17,14 +17,9 @@
 
 """Model for PGP enabled mailing lists."""
 
-from os import remove
-from os.path import exists, isfile, join
-
-from flufl.lock import Lock
 from mailman.database.types import Enum, SAUnicode
 from mailman.interfaces.action import Action
 from mailman.interfaces.listmanager import (IListManager, ListDeletingEvent)
-from pgpy import PGPKey
 from public import public
 from sqlalchemy import Boolean, Column, Integer
 from sqlalchemy.orm import reconstructor
@@ -34,7 +29,7 @@ from zope.event import classhandler
 from mailman_pgp.config import config
 from mailman_pgp.database import transaction
 from mailman_pgp.model.base import Base
-from mailman_pgp.pgp.keygen import ListKeyGenerator
+from mailman_pgp.model.fs_key import FSKey
 
 
 @public
@@ -44,7 +39,7 @@ class PGPMailingList(Base):
     __tablename__ = 'pgp_lists'
 
     id = Column(Integer, primary_key=True)
-    list_id = Column(SAUnicode, index=True)
+    list_id = Column(SAUnicode, index=True, unique=True)
 
     # Signature related properties
     unsigned_msg_action = Column(Enum(Action), default=Action.reject)
@@ -61,16 +56,20 @@ class PGPMailingList(Base):
     encrypt_outgoing = Column(Boolean, default=True)
 
     def __init__(self, mlist):
-        super().__init__()
+        """
+
+        :param mlist:
+        :type mlist: mailman.model.mailinglist.MailingList
+        """
+        super().__init__(list_id=mlist.list_id)
         self._init()
-        self.list_id = mlist.list_id
         self._mlist = mlist
 
     @reconstructor
     def _init(self):
         self._mlist = None
-        self._key = None
-        self._key_generator = None
+        self._key = FSKey(config.pgp.keydir_config['list_keydir'],
+                          self.list_id + '.asc', True)
 
     @property
     def mlist(self):
@@ -84,44 +83,34 @@ class PGPMailingList(Base):
         return self._mlist
 
     @property
+    def fs_key(self):
+        return self._key
+
+    @property
     def key(self):
         """
+        The private part of the list's keypair.
 
         :return:
         :rtype: pgpy.PGPKey
         """
-        if self._key is None:
-            # Check the file
-            if exists(self.key_path) and isfile(self.key_path):
-                self._key, _ = PGPKey.from_file(self.key_path)
-        return self._key
+        self._key.reload()
+        return self._key.key
 
     @key.setter
     def key(self, value):
-        with Lock(self.key_path + '.lock'):
-            self._key = value
-            if value is None:
-                remove(self.key_path)
-            else:
-                with open(self.key_path, 'w') as key_file:
-                    key_file.write(str(value))
+        """
 
-    def generate_key(self, block=False):
-        self._key = None
-        self._key_generator = ListKeyGenerator(config.pgp.primary_key_args,
-                                               config.pgp.sub_key_args,
-                                               self.mlist.display_name,
-                                               self.mlist.posting_address,
-                                               self.mlist.request_address,
-                                               self.key_path)
-        self._key_generator.start()
-        if block:
-            self._key_generator.join()
-            return self.key
+        :param value:
+        :type value:
+        """
+        self._key.key = value
+        self._key.save()
 
     @property
     def pubkey(self):
         """
+        The public part of the list's keypair.
 
         :return:
         :rtype: pgpy.PGPKey
@@ -133,18 +122,19 @@ class PGPMailingList(Base):
     @property
     def key_path(self):
         """
+        The path to this list's key in the `list_keydir`.
 
-        :return:
+        :return: List key path.
         :rtype: str
         """
-        return join(config.pgp.keydir_config['list_keydir'],
-                    self.list_id + '.asc')
+        return self._key.key_path
 
     @staticmethod
     def for_list(mlist):
         """
 
         :param mlist:
+        :type mlist: mailman.model.mailinglist.MailingList
         :return:
         :rtype: PGPMailingList|None
         """