From 39de480ad8e4ccce9c1ed14b483b3b58edd25473 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 9 Jun 2016 10:30:33 +0200 Subject: mod_pep: Include the bare user jid in event --- plugins/mod_pep.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua index 896f3e78..01007a6d 100644 --- a/plugins/mod_pep.lua +++ b/plugins/mod_pep.lua @@ -47,11 +47,10 @@ local function subscription_presence(user_bare, recipient) end module:hook("pep-publish-item", function (event) - local session, node, id, item = event.session, event.node, event.id, event.item; + local session, bare, node, id, item = event.session, event.user, event.node, event.id, event.item; item.attr.xmlns = nil; local disable = #item.tags ~= 1 or #item.tags[1] == 0; if #item.tags == 0 then item.name = "retract"; end - local bare = session.username..'@'..session.host; local stanza = st.message({from=bare, type='headline'}) :tag('event', {xmlns='http://jabber.org/protocol/pubsub#event'}) :tag('items', {node=node}) @@ -183,7 +182,7 @@ module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function(event) payload.attr.id = id; session.send(st.reply(stanza)); module:fire_event("pep-publish-item", { - node = node, actor = session.jid, id = id, session = session, item = st.clone(payload); + node = node, user = jid_bare(session.jid), actor = session.jid, id = id, session = session, item = st.clone(payload); }); return true; end -- cgit v1.2.3 From 331c8a1358f7add25142ada7f3293c289dafde0d Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 10 Jun 2016 14:55:05 +0200 Subject: mod_pep: Use correct field for full JID (thanks Milan*) --- plugins/mod_pep.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua index 01007a6d..46517b95 100644 --- a/plugins/mod_pep.lua +++ b/plugins/mod_pep.lua @@ -182,7 +182,7 @@ module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function(event) payload.attr.id = id; session.send(st.reply(stanza)); module:fire_event("pep-publish-item", { - node = node, user = jid_bare(session.jid), actor = session.jid, id = id, session = session, item = st.clone(payload); + node = node, user = jid_bare(session.full_jid), actor = session.jid, id = id, session = session, item = st.clone(payload); }); return true; end -- cgit v1.2.3 From 41fc70c7cfc60fc8060b8e64ea5706ae1e5de6b8 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 12 Jun 2016 19:55:46 +0200 Subject: prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617) --- prosodyctl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/prosodyctl b/prosodyctl index 8ada3b9b..226ff2cf 100755 --- a/prosodyctl +++ b/prosodyctl @@ -974,9 +974,10 @@ function commands.check(arg) print(" For more information see https://prosody.im/doc/storage"); end end + local require_encryption = set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty(); local ssl = dependencies.softreq"ssl"; if not ssl then - if not set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty() then + if not require_encryption then print(""); print(" You require encryption but LuaSec is not available."); print(" Connections will fail."); @@ -1006,6 +1007,11 @@ function commands.check(arg) ok = false; end end + elseif require_encryption and not all_modules:contains("tls") then + print(""); + print(" You require encryption but mod_tls is not enabled."); + print(" Connections will fail."); + ok = false; end print("Done.\n"); -- cgit v1.2.3