aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-02-12 01:47:10 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-02-12 01:47:10 +0500
commitbdc87e4345c8ad01a12d9ed0e6a73a102e192102 (patch)
tree5b85401329242565e74135998f2c3235283e571d
parent763b4d3fc7307f5c500d5e26cb6a3bcaaabb0439 (diff)
downloadprosody-bdc87e4345c8ad01a12d9ed0e6a73a102e192102.tar.gz
prosody-bdc87e4345c8ad01a12d9ed0e6a73a102e192102.zip
mod_tls: Slight refactoring.
-rw-r--r--plugins/mod_tls.lua59
1 files changed, 30 insertions, 29 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 7153e48a..6fde0a1e 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -16,35 +16,36 @@ local secure_s2s_only = module:get_option("s2s_require_encryption");
local global_ssl_ctx = prosody.global_ssl_ctx;
-module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
- function (session, stanza)
- if session.conn.starttls then
- session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
- session:reset_stream();
- local ssl_ctx = session.host and hosts[session.host].ssl_ctx_in or global_ssl_ctx;
- session.conn:starttls(ssl_ctx);
- session.log("info", "TLS negotiation started...");
- session.secure = false;
- else
- -- FIXME: What reply?
- session.log("warn", "Attempt to start TLS, but TLS is not available on this connection");
- end
- end);
-
-module:add_handler("s2sin_unauthed", "starttls", xmlns_starttls,
- function (session, stanza)
- if session.conn.starttls then
- session.sends2s(st.stanza("proceed", { xmlns = xmlns_starttls }));
- session:reset_stream();
- local ssl_ctx = session.to_host and hosts[session.to_host].ssl_ctx_in or global_ssl_ctx;
- session.conn:starttls(ssl_ctx);
- session.log("info", "TLS negotiation started for incoming s2s...");
- session.secure = false;
- else
- -- FIXME: What reply?
- session.log("warn", "Attempt to start TLS, but TLS is not available on this s2s connection");
- end
- end);
+function c2s_starttls_handler(session, stanza)
+ if session.conn.starttls then
+ session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
+ session:reset_stream();
+ local ssl_ctx = session.host and hosts[session.host].ssl_ctx_in or global_ssl_ctx;
+ session.conn:starttls(ssl_ctx);
+ session.log("info", "TLS negotiation started...");
+ session.secure = false;
+ else
+ -- FIXME: What reply?
+ session.log("warn", "Attempt to start TLS, but TLS is not available on this connection");
+ end
+end
+
+function s2s_starttls_handler(session, stanza)
+ if session.conn.starttls then
+ session.sends2s(st.stanza("proceed", { xmlns = xmlns_starttls }));
+ session:reset_stream();
+ local ssl_ctx = session.to_host and hosts[session.to_host].ssl_ctx_in or global_ssl_ctx;
+ session.conn:starttls(ssl_ctx);
+ session.log("info", "TLS negotiation started for incoming s2s...");
+ session.secure = false;
+ else
+ -- FIXME: What reply?
+ session.log("warn", "Attempt to start TLS, but TLS is not available on this s2s connection");
+ end
+end
+
+module:add_handler("c2s_unauthed", "starttls", xmlns_starttls, c2s_starttls_handler);
+module:add_handler("s2sin_unauthed", "starttls", xmlns_starttls, s2s_starttls_handler);
local starttls_attr = { xmlns = xmlns_starttls };