Merged with trunk

[prosody.git] / net / xmppclient_listener.lua

diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index e54445b035433724f4c682266ac51ab3c74db2e5..5e1a1ba328f8df27ce5a916ddec5cd72316af8bd 100644 (file)
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -1,25 +1,15 @@
--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM v0.4
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
 
 
 local logger = require "logger";
+local log = logger.init("xmppclient_listener");
 local lxp = require "lxp"
 local init_xmlhandlers = require "core.xmlhandlers"
 local sm_new_session = require "core.sessionmanager".new_session;
@@ -31,23 +21,27 @@ local t_concat = table.concat;
 local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end
 local m_random = math.random;
 local format = string.format;
-local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session");
+local sessionmanager = require "core.sessionmanager";
+local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session;
 local sm_streamopened = sessionmanager.streamopened;
 local sm_streamclosed = sessionmanager.streamclosed;
-local st = stanza;
+local st = require "util.stanza";
 
-local stream_callbacks = { ns = "http://etherx.jabber.org/streams", streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza };
+local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream", 
+               default_ns = "jabber:client",
+               streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza };
 
 function stream_callbacks.error(session, error, data)
        if error == "no-stream" then
+               session.log("debug", "Invalid opening stream header");
                session:close("invalid-namespace");
-       else
-               session.log("debug", "Client XML parse error: %s", tostring(error));
+       elseif session.close then
+               (session.log or log)("debug", "Client XML parse error: %s", tostring(error));
                session:close("xml-not-well-formed");
        end
 end
 
-local function handleerr(err) log("error", "Traceback[c2s]:", err, debug.traceback()); end
+local function handleerr(err) log("error", "Traceback[c2s]: %s: %s", tostring(err), debug.traceback()); end
 function stream_callbacks.handlestanza(a, b)
        xpcall(function () core_process_stanza(a, b) end, handleerr);
 end
@@ -101,7 +95,7 @@ local function session_close(session, reason)
                end
                session.send("</stream:stream>");
                session.conn.close();
-               xmppclient.disconnect(session.conn, "stream error");
+               xmppclient.disconnect(session.conn, reason.condition or reason or "session closed");
        end
 end
 
@@ -121,12 +115,17 @@ function xmppclient.listener(conn, data)
                
                session.log("info", "Client connected");
                
+               -- Client is using legacy SSL (otherwise mod_tls sets this flag)
+               if conn.ssl() then
+                       session.secure = true;
+               end
+               
                session.reset_stream = session_reset_stream;
                session.close = session_close;
                
                session_reset_stream(session); -- Initialise, ready for use
                
-               session.stanza_dispatch = stream_callbacks.handlestanza;
+               session.dispatch_stanza = stream_callbacks.handlestanza;
        end
        if data then
                session.data(conn, data);
@@ -137,7 +136,7 @@ function xmppclient.disconnect(conn, err)
        local session = sessions[conn];
        if session then
                (session.log or log)("info", "Client disconnected: %s", err);
-               sm_destroy_session(session);
+               sm_destroy_session(session, err);
                sessions[conn]  = nil;
                session = nil;
                collectgarbage("collect");