aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

OX bug fix

Browse Source 
* Help / message description
 * C-Code format
This commit is contained in:
DebXWoody 2021-07-01 18:08:40 +02:00
parent 6173e015f5
commit d01ba72535
No known key found for this signature in database
GPG Key ID: CBD1B596579B7FFF
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/command/cmd_defs.c
View File

@ -1720,8 +1720,9 @@ static struct cmd_t command_defs[] = {
"/ox discover <jid>", "/ox discover <jid>",
"/ox request <jid> <keyid>") "/ox request <jid> <keyid>")
CMD_DESC( CMD_DESC(
"OpenPGP (OX) commands to manage keys, and perform OpenPGP 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.") "Your OpenPGP key needs a user-id with your JID URI (xmpp:local@domain.tld). "
"A key can be generated with \"gpg --quick-gen-key xmpp:local@domain.tld future-default default 3y\".")
CMD_ARGS( CMD_ARGS(
{ "keys", "List all keys known to the system." }, { "keys", "List all keys known to the system." },
{ "contacts", "Show contacts with assigned public keys." }, { "contacts", "Show contacts with assigned public keys." },
@ -1731,7 +1732,7 @@ static struct cmd_t command_defs[] = {
{ "log redact", "Log PGP encrypted messages, but replace the contents with [redacted]. This is the default." }, { "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." }, { "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" }, { "announce <file>", "Announce a public key by pushing it on the XMPP Server" },
{ "discover <jid>", "Discover public keys of a jid. The keyids will be displayed" }, { "discover <jid>", "Discover public keys of a jid. The OpenPGP Key IDs will be displayed" },
{ "request <jid>", "Request public keys" }, { "request <jid>", "Request public keys" },
{ "sendfile on|off", "Allow /sendfile to send unencrypted files while otherwise using PGP." }) { "sendfile on|off", "Allow /sendfile to send unencrypted files while otherwise using PGP." })
CMD_EXAMPLES( CMD_EXAMPLES(

2
src/command/cmd_funcs.c
View File

@ -7619,7 +7619,7 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
if (args[1] && args[2]) { if (args[1] && args[2]) {
ox_request_public_key(args[1], args[2]); ox_request_public_key(args[1], args[2]);
} else { } else {
cons_show("JID and KeyID is required"); cons_show("JID and OpenPGP Key ID are required");
} }
} else { } else {
cons_show("OX not implemented"); cons_show("OX not implemented");

35
src/xmpp/message.c
View File

@ -86,7 +86,7 @@ static void _handle_muc_private_message(xmpp_stanza_t* const stanza);
static void _handle_conference(xmpp_stanza_t* const stanza); static void _handle_conference(xmpp_stanza_t* const stanza);
static void _handle_captcha(xmpp_stanza_t* const stanza); static void _handle_captcha(xmpp_stanza_t* const stanza);
static void _handle_receipt_received(xmpp_stanza_t* const stanza); static void _handle_receipt_received(xmpp_stanza_t* const stanza);
static void _handle_chat(xmpp_stanza_t* const stanza, gboolean is_mam, gboolean is_carbon, const char *result_id, GDateTime* timestamp); static void _handle_chat(xmpp_stanza_t* const stanza, gboolean is_mam, gboolean is_carbon, const char* result_id, GDateTime* timestamp);
static void _handle_ox_chat(xmpp_stanza_t* const stanza, ProfMessage* message, gboolean is_mam); static void _handle_ox_chat(xmpp_stanza_t* const stanza, ProfMessage* message, gboolean is_mam);
static xmpp_stanza_t* _handle_carbons(xmpp_stanza_t* const stanza); static xmpp_stanza_t* _handle_carbons(xmpp_stanza_t* const stanza);
static void _send_message_stanza(xmpp_stanza_t* const stanza); static void _send_message_stanza(xmpp_stanza_t* const stanza);
@ -119,7 +119,7 @@ _handle_headline(xmpp_stanza_t* const stanza)
{ {
xmpp_stanza_t* body = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_BODY); xmpp_stanza_t* body = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_BODY);
if (body) { if (body) {
char *text = xmpp_stanza_get_text(body); char* text = xmpp_stanza_get_text(body);
if (text) { if (text) {
cons_show("Headline: %s", text); cons_show("Headline: %s", text);
xmpp_free(connection_get_ctx(), text); xmpp_free(connection_get_ctx(), text);
@ -641,7 +641,7 @@ message_send_chat_omemo(const char* const jid, uint32_t sid, GList* keys,
xmpp_stanza_t* key_stanza = xmpp_stanza_new(ctx); xmpp_stanza_t* key_stanza = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(key_stanza, "key"); xmpp_stanza_set_name(key_stanza, "key");
char* rid = g_strdup_printf("%d", key->device_id); char* rid = g_strdup_printf("%d", key->device_id);
log_debug("[OMEMO] Sending to device rid %s", rid == NULL ? "NULL" : rid ); log_debug("[OMEMO] Sending to device rid %s", rid == NULL ? "NULL" : rid);
xmpp_stanza_set_attribute(key_stanza, "rid", rid); xmpp_stanza_set_attribute(key_stanza, "rid", rid);
g_free(rid); g_free(rid);
if (key->prekey) { if (key->prekey) {
@ -998,11 +998,11 @@ _handle_groupchat(xmpp_stanza_t* const stanza)
xmpp_ctx_t* ctx = connection_get_ctx(); xmpp_ctx_t* ctx = connection_get_ctx();
const char* room_jid = xmpp_stanza_get_from(stanza); const char* room_jid = xmpp_stanza_get_from(stanza);
if(!room_jid) { if (!room_jid) {
return; return;
} }
Jid* from_jid = jid_create(room_jid); Jid* from_jid = jid_create(room_jid);
if(!from_jid) { if (!from_jid) {
return; return;
} }
@ -1174,7 +1174,7 @@ _handle_receipt_received(xmpp_stanza_t* const stanza)
} }
Jid* jidp = jid_create(fulljid); Jid* jidp = jid_create(fulljid);
if(!jidp) { if (!jidp) {
return; return;
} }
@ -1304,7 +1304,7 @@ _handle_carbons(xmpp_stanza_t* const stanza)
} }
static void static void
_handle_chat(xmpp_stanza_t* const stanza, gboolean is_mam, gboolean is_carbon, const char *result_id, GDateTime* timestamp) _handle_chat(xmpp_stanza_t* const stanza, gboolean is_mam, gboolean is_carbon, const char* result_id, GDateTime* timestamp)
{ {
// some clients send the mucuser namespace with private messages // some clients send the mucuser namespace with private messages
// if the namespace exists, and the stanza contains a body element, assume its a private message // if the namespace exists, and the stanza contains a body element, assume its a private message
@ -1455,26 +1455,26 @@ _handle_ox_chat(xmpp_stanza_t* const stanza, ProfMessage* message, gboolean is_m
#ifdef HAVE_LIBGPGME #ifdef HAVE_LIBGPGME
xmpp_stanza_t* ox = xmpp_stanza_get_child_by_name_and_ns(stanza, "openpgp", STANZA_NS_OPENPGP_0); xmpp_stanza_t* ox = xmpp_stanza_get_child_by_name_and_ns(stanza, "openpgp", STANZA_NS_OPENPGP_0);
if ( ox ) { if (ox) {
message->plain = p_ox_gpg_decrypt(xmpp_stanza_get_text(ox)); message->plain = p_ox_gpg_decrypt(xmpp_stanza_get_text(ox));
if ( message->plain ) { if (message->plain) {
xmpp_stanza_t *x = xmpp_stanza_new_from_string(connection_get_ctx(), message->plain); xmpp_stanza_t* x = xmpp_stanza_new_from_string(connection_get_ctx(), message->plain);
if ( x ) { if (x) {
xmpp_stanza_t *p = xmpp_stanza_get_child_by_name(x, "payload"); xmpp_stanza_t* p = xmpp_stanza_get_child_by_name(x, "payload");
if ( !p ) { if (!p) {
log_warning("OX Stanza - no Payload"); log_warning("OX Stanza - no Payload");
message->plain = "OX error: No payload found"; message->plain = "OX error: No payload found";
return; return;
} }
xmpp_stanza_t *b = xmpp_stanza_get_child_by_name(p, "body"); xmpp_stanza_t* b = xmpp_stanza_get_child_by_name(p, "body");
if ( !b ) { if (!b) {
log_warning("OX Stanza - no body"); log_warning("OX Stanza - no body");
message->plain = "OX error: No paylod body found"; message->plain = "OX error: No paylod body found";
return; return;
} }
message->plain = xmpp_stanza_get_text(b); message->plain = xmpp_stanza_get_text(b);
message->encrypted = xmpp_stanza_get_text(ox); message->encrypted = xmpp_stanza_get_text(ox);
if(message->plain == NULL ) { if (message->plain == NULL) {
message->plain = xmpp_stanza_get_text(stanza); message->plain = xmpp_stanza_get_text(stanza);
} }
} else { } else {
@ -1489,7 +1489,6 @@ _handle_ox_chat(xmpp_stanza_t* const stanza, ProfMessage* message, gboolean is_m
log_warning("OX Stanza without openpgp stanza"); log_warning("OX Stanza without openpgp stanza");
} }
#endif // HAVE_LIBGPGME #endif // HAVE_LIBGPGME
} }
static gboolean static gboolean
@ -1510,7 +1509,7 @@ _handle_mam(xmpp_stanza_t* const stanza)
// same as <stanza-id> from XEP-0359 for live messages // same as <stanza-id> from XEP-0359 for live messages
const char* result_id = xmpp_stanza_get_id(result); const char* result_id = xmpp_stanza_get_id(result);
GDateTime *timestamp = stanza_get_delay_from(forwarded, NULL); GDateTime* timestamp = stanza_get_delay_from(forwarded, NULL);
xmpp_stanza_t* message_stanza = xmpp_stanza_get_child_by_ns(forwarded, "jabber:client"); xmpp_stanza_t* message_stanza = xmpp_stanza_get_child_by_ns(forwarded, "jabber:client");