~singpolyma/biboumi

fc22e06317c8f4df984ab29e6457b7c7e0adafd8 — louiz’ 2 years ago 40d2168
Fix a type stable-id -> stanza-id, and add a test case to be exhaustive
2 files changed, 13 insertions(+), 7 deletions(-)

M src/xmpp/biboumi_component.cpp
M tests/end_to_end/scenarios/stable_id.py
M src/xmpp/biboumi_component.cpp => src/xmpp/biboumi_component.cpp +3 -3
@@ 294,15 294,15 @@ void BiboumiComponent::handle_message(const Stanza& stanza)
              if (origin_id)
                nodes_to_reflect.push_back(*origin_id);
              const auto own_address = std::to_string(iid) + '@' + this->served_hostname;
              for (const XmlNode* stable_id: stanza.get_children("stable-id", STABLE_ID_NS))
              for (const XmlNode* stanza_id: stanza.get_children("stanza-id", STABLE_ID_NS))
                {
                  // Stanza ID generating entities, which encounter a
                  // <stanza-id/> element where the 'by' attribute matches
                  // the 'by' attribute they would otherwise set, MUST
                  // delete that element even if they are not adding their
                  // own stanza ID.
                  if (stable_id->get_tag("by") != own_address)
                    nodes_to_reflect.push_back(*stable_id);
                  if (stanza_id->get_tag("by") != own_address)
                    nodes_to_reflect.push_back(*stanza_id);
                }
              bridge->send_channel_message(iid, body->get_inner(), id, std::move(nodes_to_reflect));
            }

M tests/end_to_end/scenarios/stable_id.py => tests/end_to_end/scenarios/stable_id.py +10 -4
@@ 8,19 8,25 @@ scenario = (
    scenarios.simple_channel_join.scenario,

    send_stanza("""<message id='first_id' from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' type='groupchat'>
      <origin-id xmlns='urn:xmpp:sid:0' id='client-origin-id'/>
      <stanza-id xmlns='urn:xmpp:sid:0' id='client-stanza-id'/>
      <origin-id xmlns='urn:xmpp:sid:0' id='client-origin-id-should-be-kept'/>
      <stanza-id xmlns='urn:xmpp:sid:0' id='client-stanza-id-should-be-removed' by='#foo%{irc_server_one}'/>
      <stanza-id xmlns='urn:xmpp:sid:0' id='client-stanza-id-should-be-kept' by='someother@jid'/>
      <body>coucou</body></message>"""),

    # Entities, which are routing stanzas, SHOULD NOT strip any elements
    # qualified by the 'urn:xmpp:sid:0' namespace from message stanzas
    # unless the preceding rule applied to those elements.
    expect_stanza("/message/stable_id:origin-id[@id='client-origin-id']",
    expect_stanza("/message/stable_id:origin-id[@id='client-origin-id-should-be-kept']",
    # Stanza ID generating entities, which encounter a <stanza-id/>
    # element where the 'by' attribute matches the 'by' attribute they
    # would otherwise set, MUST delete that element even if they are not
    # adding their own stanza ID.
                  "/message/stable_id:stanza-id[@id][@by='#foo%{irc_server_one}']",
                  "!/message/stable_id:stanza-id[@id='client-stanza-id']",
                  "!/message/stable_id:stanza-id[@id='client-stanza-id-should-be-removed']",
    # Entities, which are routing stanzas, SHOULD NOT strip
    # any elements qualified by the 'urn:xmpp:sid:0'
    # namespace from message stanzas unless the preceding
    # rule applied to those elements.
                  "/message/stable_id:stanza-id[@id='client-stanza-id-should-be-kept'][@by='someother@jid']",
    ),
)