From 6e7394f5f3f6c608b5bb1e3d7de13277850fdaa5 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 18 May 2015 21:43:24 +0200 Subject: mod_tls: Build as a stanza instead of with string concatenation --- plugins/mod_tls.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/mod_tls.lua') diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index f9d2cee9..85fa172a 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -21,6 +21,7 @@ end local xmlns_starttls = 'urn:ietf:params:xml:ns:xmpp-tls'; local starttls_attr = { xmlns = xmlns_starttls }; +local starttls_initiate= st.stanza("starttls", starttls_attr); local starttls_proceed = st.stanza("proceed", starttls_attr); local starttls_failure = st.stanza("failure", starttls_attr); local c2s_feature = st.stanza("starttls", starttls_attr); @@ -116,7 +117,7 @@ module:hook_stanza("http://etherx.jabber.org/streams", "features", function (ses module:log("debug", "Received features element"); if can_do_tls(session) and stanza:get_child("starttls", xmlns_starttls) then module:log("debug", "%s is offering TLS, taking up the offer...", session.to_host); - session.sends2s(""); + session.sends2s(starttls_initiate); return true; end end, 500); -- cgit v1.2.3 From 5085777f131d02ed006bf0b47ff26781c269cf82 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 18 May 2015 21:48:58 +0200 Subject: mod_tls: Treat session.ssl_ctx being false as a signal that TLS is disabled --- plugins/mod_tls.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/mod_tls.lua') diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index 85fa172a..d1138e1c 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -61,7 +61,7 @@ do end local function can_do_tls(session) - if not session.conn.starttls then + if session.ssl_ctx == false or not session.conn.starttls then return false; elseif session.ssl_ctx then return true; -- cgit v1.2.3