fix: only consider the uid from an imported key if it's self-signed
This commit is contained in:
parent
4055b3e590
commit
cfeba29dc9
|
|
@ -21,7 +21,7 @@ def import_key_from_attachment(file_path: str) -> (str, str, str):
|
||||||
for line in ascii_key.splitlines():
|
for line in ascii_key.splitlines():
|
||||||
if line != "" and not ": " in line and not line.startswith("=") and not line.startswith("-----"):
|
if line != "" and not ": " in line and not line.startswith("=") and not line.startswith("-----"):
|
||||||
keyparts.append(line)
|
keyparts.append(line)
|
||||||
uid = key.get_uid("").userid
|
uid = key.get_uid("")
|
||||||
email = validate_email(uid, allow_display_name=True).ascii_email
|
email = validate_email(uid.userid, allow_display_name=True).ascii_email if uid.selfsig else ""
|
||||||
display_name = validate_email(uid, allow_display_name=True).display_name
|
display_name = validate_email(uid.userid, allow_display_name=True).display_name if uid.selfsig else ""
|
||||||
return "".join(keyparts), email, (display_name if display_name else "")
|
return "".join(keyparts), email, (display_name if display_name else "")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue