From 4a1babcbea83054d9452ed470a0caccd58f1e377 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 25 Jul 2014 21:12:21 +0200 Subject: mod_s2s: Remove unused locals --- plugins/mod_s2s/mod_s2s.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index f0d465c0..f177bf82 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -15,7 +15,6 @@ local core_process_stanza = prosody.core_process_stanza; local tostring, type = tostring, type; local t_insert = table.insert; local xpcall, traceback = xpcall, debug.traceback; -local NULL = {}; local add_task = require "util.timer".add_task; local st = require "util.stanza"; @@ -26,7 +25,6 @@ local s2s_new_incoming = require "core.s2smanager".new_incoming; local s2s_new_outgoing = require "core.s2smanager".new_outgoing; local s2s_destroy_session = require "core.s2smanager".destroy_session; local uuid_gen = require "util.uuid".generate; -local cert_verify_identity = require "util.x509".verify_identity; local fire_global_event = prosody.events.fire_event; local s2sout = module:require("s2sout"); -- cgit v1.2.3 From 16dbe1e35096f1cc4f25d8c161a58ee394e2bdac Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 7 Aug 2014 17:20:51 +0200 Subject: util.jid: Return early in join on invalid jids --- util/jid.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/util/jid.lua b/util/jid.lua index 08e63335..5db3d1f0 100644 --- a/util/jid.lua +++ b/util/jid.lua @@ -79,16 +79,15 @@ function prep(jid) end function join(node, host, resource) - if node and host and resource then + if not host then return end -- Invalid JID + if node and resource then return node.."@"..host.."/"..resource; - elseif node and host then + elseif node then return node.."@"..host; - elseif host and resource then + elseif resource then return host.."/"..resource; - elseif host then - return host; end - return nil; -- Invalid JID + return host; end function compare(jid, acl) -- cgit v1.2.3 From 2fc4e2dd51d4e234e5b05c20b7b27bd8d13a0700 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 7 Aug 2014 17:35:11 +0200 Subject: util.jid: Use existing join function in jid.prep --- util/jid.lua | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/util/jid.lua b/util/jid.lua index 5db3d1f0..14d8f2b4 100644 --- a/util/jid.lua +++ b/util/jid.lua @@ -65,21 +65,8 @@ local function _prepped_split(jid) end prepped_split = _prepped_split; -function prep(jid) - local node, host, resource = _prepped_split(jid); - if host then - if node then - host = node .. "@" .. host; - end - if resource then - host = host .. "/" .. resource; - end - end - return host; -end - -function join(node, host, resource) - if not host then return end -- Invalid JID +local function _join(node, host, resource) + if not host then return end if node and resource then return node.."@"..host.."/"..resource; elseif node then @@ -89,6 +76,12 @@ function join(node, host, resource) end return host; end +join = _join; + +function prep(jid) + local node, host, resource = _prepped_split(jid); + return _join(node, host, resource); +end function compare(jid, acl) -- compare jid to single acl rule -- cgit v1.2.3 From 2042436850916ff3a29bc2beaa515298eb5e0239 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 7 Aug 2014 17:43:28 +0200 Subject: util.jid: Optimize bare --- util/jid.lua | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/util/jid.lua b/util/jid.lua index 14d8f2b4..27afab3e 100644 --- a/util/jid.lua +++ b/util/jid.lua @@ -37,11 +37,7 @@ end split = _split; function bare(jid) - local node, host = _split(jid); - if node and host then - return node.."@"..host; - end - return host; + return jid and match(jid, "^[^/]+"); end local function _prepped_split(jid) -- cgit v1.2.3 From 503aba403d99eeedf2cc8ebb6c7df50e983f538d Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 9 Aug 2014 21:48:11 +0200 Subject: mod_private: Cleanup and more tailcalls --- plugins/mod_private.lua | 56 +++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/plugins/mod_private.lua b/plugins/mod_private.lua index 446a80b2..872d3760 100644 --- a/plugins/mod_private.lua +++ b/plugins/mod_private.lua @@ -15,38 +15,34 @@ module:add_feature("jabber:iq:private"); module:hook("iq/self/jabber:iq:private:query", function(event) local origin, stanza = event.origin, event.stanza; - local type = stanza.attr.type; local query = stanza.tags[1]; - if #query.tags == 1 then - local tag = query.tags[1]; - local key = tag.name..":"..tag.attr.xmlns; - local data, err = private_storage:get(origin.username); - if err then - origin.send(st.error_reply(stanza, "wait", "internal-server-error")); - return true; + if #query.tags ~= 1 then + return origin.send(st.error_reply(stanza, "modify", "bad-format")); + end + local tag = query.tags[1]; + local key = tag.name..":"..tag.attr.xmlns; + local data, err = private_storage:get(origin.username); + if err then + return origin.send(st.error_reply(stanza, "wait", "internal-server-error", err)); + end + if stanza.attr.type == "get" then + if data and data[key] then + return origin.send(st.reply(stanza):query("jabber:iq:private"):add_child(st.deserialize(data))); + else + return origin.send(st.reply(stanza):add_child(query)); + end + else -- type == set + if not data then data = {}; end; + if #tag == 0 then + data[key] = nil; + else + data[key] = st.preserialize(tag); end - if stanza.attr.type == "get" then - if data and data[key] then - origin.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:private"}):add_child(st.deserialize(data[key]))); - else - origin.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 private_storage:set(origin.username, data) then - origin.send(st.reply(stanza)); - else - origin.send(st.error_reply(stanza, "wait", "internal-server-error")); - end + -- TODO delete datastore if empty + local ok, err = private_storage:set(origin.username, data); + if not ok then + return origin.send(st.error_reply(stanza, "wait", "internal-server-error", err)); end - else - origin.send(st.error_reply(stanza, "modify", "bad-format")); + return origin.send(st.reply(stanza)); end - return true; end); -- cgit v1.2.3