Commit f00f5c3f authored by louiz’'s avatar louiz’

Do not use exceptions for missing tags, improvement in code simplicity

parent a20c60a0
...@@ -87,7 +87,7 @@ int main() ...@@ -87,7 +87,7 @@ int main()
{ {
std::cout << stanza.to_string() << std::endl; std::cout << stanza.to_string() << std::endl;
assert(stanza.get_name() == "stream_ns:stanza"); assert(stanza.get_name() == "stream_ns:stanza");
assert(stanza["b"] == "c"); assert(stanza.get_tag("b") == "c");
assert(stanza.get_inner() == "inner"); assert(stanza.get_inner() == "inner");
assert(stanza.get_tail() == ""); assert(stanza.get_tail() == "");
assert(stanza.get_child("stream_ns:child1") != nullptr); assert(stanza.get_child("stream_ns:child1") != nullptr);
......
...@@ -135,11 +135,8 @@ void XmppComponent::clean() ...@@ -135,11 +135,8 @@ void XmppComponent::clean()
void XmppComponent::on_remote_stream_open(const XmlNode& node) void XmppComponent::on_remote_stream_open(const XmlNode& node)
{ {
log_debug("XMPP DOCUMENT OPEN: " << node.to_string()); log_debug("XMPP DOCUMENT OPEN: " << node.to_string());
try this->stream_id = node.get_tag("id");
{ if (this->stream_id.empty())
this->stream_id = node["id"];
}
catch (const AttributeNotFound& e)
{ {
log_error("Error: no attribute 'id' found"); log_error("Error: no attribute 'id' found");
this->send_stream_error("bad-format", "missing 'id' attribute"); this->send_stream_error("bad-format", "missing 'id' attribute");
...@@ -255,27 +252,27 @@ void XmppComponent::handle_handshake(const Stanza& stanza) ...@@ -255,27 +252,27 @@ void XmppComponent::handle_handshake(const Stanza& stanza)
void XmppComponent::handle_presence(const Stanza& stanza) void XmppComponent::handle_presence(const Stanza& stanza)
{ {
std::string from; std::string from = stanza.get_tag("from");
std::string id; std::string id = stanza.get_tag("id");
try { std::string to_str = stanza.get_tag("to");
id = stanza["id"]; std::string type = stanza.get_tag("type");
from = stanza["from"];
} catch (const AttributeNotFound&) {} // Check for mandatory tags
if (from.empty()) if (from.empty())
return; {
utils::ScopeGuard malformed_stanza_error([&](){ log_warning("Received an invalid presence stanza: tag 'from' is missing.");
return;
}
if (to_str.empty())
{
this->send_stanza_error("presence", from, this->served_hostname, id, this->send_stanza_error("presence", from, this->served_hostname, id,
"modify", "bad-request", ""); "modify", "bad-request", "Missing 'to' tag");
}); return;
Bridge* bridge = this->get_user_bridge(stanza["from"]); }
Jid to(stanza["to"]);
Bridge* bridge = this->get_user_bridge(from);
Jid to(to_str);
Iid iid(to.local); Iid iid(to.local);
std::string type;
try {
type = stanza["type"];
}
catch (const AttributeNotFound&) {}
malformed_stanza_error.disable();
// An error stanza is sent whenever we exit this function without // An error stanza is sent whenever we exit this function without
// disabling this scopeguard. If error_type and error_name are not // disabling this scopeguard. If error_type and error_name are not
...@@ -286,7 +283,7 @@ void XmppComponent::handle_presence(const Stanza& stanza) ...@@ -286,7 +283,7 @@ void XmppComponent::handle_presence(const Stanza& stanza)
std::string error_type("cancel"); std::string error_type("cancel");
std::string error_name("internal-server-error"); std::string error_name("internal-server-error");
utils::ScopeGuard stanza_error([&](){ utils::ScopeGuard stanza_error([&](){
this->send_stanza_error("presence", stanza["from"], stanza["to"], id, this->send_stanza_error("presence", from, to_str, id,
error_type, error_name, ""); error_type, error_name, "");
}); });
...@@ -309,41 +306,30 @@ void XmppComponent::handle_presence(const Stanza& stanza) ...@@ -309,41 +306,30 @@ void XmppComponent::handle_presence(const Stanza& stanza)
{ {
// An user wants to join an invalid IRC channel, return a presence error to him // An user wants to join an invalid IRC channel, return a presence error to him
if (type.empty()) if (type.empty())
this->send_invalid_room_error(to.local, to.resource, stanza["from"]); this->send_invalid_room_error(to.local, to.resource, from);
} }
stanza_error.disable(); stanza_error.disable();
} }
void XmppComponent::handle_message(const Stanza& stanza) void XmppComponent::handle_message(const Stanza& stanza)
{ {
std::string from; std::string from = stanza.get_tag("from");
std::string id; std::string id = stanza.get_tag("id");
try { std::string to_str = stanza.get_tag("to");
id = stanza["id"]; std::string type = stanza.get_tag("type");
from = stanza["from"];
} catch (const AttributeNotFound&) {}
if (from.empty()) if (from.empty())
return; return;
utils::ScopeGuard malformed_stanza_error([&](){ if (type.empty())
this->send_stanza_error("message", from, this->served_hostname, id,
"modify", "bad-request", "");
});
Bridge* bridge = this->get_user_bridge(stanza["from"]);
Jid to(stanza["to"]);
Iid iid(to.local);
std::string type;
try {
type = stanza["type"];
}
catch (const AttributeNotFound&) {
type = "normal"; type = "normal";
} Bridge* bridge = this->get_user_bridge(from);
malformed_stanza_error.disable(); Jid to(to_str);
Iid iid(to.local);
std::string error_type("cancel"); std::string error_type("cancel");
std::string error_name("internal-server-error"); std::string error_name("internal-server-error");
utils::ScopeGuard stanza_error([&](){ utils::ScopeGuard stanza_error([&](){
this->send_stanza_error("message", stanza["from"], stanza["to"], id, this->send_stanza_error("message", from, to_str, id,
error_type, error_name, ""); error_type, error_name, "");
}); });
XmlNode* body = stanza.get_child(COMPONENT_NS":body"); XmlNode* body = stanza.get_child(COMPONENT_NS":body");
...@@ -366,27 +352,27 @@ void XmppComponent::handle_message(const Stanza& stanza) ...@@ -366,27 +352,27 @@ void XmppComponent::handle_message(const Stanza& stanza)
void XmppComponent::handle_iq(const Stanza& stanza) void XmppComponent::handle_iq(const Stanza& stanza)
{ {
std::string id; std::string id = stanza.get_tag("id");
std::string from; std::string from = stanza.get_tag("from");
try { std::string to_str = stanza.get_tag("to");
id = stanza["id"]; std::string type = stanza.get_tag("type");
from = stanza["from"];
} catch (const AttributeNotFound&) {}
if (from.empty()) if (from.empty())
return; return;
utils::ScopeGuard malformed_stanza_error([&](){ if (id.empty() || to_str.empty() || type.empty())
{
this->send_stanza_error("iq", from, this->served_hostname, id, this->send_stanza_error("iq", from, this->served_hostname, id,
"modify", "bad-request", ""); "modify", "bad-request", "");
}); return;
Bridge* bridge = this->get_user_bridge(stanza["from"]); }
Jid to(stanza["to"]);
std::string type = stanza["type"]; Bridge* bridge = this->get_user_bridge(from);
malformed_stanza_error.disable(); Jid to(from);
std::string error_type("cancel"); std::string error_type("cancel");
std::string error_name("internal-server-error"); std::string error_name("internal-server-error");
utils::ScopeGuard stanza_error([&](){ utils::ScopeGuard stanza_error([&](){
this->send_stanza_error("iq", stanza["from"], stanza["to"], id, this->send_stanza_error("iq", from, to_str, id,
error_type, error_name, ""); error_type, error_name, "");
}); });
if (type == "set") if (type == "set")
...@@ -397,18 +383,8 @@ void XmppComponent::handle_iq(const Stanza& stanza) ...@@ -397,18 +383,8 @@ void XmppComponent::handle_iq(const Stanza& stanza)
const XmlNode* child = query->get_child(MUC_ADMIN_NS":item"); const XmlNode* child = query->get_child(MUC_ADMIN_NS":item");
if (child) if (child)
{ {
std::string nick; std::string nick = child->get_tag("nick");
std::string role; std::string role = child->get_tag("role");
try {
nick = (*child)["nick"];
role = (*child)["role"];
}
catch (const AttributeNotFound&)
{
error_type = "modify";
error_name = "bad-request";
return;
}
if (!nick.empty() && role == "none") if (!nick.empty() && role == "none")
{ {
std::string reason; std::string reason;
...@@ -418,6 +394,12 @@ void XmppComponent::handle_iq(const Stanza& stanza) ...@@ -418,6 +394,12 @@ void XmppComponent::handle_iq(const Stanza& stanza)
Iid iid(to.local); Iid iid(to.local);
bridge->send_irc_kick(iid, nick, reason); bridge->send_irc_kick(iid, nick, reason);
} }
else
{
error_type = "cancel";
error_name = "feature-not-implemented";
return;
}
} }
} }
} }
......
...@@ -216,7 +216,7 @@ bool XmlNode::has_children() const ...@@ -216,7 +216,7 @@ bool XmlNode::has_children() const
return !this->children.empty(); return !this->children.empty();
} }
const std::string& XmlNode::operator[](const std::string& name) const const std::string XmlNode::get_tag(const std::string& name) const
{ {
try try
{ {
...@@ -225,7 +225,7 @@ const std::string& XmlNode::operator[](const std::string& name) const ...@@ -225,7 +225,7 @@ const std::string& XmlNode::operator[](const std::string& name) const
} }
catch (const std::out_of_range& e) catch (const std::out_of_range& e)
{ {
throw AttributeNotFound(); return "";
} }
} }
......
...@@ -8,13 +8,6 @@ ...@@ -8,13 +8,6 @@
std::string xml_escape(const std::string& data); std::string xml_escape(const std::string& data);
std::string xml_unescape(const std::string& data); std::string xml_unescape(const std::string& data);
/**
* Raised on operator[] when the attribute does not exist
*/
class AttributeNotFound: public std::exception
{
};
/** /**
* Represent an XML node. It has * Represent an XML node. It has
* - A parent XML node (in the case of the first-level nodes, the parent is * - A parent XML node (in the case of the first-level nodes, the parent is
...@@ -103,10 +96,10 @@ public: ...@@ -103,10 +96,10 @@ public:
*/ */
bool has_children() const; bool has_children() const;
/** /**
* Gets the value for the given attribute, raises AttributeNotFound if the * Gets the value for the given attribute, returns an empty string if the
* node as no such attribute. * node as no such attribute.
*/ */
const std::string& operator[](const std::string& name) const; const std::string get_tag(const std::string& name) const;
/** /**
* Use this to set an attribute's value, like node["id"] = "12"; * Use this to set an attribute's value, like node["id"] = "12";
*/ */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment