Software / code / prosody
Changeset
2754:b73055c5d8a1
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 14 Mar 2010 03:03:02 +0000 |
| parents | 2753:305428b14f76 |
| children | 2755:28f2416a3e4e |
| files | net/xmppcomponent_listener.lua |
| diffstat | 1 files changed, 21 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/net/xmppcomponent_listener.lua Sun Mar 14 03:01:00 2010 +0000 +++ b/net/xmppcomponent_listener.lua Sun Mar 14 03:03:02 2010 +0000 @@ -34,16 +34,32 @@ local stream_callbacks = { default_ns = xmlns_component }; +local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams"; + function stream_callbacks.error(session, error, data, data2) log("warn", "Error processing component stream: "..tostring(error)); if error == "no-stream" then session:close("invalid-namespace"); - elseif error == "xml-parse-error" and data == "unexpected-element-close" then - session.log("warn", "Unexpected close of '%s' tag", data2); + elseif error == "parse-error" then + session.log("warn", "External component %s XML parse error: %s", tostring(session.host), tostring(data)); session:close("xml-not-well-formed"); - else - session.log("warn", "External component %s XML parse error: %s", tostring(session.host), tostring(error)); - session:close("xml-not-well-formed"); + elseif error == "stream-error" then + local condition, text = "undefined-condition"; + for child in data:children() do + if child.attr.xmlns == xmlns_xmpp_streams then + if child.name ~= "text" then + condition = child.name; + else + text = child:get_text(); + end + if condition ~= "undefined-condition" and text then + break; + end + end + end + text = condition .. (text and (" ("..text..")") or ""); + session.log("info", "Session closed by remote with error: %s", text); + session:close(nil, text); end end
