From 162e3fb849f47089ad6114041374d66d48638db3 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 23 Oct 2008 19:10:16 +0100 Subject: No need to comment out s2s in this branch --- core/stanza_router.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/stanza_router.lua') diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 3814ffdf..f18e706d 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -9,7 +9,7 @@ local log = require "util.logger".init("stanzarouter") local st = require "util.stanza"; local send = require "core.sessionmanager".send_to_session; --- local send_s2s = require "core.s2smanager".send_to_host; +local send_s2s = require "core.s2smanager".send_to_host; local user_exists = require "core.usermanager".user_exists; local jid_split = require "util.jid".split; -- cgit v1.2.3 From eb8e9997e03f6b0c399af0a6f88ee85684c74d06 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 24 Oct 2008 03:06:55 +0100 Subject: dialback keys now verified --- core/stanza_router.lua | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'core/stanza_router.lua') diff --git a/core/stanza_router.lua b/core/stanza_router.lua index f18e706d..fd62a18e 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -12,6 +12,10 @@ local send = require "core.sessionmanager".send_to_session; local send_s2s = require "core.s2smanager".send_to_host; local user_exists = require "core.usermanager".user_exists; +local s2s_verify_dialback = require "core.s2smanager".verify_dialback; +local format = string.format; +local tostring = tostring; + local jid_split = require "util.jid".split; local print = print; @@ -33,10 +37,11 @@ function core_process_stanza(origin, stanza) end local to = stanza.attr.to; - stanza.attr.from = origin.full_jid; -- quick fix to prevent impersonation (FIXME this would be incorrect when the origin is not c2s) -- TODO also, stazas should be returned to their original state before the function ends + if origin.type == "c2s" then + stanza.attr.from = origin.full_jid; -- quick fix to prevent impersonation (FIXME this would be incorrect when the origin is not c2s) + end - -- TODO presence subscriptions if not to then core_handle_stanza(origin, stanza); elseif hosts[to] and hosts[to].type == "local" then @@ -90,6 +95,22 @@ function core_handle_stanza(origin, stanza) log("debug", "Routing stanza to local"); handle_stanza(session, stanza); end + elseif origin.type == "s2sin_unauthed" then + if stanza.name == "verify" and stanza.attr.xmlns == "jabber:server:dialback" then + log("debug", "verifying dialback key..."); + local attr = stanza.attr; + print(tostring(attr.to), tostring(attr.from)) + print(tostring(origin.to_host), tostring(origin.from_host)) + -- FIXME: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34 + --if attr.from ~= origin.to_host then error("invalid-from"); end + local type = "invalid"; + if s2s_verify_dialback(attr.id, attr.from, attr.to, stanza[1]) then + type = "valid" + end + origin.send(format("%s", attr.to, attr.from, attr.id, type, stanza[1])); + end + else + log("warn", "Unhandled origin: %s", origin.type); end end -- cgit v1.2.3 From 8fa7f063020263100d17978e2c97f9441d9db337 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 24 Oct 2008 03:42:26 +0100 Subject: working outgoing s2s \o/ --- core/stanza_router.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'core/stanza_router.lua') diff --git a/core/stanza_router.lua b/core/stanza_router.lua index fd62a18e..215b01a0 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -13,6 +13,7 @@ local send_s2s = require "core.s2smanager".send_to_host; local user_exists = require "core.usermanager".user_exists; local s2s_verify_dialback = require "core.s2smanager".verify_dialback; +local s2s_make_authenticated = require "core.s2smanager".make_authenticated; local format = string.format; local tostring = tostring; @@ -109,6 +110,15 @@ function core_handle_stanza(origin, stanza) end origin.send(format("%s", attr.to, attr.from, attr.id, type, stanza[1])); end + elseif origin.type == "s2sout_unauthed" then + if stanza.name == "result" and stanza.attr.xmlns == "jabber:server:dialback" then + if stanza.attr.type == "valid" then + s2s_make_authenticated(origin); + else + -- FIXME + error("dialback failed!"); + end + end else log("warn", "Unhandled origin: %s", origin.type); end @@ -208,6 +218,8 @@ function core_route_stanza(origin, stanza) end else -- Remote host + log("debug", "sending s2s stanza: %s", tostring(stanza)); + stanza.attr.xmlns = "jabber:server"; send_s2s(origin.host, host, stanza); end stanza.attr.to = to; -- reset -- cgit v1.2.3 From 5031be1f8cb3a5a8785c07c5e4c5802913c209f6 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 24 Oct 2008 06:13:38 +0100 Subject: working incoming s2s \o/ --- core/stanza_router.lua | 71 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 18 deletions(-) (limited to 'core/stanza_router.lua') diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 215b01a0..2399c25f 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -51,6 +51,8 @@ function core_process_stanza(origin, stanza) core_handle_stanza(origin, stanza); elseif origin.type == "c2s" then core_route_stanza(origin, stanza); + elseif origin.type == "s2sin" then + core_deliver_stanza(origin, stanza); end end @@ -97,26 +99,52 @@ function core_handle_stanza(origin, stanza) handle_stanza(session, stanza); end elseif origin.type == "s2sin_unauthed" then - if stanza.name == "verify" and stanza.attr.xmlns == "jabber:server:dialback" then - log("debug", "verifying dialback key..."); - local attr = stanza.attr; - print(tostring(attr.to), tostring(attr.from)) - print(tostring(origin.to_host), tostring(origin.from_host)) - -- FIXME: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34 - --if attr.from ~= origin.to_host then error("invalid-from"); end - local type = "invalid"; - if s2s_verify_dialback(attr.id, attr.from, attr.to, stanza[1]) then - type = "valid" + if stanza.attr.xmlns == "jabber:server:dialback" then + if stanza.name == "verify" then + -- We are being asked to verify the key, to ensure it was generated by us + log("debug", "verifying dialback key..."); + local attr = stanza.attr; + print(tostring(attr.to), tostring(attr.from)) + print(tostring(origin.to_host), tostring(origin.from_host)) + -- FIXME: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34 + --if attr.from ~= origin.to_host then error("invalid-from"); end + local type = "invalid"; + if s2s_verify_dialback(attr.id, attr.from, attr.to, stanza[1]) then + type = "valid" + end + origin.send(format("%s", attr.to, attr.from, attr.id, type, stanza[1])); + elseif stanza.name == "result" then + -- We need to check the key with the Authoritative server + local attr = stanza.attr; + origin.from_host = attr.from; + origin.to_host = attr.to; + origin.dialback_key = stanza[1]; + log("debug", "asking %s if key %s belongs to them", attr.from, stanza[1]); + send_s2s(attr.to, attr.from, format("%s", attr.to, attr.from, origin.streamid, stanza[1])); + hosts[attr.from].dialback_verifying = origin; end - origin.send(format("%s", attr.to, attr.from, attr.id, type, stanza[1])); end - elseif origin.type == "s2sout_unauthed" then - if stanza.name == "result" and stanza.attr.xmlns == "jabber:server:dialback" then - if stanza.attr.type == "valid" then - s2s_make_authenticated(origin); - else - -- FIXME - error("dialback failed!"); + elseif origin.type == "s2sout_unauthed" or origin.type == "s2sout" then + if stanza.attr.xmlns == "jabber:server:dialback" then + if stanza.name == "result" then + if stanza.attr.type == "valid" then + s2s_make_authenticated(origin); + else + -- FIXME + error("dialback failed!"); + end + elseif stanza.name == "verify" and origin.dialback_verifying then + local valid; + local attr = stanza.attr; + if attr.type == "valid" then + s2s_make_authenticated(origin.dialback_verifying); + valid = "valid"; + else + -- Warn the original connection that is was not verified successfully + log("warn", "dialback for "..(origin.dialback_verifying.from_host or "(unknown)").." failed"); + valid = "invalid"; + end + origin.dialback_verifying.send(format("%s", attr.from, attr.to, attr.id, valid, origin.dialback_verifying.dialback_key)); end end else @@ -225,6 +253,13 @@ function core_route_stanza(origin, stanza) stanza.attr.to = to; -- reset end +function core_deliver_stanza(origin, stanza) + local name, attr = stanza.name, stanza.attr; + if name == "message" then + + end +end + function handle_stanza_toremote(stanza) log("error", "Stanza bound for remote host, but s2s is not implemented"); end -- cgit v1.2.3 From 5c90ffdf7e7c7d784ed5f60eed3f8a2666c117f8 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 24 Oct 2008 07:27:36 +0100 Subject: s2s works! \o/ \o/ --- core/stanza_router.lua | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'core/stanza_router.lua') diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 2399c25f..905de6e3 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -26,7 +26,7 @@ function core_process_stanza(origin, stanza) if stanza.name == "iq" and not(#stanza.tags == 1 and stanza.tags[1].attr.xmlns) then if stanza.attr.type == "set" or stanza.attr.type == "get" then error("Invalid IQ"); - elseif #stanza.tags > 1 or not(stanza.attr.type == "error" or stanza.attr.type == "result") then + elseif #stanza.tags > 1 and not(stanza.attr.type == "error" or stanza.attr.type == "result") then error("Invalid IQ"); end end @@ -49,10 +49,8 @@ function core_process_stanza(origin, stanza) core_handle_stanza(origin, stanza); elseif stanza.name == "iq" and not select(3, jid_split(to)) then core_handle_stanza(origin, stanza); - elseif origin.type == "c2s" then + elseif origin.type == "c2s" or origin.type == "s2sin" then core_route_stanza(origin, stanza); - elseif origin.type == "s2sin" then - core_deliver_stanza(origin, stanza); end end @@ -98,7 +96,7 @@ function core_handle_stanza(origin, stanza) log("debug", "Routing stanza to local"); handle_stanza(session, stanza); end - elseif origin.type == "s2sin_unauthed" then + elseif origin.type == "s2sin_unauthed" or origin.type == "s2sin" then if stanza.attr.xmlns == "jabber:server:dialback" then if stanza.name == "verify" then -- We are being asked to verify the key, to ensure it was generated by us @@ -113,7 +111,8 @@ function core_handle_stanza(origin, stanza) type = "valid" end origin.send(format("%s", attr.to, attr.from, attr.id, type, stanza[1])); - elseif stanza.name == "result" then + elseif stanza.name == "result" and origin.type == "s2sin_unauthed" then + -- he wants to be identified through dialback -- We need to check the key with the Authoritative server local attr = stanza.attr; origin.from_host = attr.from; @@ -244,22 +243,18 @@ function core_route_stanza(origin, stanza) end end end - else + elseif origin.type == "c2s" then -- Remote host + --stanza.attr.xmlns = "jabber:server"; + stanza.attr.xmlns = nil; log("debug", "sending s2s stanza: %s", tostring(stanza)); - stanza.attr.xmlns = "jabber:server"; send_s2s(origin.host, host, stanza); + else + log("warn", "received stanza from unhandled connection type: %s", origin.type); end stanza.attr.to = to; -- reset end -function core_deliver_stanza(origin, stanza) - local name, attr = stanza.name, stanza.attr; - if name == "message" then - - end -end - function handle_stanza_toremote(stanza) log("error", "Stanza bound for remote host, but s2s is not implemented"); end -- cgit v1.2.3