summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-02-11 23:29:58 +0100
committerlouiz’ <louiz@louiz.org>2018-02-11 23:29:58 +0100
commitd70554143554f1a4ed3d225d30a6e49227f40fc1 (patch)
tree2410b3b7c031920943c9293faacdeec3b74ba455
parent0280343ced6c520700c3ca508e2d04c6b512d319 (diff)
downloadbiboumi-d70554143554f1a4ed3d225d30a6e49227f40fc1.tar.gz
biboumi-d70554143554f1a4ed3d225d30a6e49227f40fc1.tar.bz2
biboumi-d70554143554f1a4ed3d225d30a6e49227f40fc1.tar.xz
biboumi-d70554143554f1a4ed3d225d30a6e49227f40fc1.zip
Send a item-not-found error when the “after” value is not in the archive
-rw-r--r--src/database/database.hpp1
-rw-r--r--src/xmpp/biboumi_component.cpp8
-rw-r--r--tests/end_to_end/__main__.py5
3 files changed, 11 insertions, 3 deletions
diff --git a/src/database/database.hpp b/src/database/database.hpp
index 810af16..fb62c34 100644
--- a/src/database/database.hpp
+++ b/src/database/database.hpp
@@ -22,6 +22,7 @@ class Database
{
public:
using time_point = std::chrono::system_clock::time_point;
+ struct RecordNotFound: public std::exception {};
struct Uuid: Column<std::string> { static constexpr auto name = "uuid_"; };
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index cd6d570..405ac15 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -467,8 +467,12 @@ void BiboumiComponent::handle_iq(const Stanza& stanza)
#ifdef USE_DATABASE
else if ((query = stanza.get_child("query", MAM_NS)))
{
- if (this->handle_mam_request(stanza))
- stanza_error.disable();
+ try {
+ if (this->handle_mam_request(stanza))
+ stanza_error.disable();
+ } catch (const Database::RecordNotFound& exc) {
+ error_name = "item-not-found";
+ }
}
else if ((query = stanza.get_child("query", MUC_OWNER_NS)))
{
diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py
index 3875a7e..590c2c8 100644
--- a/tests/end_to_end/__main__.py
+++ b/tests/end_to_end/__main__.py
@@ -2182,12 +2182,15 @@ if __name__ == '__main__':
"/message/mam:result[@queryid='qid2']/forward:forwarded/client:message[@from='#foo%{irc_server_one}/{nick_one}'][@type='groupchat']/client:body[text()='149']"),
after = partial(save_value, "last_uuid", partial(extract_attribute, "/message/mam:result", "id"))
),
- # And it should not be marked as complete
partial(expect_stanza,
("/iq[@type='result'][@id='id2'][@from='#foo%{irc_server_one}'][@to='{jid_one}/{resource_one}']",
"/iq/mam:fin/rsm:set/rsm:last[text()='{last_uuid}']",
"/iq//mam:fin[@complete='true']",
"/iq//mam:fin")),
+
+ # Send a request with a non-existing ID set as the “after” value.
+ partial(send_stanza, "<iq to='#foo%{irc_server_one}' from='{jid_one}/{resource_one}' type='set' id='id3'><query xmlns='urn:xmpp:mam:2' queryid='qid3' ><set xmlns='http://jabber.org/protocol/rsm'><after>DUMMY_ID</after></set></query></iq>"),
+ partial(expect_stanza, "/iq[@id='id3'][@type='error']/error[@type='cancel']/stanza:feature-not-implemented")
]),
Scenario("channel_history_on_fixed_server",
[