From dd56030a23ab0ee7c495838688a6729b1fff1e86 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 10 May 2013 22:29:03 +0200 Subject: mod_c2s: Fix session:close() when a stanza is passed as reason --- plugins/mod_c2s.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua index efef8763..1d2dd6dd 100644 --- a/plugins/mod_c2s.lua +++ b/plugins/mod_c2s.lua @@ -157,7 +157,7 @@ local function session_close(session, reason) session.send(""); function session.send() return false; end - local reason = (reason and (reason.text or reason.condition)) or reason; + local reason = (reason and (reason.name or reason.text or reason.condition)) or reason; session.log("info", "c2s stream for %s closed: %s", session.full_jid or ("<"..session.ip..">"), reason or "session closed"); -- Authenticated incoming stream may still be sending us stanzas, so wait for from remote -- cgit v1.2.3 From d78375a2a11f8cb278ead0230cef31c8a44fb1f3 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sat, 11 May 2013 13:54:02 +0100 Subject: prosody.cfg.lua.dist: Fix my s2s_secure(_auth) mess --- prosody.cfg.lua.dist | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index 3c199f3e..23032932 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist @@ -99,20 +99,21 @@ c2s_require_encryption = false -- Force certificate authentication for server-to-server connections? -- This provides ideal security, but requires servers you communicate -- with to support encryption AND present valid, trusted certificates. +-- NOTE: Your version of LuaSec must support certificate verification! -- For more information see http://prosody.im/doc/s2s#security -s2s_secure = true +s2s_secure_auth = false -- Many servers don't support encryption or have invalid or self-signed -- certificates. You can list domains here that will not be required to -- authenticate using certificates. They will be authenticated using DNS. --- s2s_insecure_domains = { "gmail.com" } +--s2s_insecure_domains = { "gmail.com" } --- Even if you leave s2s_secure disabled, you can still require it for --- some domains by specifying a list here. +-- Even if you leave s2s_secure_auth disabled, you can still require valid +-- certificates for some domains by specifying a list here. --- s2s_secure_domains = { "jabber.org" } +--s2s_secure_domains = { "jabber.org" } -- Select the authentication backend to use. The 'internal' providers -- use Prosody's configured data storage to store the authentication data. -- cgit v1.2.3