1 files changed, 16 insertions, 30 deletions
diff --git a/src/mailman_pgp/model/address.py b/src/mailman_pgp/model/address.py
index 0cfefe2..9ecfa95 100644
--- a/src/mailman_pgp/model/address.py
+++ b/src/mailman_pgp/model/address.py
@@ -16,20 +16,20 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Model for PGP enabled addresses."""
-import os
-from os.path import exists, isfile, join
 
 from mailman.database.types import SAUnicode
 from mailman.interfaces.usermanager import IUserManager
-from pgpy import PGPKey
+from public import public
 from sqlalchemy import Boolean, Column, Integer, String
 from sqlalchemy.orm import reconstructor
 from zope.component import getUtility
 
 from mailman_pgp.config import config
 from mailman_pgp.model.base import Base
+from mailman_pgp.model.fs_key import FSKey
 
 
+@public
 class PGPAddress(Base):
     """A PGP enabled address."""
 
@@ -41,15 +41,15 @@ class PGPAddress(Base):
     key_confirmed = Column(Boolean, default=False)
 
     def __init__(self, address):
-        super().__init__()
+        super().__init__(email=address.email)
         self._init()
-        self.email = address.email
         self._address = address
 
     @reconstructor
     def _init(self):
         self._address = None
-        self._key = None
+        self._key = FSKey(config.pgp.keydir_config['user_keydir'],
+                          self.email + '.asc', True)
 
     @property
     def key(self):
@@ -58,33 +58,22 @@ class PGPAddress(Base):
         :return:
         :rtype: pgpy.PGPKey
         """
-        if self.key_fingerprint is None:
-            return None
-        if self._key is None:
-            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, new_key):
+    def key(self, value):
         """
 
-        :param new_key:
-        :type new_key: PGPKey
+        :param value:
+        :type value: pgpy.PGPKey
         """
-        if self.key_fingerprint is not None:
-            try:
-                os.remove(self.key_path)
-            except FileNotFoundError:
-                pass
-        if new_key is None:
+        if value is None:
             self.key_fingerprint = None
-            self._key = None
         else:
-            self.key_fingerprint = str(new_key.fingerprint)
-            with open(self.key_path, 'w') as out:
-                out.write(str(new_key))
-            self._key = new_key
+            self.key_fingerprint = value.fingerprint
+        self._key.key = value
+        self._key.save()
 
     @property
     def key_path(self):
@@ -93,10 +82,7 @@ class PGPAddress(Base):
         :return:
         :rtype: str
         """
-        if self.key_fingerprint is None:
-            return None
-        return join(config.pgp.keydir_config['user_keydir'],
-                    self.key_fingerprint + '.asc')
+        return self._key.key_path
 
     @property
     def address(self):