Avoid using direct access to the storage on authentication

1 files changed, 5 insertions, 5 deletions

diff --git a/restful_document/user.py b/restful_document/user.py
index 6202171..05d5681 100644
--- a/restful_document/user.py
+++ b/restful_document/user.py
@@ -15,7 +15,6 @@
 
 import hashlib
 import logging
-from os.path import exists
 from gettext import gettext as _
 
 from M2Crypto import DSA
@@ -72,12 +71,13 @@ class User(Document):
 
     @classmethod
     def verify(cls, guid, signature):
-        # TODO Avoid direct access to pubkey property
-        pubkey_path = cls.metadata.path(guid[:2], guid, 'pubkey')
-        enforce(exists(pubkey_path), env.Unauthorized,
-                _('Principal user does not exist'))
+        try:
+            pubkey = cls(guid, raw=True)['pubkey']
+        except ad.NotFound:
+            raise env.Unauthorized(_('Principal user does not exist'))
         if env.trust_users.value:
             return
+        pubkey_path = util.TempFilePath(text=pubkey)
         pubkey = DSA.load_pub_key(pubkey_path)
         data = hashlib.sha1(guid).digest()
         enforce(pubkey.verify_asn1(data, signature.decode('hex')),