Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-26 20:59:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1048 from Hasimir/gpg-extension

Browse Source 
Gpg extension - fix subkey/master key conflict
This commit is contained in:
Valentin Lorentz 2015-02-07 08:09:12 +01:00
commit 9b36fc9427
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/User/plugin.py
View File

@ -500,6 +500,7 @@ class User(callbacks.Plugin):
r'-----BEGIN PGP SIGNATURE-----\r?\n.*' r'-----BEGIN PGP SIGNATURE-----\r?\n.*'
r'\r?\n-----END PGP SIGNATURE-----', r'\r?\n-----END PGP SIGNATURE-----',
re.S) re.S)
@internationalizeDocstring @internationalizeDocstring
def auth(self, irc, msg, args, url): def auth(self, irc, msg, args, url):
"""<url> """<url>
@ -523,7 +524,7 @@ class User(callbacks.Plugin):
'Authentication aborted.'), Raise=True) 'Authentication aborted.'), Raise=True)
verified = gpg.keyring.verify(data) verified = gpg.keyring.verify(data)
if verified and verified.valid: if verified and verified.valid:
keyid = verified.key_id keyid = verified.pubkey_fingerprint[-16:]
prefix, expiry = self._tokens.pop(token) prefix, expiry = self._tokens.pop(token)
found = False found = False
for (id, user) in ircdb.users.items(): for (id, user) in ircdb.users.items():