aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Bugfixes for OX implementation

Browse Source 
* autocomplete for /ox discover
 * fixed help description
 * Implemented /ox char command
 * Validated KeyID length
This commit is contained in:
DebXWoody 2021-06-28 21:28:58 +02:00
parent 49a0d97a43
commit 2a011e69ac
No known key found for this signature in database
GPG Key ID: CBD1B596579B7FFF
5 changed files with 73 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/command/cmd_ac.c
View File

@ -2484,6 +2484,13 @@ _ox_autocomplete(ProfWin* window, const char* const input, gboolean previous)
}
}
if (conn_status == JABBER_CONNECTED) {
found = autocomplete_param_with_func(input, "/ox discover", roster_contact_autocomplete, previous, NULL);
if (found) {
return found;
}
}
found = autocomplete_param_with_ac(input, "/ox log", ox_log_ac, TRUE, previous);
if (found) {
return found;
@ -2520,11 +2527,8 @@ _ox_autocomplete(ProfWin* window, const char* const input, gboolean previous)
}
found = autocomplete_param_with_ac(input, "/ox", ox_ac, TRUE, previous);
if (found) {
return found;
}
return NULL;
return found;
}
#endif

9
src/command/cmd_defs.c
View File

@ -1717,10 +1717,11 @@ static struct cmd_t command_defs[] = {
"/ox char <char>",
"/ox sendfile on|off",
"/ox announce <file>",
"/ox discover",
"/ox request <jid>")
"/ox discover <jid>",
"/ox request <jid> <keyid>")
CMD_DESC(
"OpenPGP (OX) commands to manage keys, and perform PGP encryption during chat sessions. ")
"OpenPGP (OX) commands to manage keys, and perform OpenPGP encryption during chat sessions."
"Your key need a OpenPGP UI with xmpp:local@domain.tld as name.")
CMD_ARGS(
{ "keys", "List all keys known to the system." },
{ "contacts", "Show contacts with assigned public keys." },
@ -1730,7 +1731,7 @@ static struct cmd_t command_defs[] = {
{ "log redact", "Log PGP encrypted messages, but replace the contents with [redacted]. This is the default." },
{ "char <char>", "Set the character to be displayed next to PGP encrypted messages." },
{ "announce <file>", "Announce a public key by pushing it on the XMPP Server" },
{ "discover <jid>", "Discover public keys of a jid " },
{ "discover <jid>", "Discover public keys of a jid. The keyids will be displayed" },
{ "request <jid>", "Request public keys" },
{ "sendfile on|off", "Allow /sendfile to send unencrypted files while otherwise using PGP." })
CMD_EXAMPLES(

20
src/command/cmd_funcs.c
View File

@ -7453,6 +7453,22 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
return TRUE;
}
if (strcmp(args[0], "char") == 0) {
if (args[1] == NULL) {
cons_bad_cmd_usage(command);
return TRUE;
} else if (g_utf8_strlen(args[1], 4) == 1) {
if (prefs_set_ox_char(args[1])) {
cons_show("OX char set to %s.", args[1]);
} else {
cons_show_error("Could not set OX char: %s.", args[1]);
}
return TRUE;
}
cons_bad_cmd_usage(command);
return TRUE;
}
// The '/ox keys' command - same like in pgp
// Should we move this to a common command
// e.g. '/openpgp keys'?.
@ -7597,13 +7613,13 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
if (args[1]) {
ox_discover_public_key(args[1]);
} else {
cons_show("JID is required");
cons_show("To discover the OpenPGP keys of an user, the JID is required");
}
} else if (g_strcmp0(args[0], "request") == 0) {
if (args[1] && args[2]) {
ox_request_public_key(args[1], args[2]);
} else {
cons_show("JID and Fingerprint is required");
cons_show("JID and KeyID is required");
}
} else {
cons_show("OX not implemented");

56
src/xmpp/message.c
View File

@ -1454,39 +1454,41 @@ _handle_ox_chat(xmpp_stanza_t* const stanza, ProfMessage* message, gboolean is_m
message->enc = PROF_MSG_ENC_OX;
#ifdef HAVE_LIBGPGME
xmpp_ctx_t* const ctx = connection_get_ctx();
xmpp_stanza_t* ox = xmpp_stanza_get_child_by_name_and_ns(stanza, "openpgp", STANZA_NS_OPENPGP_0);
if (!ox) {
return;
}
if ( ox ) {
message->plain = p_ox_gpg_decrypt(xmpp_stanza_get_text(ox));
if ( message->plain ) {
xmpp_stanza_t *x = xmpp_stanza_new_from_string(connection_get_ctx(), message->plain);
if ( x ) {
xmpp_stanza_t *p = xmpp_stanza_get_child_by_name(x, "payload");
if ( !p ) {
log_warning("OX Stanza - no Payload");
return;
}
xmpp_stanza_t *b = xmpp_stanza_get_child_by_name(p, "body");
if ( !b ) {
log_warning("OX Stanza - no body");
return;
}
message->plain = xmpp_stanza_get_text(b);
if(message->plain == NULL ) {
message->plain = xmpp_stanza_get_text(stanza);
}
message->encrypted = xmpp_stanza_get_text(ox);
char* ox_text = xmpp_stanza_get_text(ox);
if (!ox_text) {
return;
}
message->plain = p_ox_gpg_decrypt(ox_text);
xmpp_free(ctx, ox_text);
xmpp_stanza_t *x = xmpp_stanza_new_from_string(ctx, message->plain);
xmpp_stanza_t *p = xmpp_stanza_get_child_by_name(x, "payload");
if (p) {
xmpp_stanza_t *b = xmpp_stanza_get_child_by_name(p, "body");
if (b) {
message->plain = xmpp_stanza_get_text(b);
if(message->plain == NULL ) {
message->plain = xmpp_stanza_get_text(stanza);
if (message->plain == NULL) {
message->plain = xmpp_stanza_get_text(stanza);
}
message->encrypted = xmpp_stanza_get_text(ox);
} else {
log_warning("OX Stanza text to stanza failed");
}
message->encrypted = xmpp_stanza_get_text(ox);
if (message->plain == NULL) {
message->plain = xmpp_stanza_get_text(stanza);
}
message->encrypted = xmpp_stanza_get_text(ox);
}
} else {
log_warning("OX Stanza without openpgp stanza");
}
#endif // HAVE_LIBGPGME
}
static gboolean

19
src/xmpp/ox.c
View File

@ -45,6 +45,9 @@
#include "pgp/gpg.h"
#ifdef HAVE_LIBGPGME
#define KEYID_LENGTH 40
static void _ox_metadata_node__public_key(const char* const fingerprint);
static int _ox_metadata_result(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* const userdata);
@ -165,8 +168,8 @@ ox_announce_public_key(const char* const filename)
void
ox_discover_public_key(const char* const jid)
{
assert(jid);
log_info("Discovering Public Key for %s", jid);
assert(jid && strlen(jid) > 0);
log_info("[OX] Discovering Public Key for %s", jid);
cons_show("Discovering Public Key for %s", jid);
// iq
xmpp_ctx_t* const ctx = connection_get_ctx();
@ -188,6 +191,7 @@ ox_discover_public_key(const char* const jid)
xmpp_id_handler_add(connection_get_conn(), _ox_metadata_result, id, strdup(jid));
xmpp_send(connection_get_conn(), iq);
xmpp_stanza_release(iq);
}
void
@ -228,7 +232,7 @@ _ox_metadata_node__public_key(const char* const fingerprint)
{
log_info("Annonuce OpenPGP metadata: %s", fingerprint);
assert(fingerprint);
assert(strlen(fingerprint) == 40);
assert(strlen(fingerprint) == KEYID_LENGTH);
// iq
xmpp_ctx_t* const ctx = connection_get_ctx();
char* id = xmpp_uuid_gen(ctx);
@ -269,7 +273,7 @@ _ox_metadata_result(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void*
log_debug("[OX] Processing result %s's metadata.", (char*)userdata);
if (g_strcmp0(xmpp_stanza_get_type(stanza), "result") != 0) {
log_debug("[OX] Error: No result");
log_debug("[OX] Error: Unable to load metadata of user %s - Not a stanza result type", (char*)userdata);
return FALSE;
}
// pubsub
@ -301,8 +305,11 @@ _ox_metadata_result(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void*
while (pubkeymetadata) {
const char* fingerprint = xmpp_stanza_get_attribute(pubkeymetadata, STANZA_ATTR_V4_FINGERPRINT);
if (fingerprint) {
if ( strlen( fingerprint ) == KEYID_LENGTH ) {
cons_show(fingerprint);
} else {
cons_show("OX: Wrong char size of public key");
log_error("[OX] Wrong chat size of public key %s", fingerprint);
}
pubkeymetadata = xmpp_stanza_get_next(pubkeymetadata);
}
@ -332,7 +339,7 @@ _ox_request_public_key(const char* const jid, const char* const fingerprint)
{
assert(jid);
assert(fingerprint);
assert(strlen(fingerprint) == 40);
assert(strlen(fingerprint) == KEYID_LENGTH);
cons_show("Requesting Public Key %s for %s", fingerprint, jid);
log_info("[OX] Request %s's public key %s.", jid, fingerprint);
// iq