-add_handler("c2s_unauthed", "starttls", xmlns_starttls,
- function (session, stanza)
- if session.conn.starttls then
- print("Wants to do TLS...");
- send(session, st.stanza("proceed", { xmlns = xmlns_starttls }));
- session.connhandler = new_connhandler("xmpp-client", session);
- session.notopen = true;
- if session.conn.starttls() then
- print("Done");
+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:hook("stanza/urn:ietf:params:xml:ns:xmpp-tls:starttls", function(event)
+ local origin, stanza = event.origin, event.stanza;
+ if origin.type == "c2s_unauthed" then
+ c2s_starttls_handler(origin, stanza);
+ elseif origin.type == "s2sin_unauthed" then
+ s2s_starttls_handler(origin, stanza);
+ else
+ -- FIXME: What reply?
+ origin.log("warn", "Attempt to start TLS, but TLS is not available on this %s connection", origin.type);
+ end
+ return true;
+end);
+
+
+local starttls_attr = { xmlns = xmlns_starttls };
+module:add_event_hook("stream-features",
+ function (session, features)
+ if not session.username and session.conn.starttls then
+ features:tag("starttls", starttls_attr);
+ if secure_auth_only then
+ features:tag("required"):up():up();