net.dns: Remove elements from the cache when expired so as to not leave holes in...

[prosody.git] / plugins / mod_legacyauth.lua

diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index ca2d9f78e2b6d8d3384f61ebc0e7c00b4db38bcd..9a9c3902f0dfe242ce3b435056fb06787edd21ca 100644 (file)
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -1,20 +1,9 @@
--- Prosody IM v0.1
--- 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.
 --
 
 
@@ -22,10 +11,28 @@
 local st = require "util.stanza";
 local t_concat = table.concat;
 
+local secure_auth_only = module:get_option("require_encryption");
+
+local sessionmanager = require "core.sessionmanager";
+local usermanager = require "core.usermanager";
+
 module:add_feature("jabber:iq:auth");
+module:add_event_hook("stream-features", function (session, features)
+       if secure_auth_only and not session.secure then
+               -- Sorry, not offering to insecure streams!
+               return;
+       elseif not session.username then
+               features:tag("auth", {xmlns='http://jabber.org/features/iq-auth'}):up();
+       end
+end);
 
 module:add_iq_handler("c2s_unauthed", "jabber:iq:auth", 
                function (session, stanza)
+                       if secure_auth_only and not session.secure then
+                               session.send(st.error_reply(stanza, "modify", "not-acceptable", "Encryption (SSL or TLS) is required to connect to this server"));
+                               return true;
+                       end
+                       
                        local username = stanza.tags[1]:child_with_name("username");
                        local password = stanza.tags[1]:child_with_name("password");
                        local resource = stanza.tags[1]:child_with_name("resource");
@@ -35,11 +42,9 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:auth",
                                        :tag("username"):up()
                                        :tag("password"):up()
                                        :tag("resource"):up());
-                               return true;                    
                        else
                                username, password, resource = t_concat(username), t_concat(password), t_concat(resource);
                                local reply = st.reply(stanza);
-                               require "core.usermanager"
                                if usermanager.validate_credentials(session.host, username, password) then
                                        -- Authentication successful!
                                        local success, err = sessionmanager.make_authenticated(session, username);
@@ -48,19 +53,13 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:auth",
                                                success, err_type, err, err_msg = sessionmanager.bind_resource(session, resource);
                                                if not success then
                                                        session.send(st.error_reply(stanza, err_type, err, err_msg));
-                                                       return true;
+                                                       return true; -- FIXME need to unauthenticate here
                                                end
                                        end
                                        session.send(st.reply(stanza));
-                                       return true;
                                else
-                                       local reply = st.reply(stanza);
-                                       reply.attr.type = "error";
-                                       reply:tag("error", { code = "401", type = "auth" })
-                                               :tag("not-authorized", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas" });
-                                       session.send(reply);
-                                       return true;
+                                       session.send(st.error_reply(stanza, "auth", "not-authorized"));
                                end
                        end
-                       
+                       return true;
                end);