Software /
code /
prosody
File
plugins/mod_private.lua @ 2089:fdd7280c4621
s2smanager: Queue db:verify unless we already sent a db:result (if we had then it can could a dialback deadlock). Also remove some redundant code which could cause a db:result to be sent while still negotiating features (e.g. TLS) and break things. Collectively these fix a 'random' s2s failure (usually with ejabberd for some reason) - resulting in an 'unbound prefix' XML error, or 'ssl handshake failure'. Was this commit message long enough? I think so.
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Fri, 20 Nov 2009 04:39:54 +0000 |
parent | 1523:841d61be198f |
child | 2923:b7049746bd29 |
line wrap: on
line source
-- Prosody IM -- Copyright (C) 2008-2009 Matthew Wild -- Copyright (C) 2008-2009 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- local st = require "util.stanza" local jid_split = require "util.jid".split; local datamanager = require "util.datamanager" module:add_feature("jabber:iq:private"); module:add_iq_handler("c2s", "jabber:iq:private", function (session, stanza) local type = stanza.attr.type; local query = stanza.tags[1]; if (type == "get" or type == "set") and query.name == "query" then local node, host = jid_split(stanza.attr.to); if not(node or host) or (node == session.username and host == session.host) then node, host = session.username, session.host; if #query.tags == 1 then local tag = query.tags[1]; local key = tag.name..":"..tag.attr.xmlns; local data = datamanager.load(node, host, "private"); if stanza.attr.type == "get" then if data and data[key] then session.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:private"}):add_child(st.deserialize(data[key]))); else session.send(st.reply(stanza):add_child(stanza.tags[1])); end else -- set if not data then data = {}; end; if #tag == 0 then data[key] = nil; else data[key] = st.preserialize(tag); end -- TODO delete datastore if empty if datamanager.store(node, host, "private", data) then session.send(st.reply(stanza)); else session.send(st.error_reply(stanza, "wait", "internal-server-error")); end end else session.send(st.error_reply(stanza, "modify", "bad-format")); end else session.send(st.error_reply(stanza, "cancel", "forbidden")); end end end);