aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

Change origin-id/id algo

Browse Source 
Hash twice.
Use HMAC SHA256 from glib.
This commit is contained in:
Michael Vetter 2019-10-18 16:12:26 +02:00
parent 72bdae1014
commit 4d7a496ae2
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/xmpp/connection.c
View File

@ -462,8 +462,12 @@ connection_create_stanza_id(void)
assert(msgid != NULL);
gchar *hmac = g_compute_hmac_for_string(G_CHECKSUM_SHA256,
(guchar*)prof_identifier, strlen(prof_identifier),
msgid, strlen(msgid));
GString *signature = g_string_new("");
g_string_printf(signature, "%s%s", msgid, prof_identifier);
g_string_printf(signature, "%s%s", msgid, hmac);
char *b64 = g_base64_encode((unsigned char*)signature->str, signature->len);
g_string_free(signature, TRUE);
@ -666,17 +670,13 @@ static void _random_bytes_close(void)
static void _calculate_identifier(const char *barejid)
{
unsigned char *digest = (unsigned char*)malloc(XMPP_SHA1_DIGEST_SIZE);
assert(digest != NULL);
gchar *hmac = g_compute_hmac_for_string(G_CHECKSUM_SHA256,
(guchar*)random_bytes, strlen(random_bytes),
barejid, strlen(barejid));
GString *inp = g_string_new("");
g_string_printf(inp, "%s%s", random_bytes, barejid);
xmpp_sha1_digest((unsigned char*)inp->str, strlen(inp->str), digest);
g_string_free(inp, TRUE);
char *b64 = g_base64_encode(digest, XMPP_SHA1_DIGEST_SIZE);
char *b64 = g_base64_encode((guchar*)hmac, XMPP_SHA1_DIGEST_SIZE);
assert(b64 != NULL);
free(digest);
g_free(hmac);
prof_identifier = b64;
}

23
src/xmpp/message.c
View File

@ -1159,7 +1159,10 @@ _send_message_stanza(xmpp_stanza_t *const stanza)
xmpp_free(connection_get_ctx(), text);
}
bool message_is_sent_by_us(ProfMessage *message) {
bool
message_is_sent_by_us(ProfMessage *message) {
bool ret = FALSE;
// we check the </origin-id> for this we calculate a hash into it so we can detect
// whether this client sent it. See connection_create_stanza_id()
if (message->id != NULL) {
@ -1167,10 +1170,22 @@ bool message_is_sent_by_us(ProfMessage *message) {
char *tmp = (char*)g_base64_decode(message->id, &tmp_len);
// our client sents at least 10 for the identifier + random message bytes
if ((tmp_len > 10) || (g_strcmp0(&tmp[10], connection_get_profanity_identifier()) == 0)) {
return TRUE;
if (tmp_len > 10) {
char *msgid = g_strndup(tmp, 10);
char *prof_identifier = connection_get_profanity_identifier();
gchar *hmac = g_compute_hmac_for_string(G_CHECKSUM_SHA256,
(guchar*)prof_identifier, strlen(prof_identifier),
msgid, strlen(msgid));
g_free(msgid);
if (g_strcmp0(&tmp[10], hmac) == 0) {
ret = TRUE;
}
}
free(tmp);
}
return FALSE;
return ret;
}