- xmpp: gate XEP-0359 stanza-id dedup on disco urn:xmpp:sid:0. Before honoring <stanza-id by='…'/> for archive_id dedup, check that the entity in `by` (or its domain — that's what profanity disco's on connect) announces the namespace; fall back to no-dedup when caps are unknown, matching the XEP §6 disco-gate (#1). - accounts: narrow group-name sanitizer to only the characters GKeyFile actually forbids in group headers (`[`, `]`, `\n`, `\r`); `=` and `#` are valid inside a header and stay (#2). - functional tests cover both branches of the disco gate — replayed stanza-id is flagged as duplicate when sid:0 is announced, and not flagged when it isn't. Refs #112
126 lines
4.1 KiB
C
126 lines
4.1 KiB
C
#include <glib.h>
|
|
#include "prof_cmocka.h"
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <stabber.h>
|
|
|
|
#include "proftest.h"
|
|
|
|
void
|
|
message_send(void **state)
|
|
{
|
|
prof_connect();
|
|
|
|
prof_input("/msg somejid@someserver.com Hi there");
|
|
|
|
assert_true(stbbr_received(
|
|
"<message id='*' to='somejid@someserver.com' type='chat'>"
|
|
"<body>Hi there</body>"
|
|
"</message>"
|
|
));
|
|
|
|
assert_true(prof_output_regex("me: .+Hi there"));
|
|
}
|
|
|
|
// TODO: `/message correct` XEP-0308 compliance (whether each correction links to the original message ID)
|
|
// https://xmpp.org/extensions/xep-0308.html#rules
|
|
|
|
void
|
|
message_receive_console(void **state)
|
|
{
|
|
prof_connect();
|
|
|
|
stbbr_send(
|
|
"<message id='message1' to='stabber@localhost' from='someuser@chatserv.org/laptop' type='chat'>"
|
|
"<body>How are you?</body>"
|
|
"</message>"
|
|
);
|
|
|
|
assert_true(prof_output_exact("<< chat message: someuser@chatserv.org/laptop (win 2)"));
|
|
}
|
|
|
|
void
|
|
message_receive_chatwin(void **state)
|
|
{
|
|
prof_connect();
|
|
|
|
prof_input("/msg someuser@chatserv.org");
|
|
assert_true(prof_output_exact("someuser@chatserv.org"));
|
|
|
|
stbbr_send(
|
|
"<message id='message1' to='stabber@localhost' from='someuser@chatserv.org/laptop' type='chat'>"
|
|
"<body>How are you?</body>"
|
|
"</message>"
|
|
);
|
|
|
|
assert_true(prof_output_regex("someuser@chatserv.org/laptop: .+How are you?"));
|
|
}
|
|
|
|
// XEP-0359 disco gate: server announces urn:xmpp:sid:0 -> stanza-id trusted -> replay flagged as duplicate.
|
|
void
|
|
stanza_id_dedup_fires_when_server_announces_sid0(void **state)
|
|
{
|
|
stbbr_for_query("http://jabber.org/protocol/disco#info",
|
|
"<iq type='result' to='stabber@localhost/profanity' from='localhost'>"
|
|
"<query xmlns='http://jabber.org/protocol/disco#info'>"
|
|
"<identity category='server' type='im' name='TestServer'/>"
|
|
"<feature var='urn:xmpp:sid:0'/>"
|
|
"</query>"
|
|
"</iq>"
|
|
);
|
|
|
|
prof_connect();
|
|
|
|
stbbr_send(
|
|
"<message id='m-trust-1' to='stabber@localhost' from='someuser@chatserv.org/laptop' type='chat'>"
|
|
"<body>first</body>"
|
|
"<stanza-id xmlns='urn:xmpp:sid:0' by='stabber@localhost' id='archive-id-42'/>"
|
|
"</message>"
|
|
);
|
|
assert_true(prof_output_exact("<< chat message: someuser@chatserv.org/laptop (win 2)"));
|
|
|
|
stbbr_send(
|
|
"<message id='m-trust-2' to='stabber@localhost' from='someuser@chatserv.org/laptop' type='chat'>"
|
|
"<body>replay</body>"
|
|
"<stanza-id xmlns='urn:xmpp:sid:0' by='stabber@localhost' id='archive-id-42'/>"
|
|
"</message>"
|
|
);
|
|
assert_true(prof_output_exact("Got a message with duplicate (server-generated) stanza-id from someuser@chatserv.org/laptop."));
|
|
}
|
|
|
|
// XEP-0359 disco gate: server does NOT announce urn:xmpp:sid:0 -> stanza-id untrusted -> no replay error.
|
|
void
|
|
stanza_id_not_trusted_when_server_does_not_announce_sid0(void **state)
|
|
{
|
|
stbbr_for_query("http://jabber.org/protocol/disco#info",
|
|
"<iq type='result' to='stabber@localhost/profanity' from='localhost'>"
|
|
"<query xmlns='http://jabber.org/protocol/disco#info'>"
|
|
"<identity category='server' type='im' name='TestServer'/>"
|
|
"<feature var='urn:xmpp:ping'/>"
|
|
"</query>"
|
|
"</iq>"
|
|
);
|
|
|
|
prof_connect();
|
|
|
|
stbbr_send(
|
|
"<message id='m-untrust-1' to='stabber@localhost' from='someuser@chatserv.org/laptop' type='chat'>"
|
|
"<body>first</body>"
|
|
"<stanza-id xmlns='urn:xmpp:sid:0' by='stabber@localhost' id='archive-id-77'/>"
|
|
"</message>"
|
|
);
|
|
assert_true(prof_output_exact("<< chat message: someuser@chatserv.org/laptop (win 2)"));
|
|
|
|
stbbr_send(
|
|
"<message id='m-untrust-2' to='stabber@localhost' from='someuser@chatserv.org/laptop' type='chat'>"
|
|
"<body>replay</body>"
|
|
"<stanza-id xmlns='urn:xmpp:sid:0' by='stabber@localhost' id='archive-id-77'/>"
|
|
"</message>"
|
|
);
|
|
|
|
prof_timeout(2);
|
|
assert_false(prof_output_exact("Got a message with duplicate (server-generated) stanza-id"));
|
|
prof_timeout_reset();
|
|
}
|