From fb9838c64b97cd51c87a6cc251a6049e11eeba94 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 8 Jul 2013 21:38:08 +0100 Subject: mod_component: xpcall() stanza processing, as per other listeners, preventing potentially harmful 'top-level errors' --- plugins/mod_component.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua index 871a20e4..2fde57ee 100644 --- a/plugins/mod_component.lua +++ b/plugins/mod_component.lua @@ -9,6 +9,7 @@ module:set_global(); local t_concat = table.concat; +local traceback = debug.traceback; local logger = require "util.logger"; local sha1 = require "util.hashes".sha1; @@ -183,6 +184,7 @@ function stream_callbacks.streamclosed(session) session:close(); end +local function handleerr(err) log("error", "Traceback[component]: %s", traceback(tostring(err), 2)); end function stream_callbacks.handlestanza(session, stanza) -- Namespaces are icky. if not stanza.attr.xmlns and stanza.name == "handshake" then @@ -213,7 +215,10 @@ function stream_callbacks.handlestanza(session, stanza) return; end end - return core_process_stanza(session, stanza); + + if stanza then + return xpcall(function () return core_process_stanza(session, stanza) end, handleerr); + end end --- Closing a component connection -- cgit v1.2.3