diff options
| -rw-r--r-- | plugins/mod_pep.lua | 66 | ||||
| -rw-r--r-- | util/muc.lua | 4 | ||||
| -rw-r--r-- | util/stanza.lua | 31 |
3 files changed, 68 insertions, 33 deletions
diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua index 2ba2f8b0..f3e9f4a0 100644 --- a/plugins/mod_pep.lua +++ b/plugins/mod_pep.lua @@ -9,6 +9,7 @@ local pairs, ipairs = pairs, ipairs; local next = next; local load_roster = require "core.rostermanager".load_roster; +local NULL = {}; local data = {}; local recipients = {}; @@ -35,17 +36,31 @@ local function publish(session, node, item) user_data[node] = stanza; end - -- broadcast to resources - stanza.attr.to = bare; - core_route_stanza(session, stanza); + -- broadcast + for recipient in pairs(recipients[user] or NULL) do + stanza.attr.to = recipient; + core_post_stanza(session, stanza); + end +end - -- broadcast to contacts - for jid, item in pairs(session.roster) do - if jid and jid ~= "pending" and (item.subscription == 'from' or item.subscription == 'both') then - stanza.attr.to = jid; - core_route_stanza(session, stanza); +local function get_caps_hash_from_presence(stanza, current) + local t = stanza.attr.type; + if not t then + for _, child in pairs(stanza.tags) do + if child.name == "c" and child.attr.xmlns == "http://jabber.org/protocol/caps" then + local attr = child.attr; + if attr.hash then -- new caps + if attr.hash == 'sha-1' and attr.node and attr.ver then return attr.ver, attr.node.."#"..attr.ver; end + else -- legacy caps + if attr.node and attr.ver then return attr.node.."#"..attr.ver.."#"..(attr.ext or ""), attr.node.."#"..attr.ver; end + end + return; -- bad caps format + end end + elseif t == "unavailable" or t == "error" then + return; end + return current; -- no caps, could mean caps optimization, so return current end module:hook("presence/bare", function(event) @@ -56,18 +71,18 @@ module:hook("presence/bare", function(event) local bare = jid_bare(stanza.attr.from); local item = load_roster(jid_split(user))[bare]; if not stanza.attr.to or (item and (item.subscription == 'from' or item.subscription == 'both')) then - local t = stanza.attr.type; local recipient = stanza.attr.from; - if t == "unavailable" or t == "error" then + local current = recipients[user] and recipients[user][recipient]; + local hash = get_caps_hash_from_presence(stanza, current); + if current == hash then return; end + if not hash then if recipients[user] then recipients[user][recipient] = nil; end - elseif not t then + else recipients[user] = recipients[user] or {}; - if not recipients[user][recipient] then - recipients[user][recipient] = true; - for node, message in pairs(data[user] or {}) do - message.attr.to = stanza.attr.from; - origin.send(message); - end + recipients[user][recipient] = hash; + for node, message in pairs(data[user] or NULL) do + message.attr.to = stanza.attr.from; + origin.send(message); end end end @@ -85,9 +100,22 @@ module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function(event) if payload then -- <item> publish(session, node, payload); return true; - end -- TODO else error - end -- TODO else error + end + end end end end); +module:hook("iq/bare/disco", function(event) + local session, stanza = event.origin, event.stanza; + if stanza.attr.type == "result" then + local disco = stanza.tags[1]; + if disco and disco.name == "query" and disco.attr.xmlns == "http://jabber.org/protocol/disco#info" then + -- Process disco response + -- TODO check if waiting for recipient's response + local hash; -- TODO calculate hash + -- TODO update hash map + -- TODO set recipient's data to calculated data + end + end +end); diff --git a/util/muc.lua b/util/muc.lua index 2bb1311a..87eba130 100644 --- a/util/muc.lua +++ b/util/muc.lua @@ -165,7 +165,7 @@ end local function room_get_disco_info(self, stanza) end local function room_get_disco_items(self, stanza) end -local function room_set_subject(room, current_nick, room, subject) +local function room_set_subject(room, current_nick, subject) -- TODO check nick's authority if subject == "" then subject = nil; end room._data['subject'] = subject; @@ -315,7 +315,7 @@ local function room_handle_to_room(self, origin, stanza) -- presence changes and local current_nick = self._jid_nick[stanza.attr.from]; if current_nick then stanza.attr.to = current_nick; - room_handle_to_occupant(origin, stanza); + room_handle_to_occupant(self, origin, stanza); stanza.attr.to = to; elseif type ~= "error" and type ~= "result" then origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); diff --git a/util/stanza.lua b/util/stanza.lua index eb9f3922..35d600ed 100644 --- a/util/stanza.lua +++ b/util/stanza.lua @@ -24,6 +24,7 @@ local print = print; local unpack = unpack; local s_gsub = string.gsub; local s_char = string.char; +local s_find = string.find; local os = os; local do_pretty_printing = not os.getenv("WINDIR"); @@ -122,27 +123,33 @@ local xml_escape = (function() return function(str) return (s_gsub(str, "['&<>\"]", escape_table)); end end)(); local function _dostring(t, buf, self, xml_escape) - local nsid, ns, attrk = 0; - t_insert(buf, "<"..t.name); + local nsid = 0; + local name = t.name + t_insert(buf, "<"..name); for k, v in pairs(t.attr) do - ns, attrk = s_match(k, "^([^|]+)|(.+)$"); - if ns then + if s_find(k, "|", 1, true) then + local ns, attrk = s_match(k, "^([^|]+)|(.+)$"); nsid = nsid + 1; t_insert(buf, " xmlns:ns"..nsid.."='"..xml_escape(ns).."' ".."ns"..nsid..":"..attrk.."='"..xml_escape(v).."'"); else t_insert(buf, " "..k.."='"..xml_escape(v).."'"); end end - t_insert(buf, ">"); - for n=1,#t do - local child = t[n]; - if child.name then - self(child, buf, self, xml_escape); - else - t_insert(buf, xml_escape(child)); + local len = #t; + if len == 0 then + t_insert(buf, "/>"); + else + t_insert(buf, ">"); + for n=1,len do + local child = t[n]; + if child.name then + self(child, buf, self, xml_escape); + else + t_insert(buf, xml_escape(child)); + end end + t_insert(buf, "</"..name..">"); end - t_insert(buf, "</"..t.name..">"); end function stanza_mt.__tostring(t) local buf = {}; |