From 78664dd4ef6d9777308df494e4d8abcfb2f421d4 Mon Sep 17 00:00:00 2001 From: Miquel Lionel Date: Sat, 20 Jan 2024 14:24:30 +0100 Subject: OPENPGP PLUGIN: Don't list expired/revoked GPG key - closes #91 - Mention that GPG key may be expired or revoked in chat input box - in the account dialog if the number of OpenPGP keys found is 0, the label also notes that a key may have been revoked or expired. - blocks input in chat box if key is use is revoked or expired when switching conversation and can detect if your key has expired while chatting - if current selected key is revoked or expired, it'll be shown in account manager with a warning message: "Attention required: your key xxxx is revoked/expired!" --- plugins/openpgp/src/encryption_list_entry.vala | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'plugins/openpgp/src/encryption_list_entry.vala') diff --git a/plugins/openpgp/src/encryption_list_entry.vala b/plugins/openpgp/src/encryption_list_entry.vala index cf5da8c4..5e61df8d 100644 --- a/plugins/openpgp/src/encryption_list_entry.vala +++ b/plugins/openpgp/src/encryption_list_entry.vala @@ -32,6 +32,7 @@ private class EncryptionListEntry : Plugins.EncryptionListEntry, Object { return null; } + public void encryption_activated(Entities.Conversation conversation, Plugins.SetInputFieldStatus input_status_callback) { try { GPGHelper.get_public_key(db.get_account_key(conversation.account) ?? ""); @@ -40,6 +41,14 @@ private class EncryptionListEntry : Plugins.EncryptionListEntry, Object { return; } + GPG.Key key_check = GPGHelper.get_public_key(db.get_account_key(conversation.account)); + if (key_check.expired || key_check.revoked){ + string status_str = key_check.expired ? " has expired." : " has been revoked."; + debug("GPG public key %s is NOT fine for encryption: it %s.\n", key_check.fpr, status_str); + input_status_callback(new Plugins.InputFieldStatus("Your GPG key " + key_check.fpr + status_str, Plugins.InputFieldStatus.MessageType.ERROR, Plugins.InputFieldStatus.InputState.NO_SEND)); + return; + } + if (conversation.type_ == Conversation.Type.CHAT) { string? key_id = stream_interactor.get_module(Manager.IDENTITY).get_key_id(conversation.account, conversation.counterpart); if (key_id == null) { -- cgit v1.2.3-70-g09d2