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

Don't error on Jingle file transfer hash session-info

Browse source
This commit is contained in:
hrxi 2019-08-26 17:30:47 +02:00
parent 6083f446b4
commit 6028fd15a8
3 changed files with 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
xmpp-vala/src/module/xep/0166_jingle.vala
View file

@ -47,12 +47,16 @@ public errordomain Error {
TRANSPORT_ERROR,
}
StanzaNode? get_single_node_anyns(StanzaNode parent, string node_name) throws IqError {
StanzaNode? get_single_node_anyns(StanzaNode parent, string? node_name = null) throws IqError {
StanzaNode? result = null;
foreach (StanzaNode child in parent.get_all_subnodes()) {
if (child.name == node_name) {
if (node_name == null || child.name == node_name) {
if (result != null) {
if (node_name != null) {
throw new IqError.BAD_REQUEST(@"multiple $(node_name) nodes");
} else {
throw new IqError.BAD_REQUEST(@"expected single subnode");
}
}
result = child;
}
@ -364,6 +368,7 @@ public interface ContentType : Object {
public abstract string content_type_ns_uri();
public abstract TransportType content_type_transport_type();
public abstract ContentParameters parse_content_parameters(StanzaNode description) throws IqError;
public abstract void handle_content_session_info(XmppStream stream, Session session, StanzaNode info, Iq.Stanza iq) throws IqError;
}
public interface ContentParameters : Object {
@ -445,25 +450,28 @@ public class Session {
// Validate action.
switch (action) {
case "session-accept":
case "session-info":
case "session-terminate":
case "transport-accept":
case "transport-info":
case "transport-reject":
case "transport-replace":
case "transport-info":
break;
case "content-accept":
case "content-add":
case "content-modify":
case "content-reject":
case "content-remove":
case "description-info":
case "security-info":
throw new IqError.NOT_IMPLEMENTED(@"$(action) is not implemented");
default:
throw new IqError.BAD_REQUEST("invalid action");
}
ContentNode? content = null;
StanzaNode? transport = null;
// Do some pre-processing.
if (action != "session-terminate") {
if (action != "session-info" && action != "session-terminate") {
content = get_single_content_node(jingle);
verify_content(content);
switch (action) {
@ -496,6 +504,9 @@ public class Session {
}
handle_session_accept(stream, content, jingle, iq);
break;
case "session-info":
handle_session_info(stream, jingle, iq);
break;
case "session-terminate":
handle_session_terminate(stream, jingle, iq);
break;
@ -563,6 +574,19 @@ public class Session {
stream.get_module(Iq.Module.IDENTITY).send_iq(stream, new Iq.Stanza.result(iq));
// TODO(hrxi): also handle presence type=unavailable
}
void handle_session_info(XmppStream stream, StanzaNode jingle, Iq.Stanza iq) throws IqError {
StanzaNode? info = get_single_node_anyns(jingle);
if (info == null) {
// Jingle session ping
stream.get_module(Iq.Module.IDENTITY).send_iq(stream, new Iq.Stanza.result(iq));
return;
}
ContentType? content_type = stream.get_module(Module.IDENTITY).get_content_type(info.ns_uri);
if (content_type == null) {
throw new IqError.UNSUPPORTED_INFO("unknown session-info namespace");
}
content_type.handle_content_session_info(stream, this, info, iq);
}
void select_new_transport(XmppStream stream) {
Transport? new_transport = stream.get_module(Module.IDENTITY).select_transport(stream, type_, peer_full_jid, tried_transport_methods);
if (new_transport == null) {

13
xmpp-vala/src/module/xep/0234_jingle_file_transfer.vala
View file

@ -24,6 +24,19 @@ public class Module : Jingle.ContentType, XmppStreamModule {
public Jingle.ContentParameters parse_content_parameters(StanzaNode description) throws Jingle.IqError {
return Parameters.parse(this, description);
}
public void handle_content_session_info(XmppStream stream, Jingle.Session session, StanzaNode info, Iq.Stanza iq) throws Jingle.IqError {
switch (info.name) {
case "received":
stream.get_module(Iq.Module.IDENTITY).send_iq(stream, new Iq.Stanza.result(iq));
break;
case "checksum":
// TODO(hrxi): handle hash
stream.get_module(Iq.Module.IDENTITY).send_iq(stream, new Iq.Stanza.result(iq));
break;
default:
throw new Jingle.IqError.UNSUPPORTED_INFO(@"unsupported file transfer info $(info.name)");
}
}
public signal void file_incoming(XmppStream stream, FileTransfer file_transfer);

2
xmpp-vala/src/module/xep/0260_jingle_socks5_bytestreams.vala
View file

@ -477,6 +477,8 @@ class Parameters : Jingle.TransportParameters, Object {
throw new IOError.PROXY_FAILED("wanted port 00 00, got %02x %02x".printf(read_buffer[5+dstaddr.length], read_buffer[5+dstaddr.length+1]));
}
conn.get_socket().set_timeout(0);
return conn;
}
public async void try_connecting_to_candidates(XmppStream stream, Jingle.Session session) throws Error {