From cfeba29dc99c6949b496b611c5e7b5dcdaa9c7e0 Mon Sep 17 00:00:00 2001 From: missytake Date: Wed, 11 Jun 2025 12:36:07 +0200 Subject: [PATCH] fix: only consider the uid from an imported key if it's self-signed --- src/keyserver_bot/attachment.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/keyserver_bot/attachment.py b/src/keyserver_bot/attachment.py index 0756e45..99df784 100644 --- a/src/keyserver_bot/attachment.py +++ b/src/keyserver_bot/attachment.py @@ -21,7 +21,7 @@ def import_key_from_attachment(file_path: str) -> (str, str, str): for line in ascii_key.splitlines(): if line != "" and not ": " in line and not line.startswith("=") and not line.startswith("-----"): keyparts.append(line) - uid = key.get_uid("").userid - email = validate_email(uid, allow_display_name=True).ascii_email - display_name = validate_email(uid, allow_display_name=True).display_name + uid = key.get_uid("") + email = validate_email(uid.userid, allow_display_name=True).ascii_email if uid.selfsig else "" + 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 "")