aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

message.c: Log invalid message type

Browse Source 
So far we logged when we receive a message without a type. Which is
actually quite common and makes no sense.
This commit is contained in:
Michael Vetter 2020-07-02 17:47:07 +02:00
parent 46a00317ee
commit 6be5b51a46
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/xmpp/message.c
View File

@ -109,23 +109,11 @@ _message_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *con
xmpp_free(connection_get_ctx(), text); xmpp_free(connection_get_ctx(), text);
return 1; return 1;
} }
xmpp_free(connection_get_ctx(), text);
// type according to RFC 6121 // type according to RFC 6121
const char *type = xmpp_stanza_get_type(stanza); const char *type = xmpp_stanza_get_type(stanza);
if (type == NULL) {
if (_handle_mam(stanza)) {
xmpp_free(connection_get_ctx(), text);
return 1;
}
log_info("Received <message> without 'type': %s", text);
xmpp_free(connection_get_ctx(), text);
return 1;
}
xmpp_free(connection_get_ctx(), text);
if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) {
_handle_error(stanza); _handle_error(stanza);
} else if (g_strcmp0(type, STANZA_TYPE_GROUPCHAT) == 0) { } else if (g_strcmp0(type, STANZA_TYPE_GROUPCHAT) == 0) {
@ -136,6 +124,11 @@ _message_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *con
} else if (type == NULL || g_strcmp0(type, STANZA_TYPE_CHAT) != 0 || g_strcmp0(type, STANZA_TYPE_NORMAL) != 0 ) { } else if (type == NULL || g_strcmp0(type, STANZA_TYPE_CHAT) != 0 || g_strcmp0(type, STANZA_TYPE_NORMAL) != 0 ) {
// type: chat, normal (==NULL) // type: chat, normal (==NULL)
// XEP-0313: Message Archive Management
if (_handle_mam(stanza)) {
return 1;
}
// XEP-0045: Multi-User Chat - invites - presence // XEP-0045: Multi-User Chat - invites - presence
xmpp_stanza_t *mucuser = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_USER); xmpp_stanza_t *mucuser = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_USER);
if (mucuser) { if (mucuser) {
@ -172,7 +165,14 @@ _message_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *con
_handle_chat(stanza, FALSE); _handle_chat(stanza, FALSE);
} else { } else {
log_info("Received <message> without 'type': %s", text); // none of the allowed types
char *text;
size_t text_size;
xmpp_stanza_to_text(stanza, &text, &text_size);
log_info("Received <message> with invalid 'type': %s", text);
xmpp_free(connection_get_ctx(), text);
} }
return 1; return 1;