1.1 --- a/MoinMoin/auth/pgp.py Tue Nov 12 23:05:52 2013 +0100
1.2 +++ b/MoinMoin/auth/pgp.py Wed Nov 13 15:42:06 2013 +0100
1.3 @@ -14,10 +14,10 @@
1.4
1.5 from MoinMoin.user import User
1.6 from MoinMoin.auth import BaseAuth
1.7 -from MoinSupport import getHeader, getWikiDict
1.8 +from MoinSupport import getHeader
1.9 from MoinMessage import GPG, is_signed, is_encrypted, \
1.10 MoinMessageDecodingError, MoinMessageError
1.11 -from MoinMessageSupport import get_homedir
1.12 +from MoinMessageSupport import get_homedir, get_username_for_fingerprint
1.13 from email.parser import Parser
1.14
1.15 try:
1.16 @@ -117,17 +117,12 @@
1.17 # Evaluate the result of the verification process.
1.18
1.19 if fingerprint:
1.20 - gpg_users = getWikiDict(
1.21 - getattr(request.cfg, "moinmessage_gpg_users_page", "MoinMessageUserDict"),
1.22 - request,
1.23 - superuser=True # disable user test because we have no user yet
1.24 - )
1.25 + username = get_username_for_fingerprint(request, fingerprint)
1.26
1.27 - # With a user mapping and a fingerprint corresponding to a known
1.28 - # user, temporarily switch user in order to make the edit.
1.29 + # With a known username, temporarily switch user in order to make
1.30 + # the edit.
1.31
1.32 - if gpg_users and gpg_users.has_key(fingerprint):
1.33 - username = gpg_users[fingerprint]
1.34 + if username:
1.35 user = User(request, auth_method="pgp", auth_username=username)
1.36 logging.debug("username: %r" % username)
1.37