mod_s2s: Log certificate identity validation result

[prosody.git] / util / xmppstream.lua

diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index cf485daceb5e1000c2fe1feb957b2b365469e839..4909678cefad306c8728ce5b027eec4ab091e106 100644 (file)
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -11,32 +11,25 @@ local lxp = require "lxp";
 local st = require "util.stanza";
 local stanza_mt = st.stanza_mt;
 
+local error = error;
 local tostring = tostring;
 local t_insert = table.insert;
 local t_concat = table.concat;
 local t_remove = table.remove;
 local setmetatable = setmetatable;
 
-local default_log = require "util.logger".init("xmppstream");
-
 -- COMPAT: w/LuaExpat 1.1.0
 local lxp_supports_doctype = pcall(lxp.new, { StartDoctypeDecl = false });
 
-if not lxp_supports_doctype then
-       default_log("warn", "The version of LuaExpat on your system leaves Prosody "
-               .."vulnerable to denial-of-service attacks. You should upgrade to "
-               .."LuaExpat 1.1.1 or higher as soon as possible. See "
-               .."http://prosody.im/doc/depends#luaexpat for more information.");
-end
-
-local error = error;
-
 module "xmppstream"
 
 local new_parser = lxp.new;
 
-local ns_prefixes = {
-       ["http://www.w3.org/XML/1998/namespace"] = "xml";
+local xml_namespace = {
+       ["http://www.w3.org/XML/1998/namespace\1lang"] = "xml:lang";
+       ["http://www.w3.org/XML/1998/namespace\1space"] = "xml:space";
+       ["http://www.w3.org/XML/1998/namespace\1base"] = "xml:base";
+       ["http://www.w3.org/XML/1998/namespace\1id"] = "xml:id";
 };
 
 local xmlns_streams = "http://etherx.jabber.org/streams";
@@ -50,11 +43,9 @@ _M.ns_pattern = ns_pattern;
 function new_sax_handlers(session, stream_callbacks)
        local xml_handlers = {};
        
-       local log = session.log or default_log;
-       
        local cb_streamopened = stream_callbacks.streamopened;
        local cb_streamclosed = stream_callbacks.streamclosed;
-       local cb_error = stream_callbacks.error or function(session, e) error("XML stream error: "..tostring(e)); end;
+       local cb_error = stream_callbacks.error or function(session, e, stanza) error("XML stream error: "..tostring(e)..(stanza and ": "..tostring(stanza) or ""),2); end;
        local cb_handlestanza = stream_callbacks.handlestanza;
        
        local stream_ns = stream_callbacks.stream_ns or xmlns_streams;
@@ -85,17 +76,13 @@ function new_sax_handlers(session, stream_callbacks)
                        non_streamns_depth = non_streamns_depth + 1;
                end
                
-               -- FIXME !!!!!
                for i=1,#attr do
                        local k = attr[i];
                        attr[i] = nil;
-                       local ns, nm = k:match(ns_pattern);
-                       if nm ~= "" then
-                               ns = ns_prefixes[ns];
-                               if ns then
-                                       attr[ns..":"..nm] = attr[k];
-                                       attr[k] = nil;
-                               end
+                       local xmlk = xml_namespace[k];
+                       if xmlk then
+                               attr[xmlk] = attr[k];
+                               attr[k] = nil;
                        end
                end
                
@@ -152,24 +139,17 @@ function new_sax_handlers(session, stream_callbacks)
                                stanza = t_remove(stack);
                        end
                else
-                       if tagname == stream_tag then
-                               if cb_streamclosed then
-                                       cb_streamclosed(session);
-                               end
-                       else
-                               local curr_ns,name = tagname:match(ns_pattern);
-                               if name == "" then
-                                       curr_ns, name = "", curr_ns;
-                               end
-                               cb_error(session, "parse-error", "unexpected-element-close", name);
+                       if cb_streamclosed then
+                               cb_streamclosed(session);
                        end
-                       stanza, chardata = nil, {};
-                       stack = {};
                end
        end
-       
-       local function restricted_handler()
+
+       local function restricted_handler(parser)
                cb_error(session, "parse-error", "restricted-xml", "Restricted XML, see RFC 6120 section 11.1.");
+               if not parser.stop or not parser:stop() then
+                       error("Failed to abort parsing");
+               end
        end
        
        if lxp_supports_doctype then
@@ -185,7 +165,6 @@ function new_sax_handlers(session, stream_callbacks)
        
        local function set_session(stream, new_session)
                session = new_session;
-               log = new_session.log or default_log;
        end
        
        return xml_handlers, { reset = reset, set_session = set_session };