Software / code / prosody
Changeset
2753:305428b14f76
net.xmppclient_listener: Fix to correctly handle stream errors from clients
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 14 Mar 2010 03:01:00 +0000 |
| parents | 2752:18d8009f06cb |
| children | 2754:b73055c5d8a1 |
| files | net/xmppclient_listener.lua |
| diffstat | 1 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/net/xmppclient_listener.lua Sun Mar 14 02:59:41 2010 +0000 +++ b/net/xmppclient_listener.lua Sun Mar 14 03:01:00 2010 +0000 @@ -33,13 +33,32 @@ local stream_callbacks = { default_ns = "jabber:client", streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza }; +local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams"; + function stream_callbacks.error(session, error, data) if error == "no-stream" then session.log("debug", "Invalid opening stream header"); session:close("invalid-namespace"); - elseif session.close then - (session.log or log)("debug", "Client XML parse error: %s", tostring(error)); + elseif error == "parse-error" then + (session.log or log)("debug", "Client XML parse error: %s", tostring(data)); 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
