Merge with Tobias

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index af403dc9f9b02294d48685376359b98049739d53..158285f61bc275630fa53013b0e4f87a2707ec87 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -1,28 +1,17 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
-
-
 local st = require "util.stanza";
 
 local xmlns_starttls ='urn:ietf:params:xml:ns:xmpp-tls';
 
+local secure_auth_only = module:get_option("require_encryption");
+
 module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                function (session, stanza)
                        if session.conn.starttls then
@@ -30,6 +19,7 @@ module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                                session:reset_stream();
                                session.conn.starttls();
                                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");
@@ -40,6 +30,11 @@ local starttls_attr = { xmlns = xmlns_starttls };
 module:add_event_hook("stream-features", 
                function (session, features)                                                                                            
                        if session.conn.starttls then
-                               features:tag("starttls", starttls_attr):up();
+                               features:tag("starttls", starttls_attr);
+                               if secure_auth_only then
+                                       features:tag("required"):up():up();
+                               else
+                                       features:up();
+                               end
                        end
                end);