From d88f14a66d67b91cf30250c7031c4277f4373201 Mon Sep 17 00:00:00 2001 From: Ivan-lis Date: Mon, 18 Nov 2024 23:04:57 +0000 Subject: [PATCH] Fixed errors and improve roster tests --- library/include/larra/bind.hpp | 3 -- library/include/larra/client/client.hpp | 47 ++++++++++++++++--------- library/include/larra/iq.hpp | 28 ++++++++++----- library/include/larra/jid.hpp | 5 +-- library/include/larra/roster.hpp | 8 ++--- library/include/larra/stream_error.hpp | 26 ++++++++++++-- library/include/larra/utils.hpp | 2 +- tests/roster.cpp | 21 +++++------ 8 files changed, 89 insertions(+), 51 deletions(-) diff --git a/library/include/larra/bind.hpp b/library/include/larra/bind.hpp index ccc2a57..bdbdb90 100644 --- a/library/include/larra/bind.hpp +++ b/library/include/larra/bind.hpp @@ -47,7 +47,4 @@ using SetBind = Set; using ResultBind = Result; using IqBind = Iq; -inline auto MakeSetBind() { - return SetBind{.id = "1", .payload = Bind{}}; -} } // namespace larra::xmpp::iq diff --git a/library/include/larra/client/client.hpp b/library/include/larra/client/client.hpp index ba80489..9b9890b 100644 --- a/library/include/larra/client/client.hpp +++ b/library/include/larra/client/client.hpp @@ -80,21 +80,35 @@ struct Client { auto CreateResourceBind() -> boost::asio::awaitable { SPDLOG_INFO("Send IQ: Set::Bind"); - co_await this->Send(::iq::MakeSetBind()); + co_await this->Send(::iq::SetBind{.id = "1", .payload = {}}); - auto bind_result = co_await connection.template Read<::iq::ResultBind>(); - jid.resource = std::move(bind_result.payload.jid->resource); + auto set_bind_response = co_await connection.template Read>(); + std::visit(utempl::Overloaded( + [](auto error) { + throw "Error response on IQ: Set::Bind: ''"; // TODO(unknown): Add exact error parsing + }, + [&](::iq::ResultBind r) { + jid.resource = std::move(r.payload.jid->resource); + SPDLOG_INFO("Allocated resource: {}", jid.resource); + }), + set_bind_response); co_return; } auto UpdateListOfContacts() -> boost::asio::awaitable { SPDLOG_INFO("Send IQ: Get::Roster"); - co_await this->Send(::iq::MakeGetRoster(jid)); + co_await this->Send(::iq::GetRoster{.id = "1", .from = std::format("{}@{}", "invalid_user", jid.server), .payload = {}}); - const auto roster_result = co_await connection.template Read<::iq::ResultRoster>(); - roster = std::move(roster_result.payload); - - SPDLOG_INFO("New roster: {}", ToString(roster)); + const auto get_roster_response = co_await connection.template Read>(); + std::visit(utempl::Overloaded( + [](auto error) { + throw "Error response on IQ: Get::Roster: ''"; // TODO(unknown): Add exact error parsing + }, + [&](::iq::ResultRoster r) { + roster = std::move(r.payload); + SPDLOG_INFO("New roster: {}", ToString(roster)); + }), + get_roster_response); co_return; } @@ -143,14 +157,15 @@ struct Challenge { throw std::runtime_error(std::format("Invalid name {} for challenge", node->get_name())); } std::string decoded = DecodeBase64(node->get_first_child_text()->get_content()); - auto params = std::views::split(decoded, ',') | std::views::transform([](auto param) { - return std::string_view{param}; - }) | - std::views::transform([](std::string_view param) -> std::pair { - auto v = param.find("="); - return {param.substr(0, v), param.substr(v + 1)}; - }) | - std::ranges::to>(); + auto params = std::views::split(decoded, ',') // + | std::views::transform([](auto param) { // + return std::string_view{param}; // + }) // + | std::views::transform([](std::string_view param) -> std::pair { // + auto v = param.find("="); // + return {param.substr(0, v), param.substr(v + 1)}; // + }) // + | std::ranges::to>(); return {.body = std::move(decoded), .serverNonce = params.at("r"), .salt = DecodeBase64(params.at("s")), diff --git a/library/include/larra/iq.hpp b/library/include/larra/iq.hpp index 5efd612..7a3a811 100644 --- a/library/include/larra/iq.hpp +++ b/library/include/larra/iq.hpp @@ -37,10 +37,10 @@ struct BaseImplWithPayload { friend constexpr auto operator<<(xmlpp::Element* element, const BaseImplWithPayload& self) { element->set_attribute("id", self.id); - if (self.to) { + if(self.to) { element->set_attribute("to", *self.to); } - if (self.from) { + if(self.from) { element->set_attribute("from", *self.from); } element->set_attribute("type", kName); @@ -48,6 +48,19 @@ struct BaseImplWithPayload { S::Serialize(element->add_child_element(S::kDefaultName, S::kPrefix), self.payload); } + [[nodiscard]] static constexpr auto TryParse(xmlpp::Element* element) -> std::optional { + return [&] -> std::optional { + auto node = element->get_attribute("type"); + if(!node) { + return std::nullopt; + } + if(node->get_value() != Name) { + return std::nullopt; + } + return Parse(element); + }(); + } + [[nodiscard]] static constexpr auto Parse(xmlpp::Element* element) -> BaseImplWithPayload { auto node = element->get_attribute("type"); if(!node) { @@ -62,7 +75,6 @@ struct BaseImplWithPayload { } auto from = element->get_attribute("from"); auto to = element->get_attribute("to"); - using S = Serialization; auto payload = element->get_first_child(S::kDefaultName); @@ -73,13 +85,13 @@ struct BaseImplWithPayload { if(!payload2) { throw std::runtime_error("Invalid payload for parse Iq"); } - return { - .id = idNode->get_value(), - .from = (from ? std::optional{from->get_value()} : std::nullopt), - .to = (to ? std::optional{to->get_value()} : std::nullopt), - .payload = S::Parse(payload2)}; + return {.id = idNode->get_value(), + .from = (from ? std::optional{from->get_value()} : std::nullopt), + .to = (to ? std::optional{to->get_value()} : std::nullopt), + .payload = S::Parse(payload2)}; } }; + static constexpr auto kGetName = "get"; template diff --git a/library/include/larra/jid.hpp b/library/include/larra/jid.hpp index 1ea3cd8..34dcad4 100644 --- a/library/include/larra/jid.hpp +++ b/library/include/larra/jid.hpp @@ -54,9 +54,10 @@ struct FullJid { struct BareJid { std::string username; std::string server; - constexpr operator FullJid() const { - return FullJid{.username = username, .server = server, .resource = ""}; + constexpr operator FullJid(this auto&& self) { + return {.username = std::forward_like(self.username), .server = std::forward_like(self.server)}; } + [[nodiscard]] static auto Parse(std::string_view jid) -> BareJid; friend auto ToString(const BareJid& jid) -> std::string; diff --git a/library/include/larra/roster.hpp b/library/include/larra/roster.hpp index b1e6350..c0635da 100644 --- a/library/include/larra/roster.hpp +++ b/library/include/larra/roster.hpp @@ -38,9 +38,9 @@ struct Roster { } friend constexpr auto operator<<(xmlpp::Element* element, const Roster& roster) { element->set_attribute("xmlns", Roster::kDefaultNamespace); - std::ranges::for_each(roster.items, [element](const auto& item) { + for(const auto& item : roster.items) { element->add_child_element("item")->set_attribute("jid", ToString(item)); - }); + } } [[nodiscard]] static constexpr auto Parse(xmlpp::Element* element) -> Roster { const auto& item_nodes = element->get_children("item"); @@ -69,8 +69,4 @@ using GetRoster = Get; using ResultRoster = Result; using IqRoster = Iq; -inline auto MakeGetRoster(const FullJid& jid) { - return GetRoster{.id = "1", .from = ToString(jid), .payload = Roster{}}; -} - } // namespace larra::xmpp::iq diff --git a/library/include/larra/stream_error.hpp b/library/include/larra/stream_error.hpp index 4a6615c..0279006 100644 --- a/library/include/larra/stream_error.hpp +++ b/library/include/larra/stream_error.hpp @@ -73,6 +73,25 @@ struct ErrorImpl : BaseError { } }; +// Helper class to prevent parsing response stream into an expected return type if its name is a 'stream:error' +struct UnknownXmppError : BaseError { + static constexpr auto kDefaultName = "stream:error"; + static constexpr std::string_view kErrorMessage = "Unknown XMPP stream error"; + + static constexpr auto TryParse(xmlpp::Element* element) { + return std::optional{UnknownXmppError{}}; + } + static constexpr auto Parse(xmlpp::Element* element) { + return TryParse(element).value(); + } + friend constexpr auto operator<<(xmlpp::Element* element, const UnknownXmppError& obj) -> void { + throw std::format("'{}' must never be written into the real stream!", kErrorMessage); + } + [[nodiscard]] constexpr auto what() const noexcept -> const char* override { + return kErrorMessage.data(); + } +}; + struct BadFormat : ErrorImpl {}; struct BadNamespacePrefix : ErrorImpl {}; struct Conflict : ErrorImpl {}; @@ -81,7 +100,7 @@ struct HostGone : ErrorImpl {}; struct HostUnknown : ErrorImpl {}; struct ImproperAdressing : ErrorImpl {}; struct InternalServerError : ErrorImpl {}; -struct InvalidForm : ErrorImpl {}; +struct InvalidFrom : ErrorImpl {}; struct InvalidNamespace : ErrorImpl {}; struct InvalidXml : ErrorImpl {}; struct NotAuthorized : ErrorImpl {}; @@ -109,7 +128,7 @@ using StreamError = std::variant; + error::stream::UnsupportedVersion, + error::stream::UnknownXmppError>; } // namespace larra::xmpp diff --git a/library/include/larra/utils.hpp b/library/include/larra/utils.hpp index f3a702e..214e676 100644 --- a/library/include/larra/utils.hpp +++ b/library/include/larra/utils.hpp @@ -297,7 +297,7 @@ struct RangeToWrapper : T { template concept LengthCalculatable = requires(const T& obj) { - { obj.length() } -> std::convertible_to; // Checks if obj has a length() method returning a type convertible to std::size_t + { obj.length() } -> std::convertible_to; } || std::convertible_to; template diff --git a/tests/roster.cpp b/tests/roster.cpp index f6b6c45..b30e15b 100644 --- a/tests/roster.cpp +++ b/tests/roster.cpp @@ -1,17 +1,13 @@ #include +#include #include -#include "larra/jid.hpp" - namespace larra::xmpp { TEST(Roster, SerializeAndParse) { FullJid jid{.username = "test", .server = "server", .resource = "res"}; // NOLINT - auto roster = iq::MakeGetRoster(jid); - roster.payload.items.emplace_back("u1", "s1"); - roster.payload.items.emplace_back("u2", "s2"); - roster.payload.items.emplace_back("u3", "s3"); + auto roster = iq::GetRoster{.id = "1", .from = ToString(jid), .payload = iq::Roster{.items = {{"u1", "s1"}, {"u2", "s2"}, {"u3", "s3"}}}}; xmlpp::Document doc; auto node = doc.create_root_node("iq"); @@ -22,18 +18,19 @@ TEST(Roster, SerializeAndParse) { ASSERT_EQ(roster.payload.items.size(), parse_res.payload.items.size()); for(const auto& [idx, expect_el, parsed_el] : std::views::zip(std::views::iota(0), roster.payload.items, parse_res.payload.items)) { EXPECT_EQ(expect_el, parsed_el) << "Mismatched on idx: " << idx; - // std::cerr << " " << "idx: " << idx << "; expect_el: " << expect_el << "; parsed_el: " << parsed_el << '\n'; } } +static constexpr std::string_view kRosterPrintExpectedData = "Roster: [\n\tu1@s1\n\tu2@s2\n\tu3@s3\n\t]"; TEST(Roster, Print) { FullJid jid{.username = "test", .server = "server", .resource = "res"}; // NOLINT - auto roster = iq::MakeGetRoster(jid); - roster.payload.items.emplace_back("u1", "s1"); - roster.payload.items.emplace_back("u2", "s2"); - roster.payload.items.emplace_back("u3", "s3"); + auto roster = iq::GetRoster{.id = "1", .from = ToString(jid), .payload = iq::Roster{.items = {{"u1", "s1"}, {"u2", "s2"}, {"u3", "s3"}}}}; - EXPECT_NO_THROW({ std::cerr << "[ ] Roster payload: " << ToString(roster.payload) << '\n'; }); + EXPECT_NO_THROW({ + auto roster_str = ToString(roster.payload); + EXPECT_EQ(kRosterPrintExpectedData.length(), roster_str.capacity()); + EXPECT_EQ(kRosterPrintExpectedData, roster_str); + }); } } // namespace larra::xmpp