Automated merge with http://waqas.ath.cx:8000/

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index ab06b9a55d7e9faf15fad4aeb2337db8895961b9..af403dc9f9b02294d48685376359b98049739d53 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -1,26 +1,32 @@
+-- Prosody IM v0.2
+-- Copyright (C) 2008 Matthew Wild
+-- Copyright (C) 2008 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.
+--
 
-local st = require "util.stanza";
-local send = require "core.sessionmanager".send_to_session;
-local sm_bind_resource = require "core.sessionmanager".bind_resource;
-
-local sessions = sessions;
 
-local usermanager_validate_credentials = require "core.usermanager".validate_credentials;
-local t_concat, t_insert = table.concat, table.insert;
-local tostring = tostring;
 
-local log = require "util.logger".init("mod_starttls");
+local st = require "util.stanza";
 
 local xmlns_starttls ='urn:ietf:params:xml:ns:xmpp-tls';
 
-local new_connhandler = require "net.connhandlers".new;
-
-add_handler("c2s_unauthed", "starttls", xmlns_starttls,
+module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                function (session, stanza)
                        if session.conn.starttls then
-                               send(session, st.stanza("proceed", { xmlns = xmlns_starttls }));
-                               -- FIXME: I'm commenting the below, not sure why it was necessary
-                               -- sessions[session.conn] = nil;
+                               session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
                                session:reset_stream();
                                session.conn.starttls();
                                session.log("info", "TLS negotiation started...");
@@ -30,9 +36,10 @@ add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                        end
                end);
                
-add_event_hook("stream-features", 
-                                       function (session, features)                                                                                            
-                                               if session.conn.starttls then
-                                                       t_insert(features, "<starttls xmlns='"..xmlns_starttls.."'/>");
-                                               end
-                                       end);
\ No newline at end of file
+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();
+                       end
+               end);