Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-09 02:54:13 +01:00
Code Issues Projects Releases Wiki Activity

Streamlining the patch back down to a single line.

Browse Source 
Since the keyid should always match the master key, regardless of
whether there's a subkey or not, reduced this to simply make keyid be
the last 16 chars of the master key's fingerprint.
This commit is contained in:
Ben McGinnes 2015-02-07 04:27:51 +11:00
parent 861efee8f2
commit a7bbc46eb9
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/User/plugin.py
View File

@ -524,15 +524,9 @@ 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:
keyid0 = verified.key_id keyid = verified.pubkey_fingerprint[-16:]
fprint = verified.pubkey_fingerprint
kprint = fprint[-16:]
prefix, expiry = self._tokens.pop(token) prefix, expiry = self._tokens.pop(token)
found = False found = False
if keyid0 == kprint:
keyid = keyid0
else:
keyid = kprint
for (id, user) in ircdb.users.items(): for (id, user) in ircdb.users.items():
if keyid in [x[-len(keyid):] for x in user.gpgkeys]: if keyid in [x[-len(keyid):] for x in user.gpgkeys]:
try: try: