mod_saslauth, mod_tls: minor code cleanup

diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 4934523f5ec6e9a2f7e533e5f69f001e158d5f1b..df326f7046d55e018148b64e34cadac2256002dd 100644 (file)
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -21,7 +21,6 @@
 
 local st = require "util.stanza";
 local sm_bind_resource = require "core.sessionmanager".bind_resource;
-local jid
 local base64 = require "util.encodings".base64;
 
 local usermanager_validate_credentials = require "core.usermanager".validate_credentials;
@@ -80,7 +79,7 @@ local function password_callback(node, host, mechanism, decoder)
        return func, nil;
 end
 
-function sasl_handler(session, stanza)
+local function sasl_handler(session, stanza)
        if stanza.name == "auth" then
                -- FIXME ignoring duplicates because ejabberd does
                session.sasl_handler = new_sasl(stanza.attr.mechanism, session.host, password_callback);
@@ -112,18 +111,18 @@ local mechanisms_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-sasl' };
 local bind_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-bind' };
 local xmpp_session_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-session' };
 module:add_event_hook("stream-features", 
-                                       function (session, features)                                                                                            
-                                               if not session.username then
-                                                       features:tag("mechanisms", mechanisms_attr);
-                                                       -- TODO: Provide PLAIN only if TLS is active, this is a SHOULD from the introduction of RFC 4616. This behavior could be overridden via configuration but will issuing a warning or so.
-                                                               features:tag("mechanism"):text("PLAIN"):up();
-                                                               features:tag("mechanism"):text("DIGEST-MD5"):up();
-                                                       features:up();
-                                               else
-                                                       features:tag("bind", bind_attr):tag("required"):up():up();
-                                                       features:tag("session", xmpp_session_attr):up();
-                                               end
-                                       end);
+               function (session, features)                                                                                            
+                       if not session.username then
+                               features:tag("mechanisms", mechanisms_attr);
+                               -- TODO: Provide PLAIN only if TLS is active, this is a SHOULD from the introduction of RFC 4616. This behavior could be overridden via configuration but will issuing a warning or so.
+                                       features:tag("mechanism"):text("PLAIN"):up();
+                                       features:tag("mechanism"):text("DIGEST-MD5"):up();
+                               features:up();
+                       else
+                               features:tag("bind", bind_attr):tag("required"):up():up();
+                               features:tag("session", xmpp_session_attr):up();
+                       end
+               end);
                                        
 module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind", 
                function (session, stanza)

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index fc816ad14d1177b4b3aab59b56a8ec2ef43998f2..af403dc9f9b02294d48685376359b98049739d53 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -21,12 +21,6 @@
 
 local st = require "util.stanza";
 
---local sessions = sessions;
-
-local t_insert = table.insert;
-
-local log = require "util.logger".init("mod_starttls");
-
 local xmlns_starttls ='urn:ietf:params:xml:ns:xmpp-tls';
 
 module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
@@ -44,8 +38,8 @@ module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                
 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);
+               function (session, features)                                                                                            
+                       if session.conn.starttls then
+                               features:tag("starttls", starttls_attr):up();
+                       end
+               end);