diff options
| -rw-r--r-- | plugins/mod_console.lua | 13 | ||||
| -rw-r--r-- | plugins/mod_saslauth.lua | 5 | ||||
| -rw-r--r-- | util/hmac.lua | 11 | ||||
| -rw-r--r-- | util/sasl.lua | 3 |
4 files changed, 24 insertions, 8 deletions
diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua index 0f2c6711..966156f8 100644 --- a/plugins/mod_console.lua +++ b/plugins/mod_console.lua @@ -437,6 +437,8 @@ end ------------- function printbanner(session) + local option = config.get("*", "core", "console_banner"); +if option == nil or option == "full" or option == "graphic" then session.print [[ ____ \ / _ | _ \ _ __ ___ ___ _-_ __| |_ _ @@ -446,7 +448,18 @@ session.print [[ A study in simplicity |___/ ]] +end +if option == nil or option == "short" or option == "full" then session.print("Welcome to the Prosody administration console. For a list of commands, type: help"); session.print("You may find more help on using this console in our online documentation at "); session.print("http://prosody.im/doc/console\n"); end +if option and option ~= "short" and option ~= "full" and option ~= "graphic" then + if type(option) == "string" then + session.print(option) + elseif type(option) == "function" then + setfenv(option, redirect_output(_G, session)); + pcall(option, session); + end +end +end diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 754c82b3..81113d7c 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -12,7 +12,6 @@ local st = require "util.stanza"; local sm_bind_resource = require "core.sessionmanager".bind_resource; local sm_make_authenticated = require "core.sessionmanager".make_authenticated; local base64 = require "util.encodings".base64; -local to_unicode = require "util.encodings".idna.to_unicode; local datamanager_load = require "util.datamanager".load; local usermanager_validate_credentials = require "core.usermanager".validate_credentials; @@ -66,13 +65,13 @@ local function handle_status(session, status) end local function password_callback(node, hostname, realm, mechanism, decoder) - local password = (datamanager_load(node, to_unicode(hostname), "accounts") or {}).password; -- FIXME handle hashed passwords + local password = (datamanager_load(node, hostname, "accounts") or {}).password; -- FIXME handle hashed passwords local func = function(x) return x; end; if password then if mechanism == "PLAIN" then return func, password; elseif mechanism == "DIGEST-MD5" then - if decoder then node, hostname, password = decoder(node), decoder(hostname), decoder(password); end + if decoder then node, realm, password = decoder(node), decoder(realm), decoder(password); end return func, md5(node..":"..realm..":"..password); end end diff --git a/util/hmac.lua b/util/hmac.lua index b3098380..5f4467cf 100644 --- a/util/hmac.lua +++ b/util/hmac.lua @@ -1,15 +1,18 @@ local hashes = require "util.hashes" local xor = require "bit".bxor +local t_insert, t_concat = table.insert, table.concat; +local s_char = string.char; + module "hmac" local function arraystr(array) - t = {} - for i = 1,table.getn(array) do - table.insert(t, string.char(array[i])) + local t = {} + for i = 1,#array do + t_insert(t, s_char(array[i])) end - return table.concat(t) + return t_concat(t) end --[[ diff --git a/util/sasl.lua b/util/sasl.lua index a343d608..3fd133d2 100644 --- a/util/sasl.lua +++ b/util/sasl.lua @@ -19,6 +19,7 @@ local st = require "util.stanza"; local generate_uuid = require "util.uuid".generate; local t_insert, t_concat = table.insert, table.concat; local to_byte, to_char = string.byte, string.char; +local to_unicode = require "util.encodings".idna.to_unicode; local s_match = string.match; local gmatch = string.gmatch local string = string @@ -199,7 +200,7 @@ local function new_digest_md5(realm, password_handler) --TODO maybe realm support self.username = response["username"]; - local password_encoding, Y = self.password_handler(response["username"], domain, response["realm"], "DIGEST-MD5", decoder); + local password_encoding, Y = self.password_handler(response["username"], to_unicode(domain), response["realm"], "DIGEST-MD5", decoder); if Y == nil then return "failure", "not-authorized" elseif Y == false then return "failure", "account-disabled" end local A1 = ""; |