psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

fippo contributes support for bidirectional xmpp s2s.. try it out using #define XMPP_BIDI

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2010-11-02 15:26:43 +01:00
parent eeeec5618b
commit cfbd6c8827
4 changed files with 147 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

68
world/net/jabber/active.c
View file

@ -11,6 +11,10 @@
#endif
inherit NET_PATH "jabber/mixin_render";
#ifdef XMPP_BIDI
inherit NET_PATH "jabber/mixin_parse";
#endif
// a derivate of circuit which knows JABBER
inherit NET_PATH "circuit";
@ -157,6 +161,13 @@ handle_stream_features(XMLNode node) {
return;
}
#endif
#ifdef XMPP_BIDI
if (node["/bidi"] && node["/bidi"]["@xmlns"] == "urn:xmpp:features:bidi") {
emitraw("<bidi xmlns='urn:xmpp:bidi'/>");
// we don't expect a reply
bidi = 1;
}
#endif
#ifdef WANT_S2S_SASL
// possibly authenticated via sasl?
if (authenticated && !node["/switch"]) {
@ -360,6 +371,9 @@ jabberMsg(XMLNode node) {
P2(("%O jabber/active got %O\n", ME, node[Tag]))
object o;
string t;
#ifdef XMPP_BIDI
mixed su, tu;
#endif
switch (node[Tag]) {
case "db:result":
/* 10: Receiving Server informs Originating Server of the result
@ -374,6 +388,9 @@ jabberMsg(XMLNode node) {
D0( log_file("XMPP_AUTH", "\n%O auth dialback", ME); )
#endif
authenticated = 1;
#ifdef XMPP_BIDI
// sAuthenticated?
#endif
runQ();
} else {
// else: queue failed
@ -475,9 +492,58 @@ jabberMsg(XMLNode node) {
o -> logon();
destruct(ME);
return;
#endif
#ifdef XMPP_BIDI
case "message":
case "presence":
case "iq":
if (!authenticated) {
// we have not authenticated with either sasl or dialback
P2(("xmpp bidi: we have not authenticated with either sasl or dialback\n"))
STREAM_ERROR("invalid-from", "")
return;
}
if (!bidi) {
P2(("xmpp bidi: we have not enabled bidi, so why...\n"))
STREAM_ERROR("invalid-from", "")
return;
}
// check from and to!
// for from: == hostname
P2(("xmpp bidi from %O to %O\n", node["@from"], node["@to"]))
su = parse_uniform(XMPP + node["@from"]);
unless (su) {
// jid-malformed?
P2(("xmpp bidi: could not parse su for %O", node["@from"]))
return;
}
// qAuthenticated(su[UHost]) ?
P2(("xmpp bidi: from host = %O, hostname = %O\n", su[UHost], hostname))
unless (su[UHost] == hostname) {
P2(("xmpp bidi: source host %O != hostname %O\n", su[UHost], hostname))
STREAM_ERROR("invalid-from", "")
return;
}
// for to: is_localhost
tu = parse_uniform(XMPP + node["@to"]);
unless (tu) {
// jid-malformed?
P2(("xmpp bidi: could not parse tu for %O", node["@to"]))
STREAM_ERROR("invalid-from", "")
return;
}
P2(("is_localhost(%O) = %O\n", tu[UHost], is_localhost(tu[UHost])))
if (!is_localhost(tu[UHost])) {
// ... ?
P2(("xmpp bidi: !is_localhost %O\n", node["@to"]))
STREAM_ERROR("invalid-from", "")
return;
}
return ::jabberMsg(node);
#endif
default:
P0(("%O: unexpected %O:%O\n", ME, node["@tag"],
P0(("%O: unexpected %O:%O\n", ME, node[Tag],
node["@xmlns"]))
break;
}