anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #579 from hrxi/pr_errors

Browse source 
Add a couple of error primitives for easier error handling
This commit is contained in:
fiaxh 2019-06-21 19:49:17 +02:00 committed by GitHub
parent 34f9677c4e 57a7d165e9
commit 23a298dc4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 47 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
xmpp-vala/src/module/iq/module.vala
View file

@ -67,7 +67,7 @@ namespace Xmpp.Iq {
} }
} }
} else { } else {
Iq.Stanza unavailable_error = new Iq.Stanza.error(iq, new StanzaNode.build("service-unavailable", "urn:ietf:params:xml:ns:xmpp-stanzas").add_self_xmlns()); Iq.Stanza unavailable_error = new Iq.Stanza.error(iq, new ErrorStanza.service_unavailable());
send_iq(stream, unavailable_error); send_iq(stream, unavailable_error);
} }
} }
@ -83,8 +83,14 @@ namespace Xmpp.Iq {
} }
public interface Handler : Object { public interface Handler : Object {
public abstract void on_iq_get(XmppStream stream, Iq.Stanza iq); public virtual void on_iq_get(XmppStream stream, Iq.Stanza iq) {
public abstract void on_iq_set(XmppStream stream, Iq.Stanza iq); Iq.Stanza bad_request = new Iq.Stanza.error(iq, new ErrorStanza.bad_request("unexpected IQ get for this namespace"));
stream.get_module(Module.IDENTITY).send_iq(stream, bad_request);
}
public virtual void on_iq_set(XmppStream stream, Iq.Stanza iq) {
Iq.Stanza bad_request = new Iq.Stanza.error(iq, new ErrorStanza.bad_request("unexpected IQ set for this namespace"));
stream.get_module(Module.IDENTITY).send_iq(stream, bad_request);
}
} }
} }

9
xmpp-vala/src/module/iq/stanza.vala
View file

@ -30,17 +30,14 @@ public class Stanza : Xmpp.Stanza {
public Stanza.set(StanzaNode stanza_node, string? id = null) { public Stanza.set(StanzaNode stanza_node, string? id = null) {
this(id); this(id);
type_ = TYPE_SET; this.type_ = TYPE_SET;
stanza.put_node(stanza_node); stanza.put_node(stanza_node);
} }
public Stanza.error(Stanza request, StanzaNode error_stanza, StanzaNode? associated_child = null) { public Stanza.error(Stanza request, ErrorStanza error_stanza) {
this(request.id); this(request.id);
this.type_ = TYPE_ERROR; this.type_ = TYPE_ERROR;
stanza.put_node(error_stanza); stanza.put_node(error_stanza.error_node);
if (associated_child != null) {
stanza.put_node(associated_child);
}
} }
public Stanza.from_stanza(StanzaNode stanza_node, Jid? my_jid) { public Stanza.from_stanza(StanzaNode stanza_node, Jid? my_jid) {
base.incoming(stanza_node, my_jid); base.incoming(stanza_node, my_jid);

2
xmpp-vala/src/module/roster/module.vala
View file

@ -66,8 +66,6 @@ public class Module : XmppStreamModule, Iq.Handler {
} }
} }
public void on_iq_get(XmppStream stream, Iq.Stanza iq) { }
public override void attach(XmppStream stream) { public override void attach(XmppStream stream) {
stream.get_module(Iq.Module.IDENTITY).register_for_namespace(NS_URI, this); stream.get_module(Iq.Module.IDENTITY).register_for_namespace(NS_URI, this);
stream.get_module(Presence.Module.IDENTITY).initial_presence_sent.connect(roster_get); stream.get_module(Presence.Module.IDENTITY).initial_presence_sent.connect(roster_get);

43
xmpp-vala/src/module/stanza_error.vala
View file

@ -2,6 +2,8 @@ using Gee;
namespace Xmpp { namespace Xmpp {
private const string ERROR_NS_URI = "urn:ietf:params:xml:ns:xmpp-stanzas";
public class ErrorStanza { public class ErrorStanza {
public const string CONDITION_BAD_REQUEST = "bad-request"; public const string CONDITION_BAD_REQUEST = "bad-request";
public const string CONDITION_CONFLICT = "conflict"; public const string CONDITION_CONFLICT = "conflict";
@ -37,14 +39,14 @@ namespace Xmpp {
} }
public string? text { public string? text {
get { return error_node.get_deep_string_content("urn:ietf:params:xml:ns:xmpp-stanzas:text"); } get { return error_node.get_deep_string_content(ERROR_NS_URI + ":text"); }
} }
public string condition { public string condition {
get { get {
Gee.List<StanzaNode> subnodes = error_node.sub_nodes; Gee.List<StanzaNode> subnodes = error_node.sub_nodes;
foreach (StanzaNode subnode in subnodes) { // TODO get subnode by ns foreach (StanzaNode subnode in subnodes) { // TODO get subnode by ns
if (subnode.ns_uri == "urn:ietf:params:xml:ns:xmpp-stanzas") { if (subnode.ns_uri == ERROR_NS_URI) {
return subnode.name; return subnode.name;
} }
} }
@ -52,20 +54,45 @@ namespace Xmpp {
} }
} }
public string? original_id {
get { return stanza.get_attribute("id"); }
}
public string type_ { public string type_ {
get { return error_node.get_attribute("type"); } get { return error_node.get_attribute("type"); }
} }
public StanzaNode stanza;
public StanzaNode error_node; public StanzaNode error_node;
public ErrorStanza.from_stanza(StanzaNode stanza) { public ErrorStanza.from_stanza(StanzaNode stanza) {
this.stanza = stanza;
error_node = stanza.get_subnode("error"); error_node = stanza.get_subnode("error");
} }
public ErrorStanza.build(string type, string condition, string? human_readable, StanzaNode? application_condition) {
error_node = new StanzaNode.build("error")
.put_attribute("type", type)
.put_node(new StanzaNode.build(condition, ERROR_NS_URI).add_self_xmlns());
if (application_condition != null) {
error_node.put_node(application_condition);
}
if (human_readable != null) {
error_node.put_node(new StanzaNode.build("text", ERROR_NS_URI)
.add_self_xmlns()
.put_attribute("xml:lang", "en")
.put_node(new StanzaNode.text(text))
);
}
}
public ErrorStanza.bad_request(string? human_readable = null) {
this.build(TYPE_MODIFY, CONDITION_BAD_REQUEST, human_readable, null);
}
public ErrorStanza.feature_not_implemented(StanzaNode? application_condition = null) {
this.build(TYPE_MODIFY, CONDITION_FEATURE_NOT_IMPLEMENTED, null, application_condition);
}
public ErrorStanza.item_not_found(StanzaNode? application_condition = null) {
this.build(TYPE_CANCEL, CONDITION_ITEM_NOT_FOUND, null, application_condition);
}
public ErrorStanza.not_acceptable(string? human_readable = null) {
this.build(TYPE_MODIFY, CONDITION_NOT_ACCEPTABLE, human_readable, null);
}
public ErrorStanza.service_unavailable() {
this.build(TYPE_CANCEL, CONDITION_SERVICE_UNAVAILABLE, null, null);
}
} }
} }

2
xmpp-vala/src/module/xep/0030_service_discovery/module.vala
View file

@ -66,8 +66,6 @@ public class Module : XmppStreamModule, Iq.Handler {
} }
} }
public void on_iq_set(XmppStream stream, Iq.Stanza iq) { }
public override void attach(XmppStream stream) { public override void attach(XmppStream stream) {
stream.add_flag(new Flag()); stream.add_flag(new Flag());
stream.get_module(Iq.Module.IDENTITY).register_for_namespace(NS_URI_INFO, this); stream.get_module(Iq.Module.IDENTITY).register_for_namespace(NS_URI_INFO, this);

1
xmpp-vala/src/module/xep/0191_blocking_command.vala
View file

@ -45,7 +45,6 @@ public class Module : XmppStreamModule, Iq.Handler {
return stream.has_flag(Flag.IDENTITY); return stream.has_flag(Flag.IDENTITY);
} }
private void on_iq_get(XmppStream stream, Iq.Stanza iq) { }
private void on_iq_set(XmppStream stream, Iq.Stanza iq) { private void on_iq_set(XmppStream stream, Iq.Stanza iq) {
StanzaNode? block_node = iq.stanza.get_subnode("block", NS_URI); StanzaNode? block_node = iq.stanza.get_subnode("block", NS_URI);
StanzaNode? unblock_node = iq.stanza.get_subnode("unblock", NS_URI); StanzaNode? unblock_node = iq.stanza.get_subnode("unblock", NS_URI);

1
xmpp-vala/src/module/xep/0199_ping.vala
View file

@ -27,7 +27,6 @@ namespace Xmpp.Xep.Ping {
public void on_iq_get(XmppStream stream, Iq.Stanza iq) { public void on_iq_get(XmppStream stream, Iq.Stanza iq) {
stream.get_module(Iq.Module.IDENTITY).send_iq(stream, new Iq.Stanza.result(iq)); stream.get_module(Iq.Module.IDENTITY).send_iq(stream, new Iq.Stanza.result(iq));
} }
public void on_iq_set(XmppStream stream, Iq.Stanza iq) { }
public override string get_ns() { return NS_URI; } public override string get_ns() { return NS_URI; }
public override string get_id() { return IDENTITY.id; } public override string get_id() { return IDENTITY.id; }