# HG changeset patch # User Matthew Wild # Date 1237046722 0 # Node ID 43f7653fb662821c7f5e6856e659e858861897e6 # Parent b61c3589cd7bdf840a62b7b14082a9ff3380ef66# Parent cec476fcc19fc3f4e86582528807e5009f50175e Merge diff -r b61c3589cd7b -r 43f7653fb662 core/objectmanager.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/objectmanager.lua Sat Mar 14 16:05:22 2009 +0000 @@ -0,0 +1,60 @@ + +local new_multitable = require "util.multitable".new; +local t_insert = table.insert; +local t_concat = table.concat; +local tostring = tostring; +local unpack = unpack; +local pairs = pairs; +local error = error; +local type = type; +local _G = _G; + +local data = new_multitable(); + +module "objectmanager" + +function set(...) + return data:set(...); +end +function remove(...) + return data:remove(...); +end +function get(...) + return data:get(...); +end + +local function get_path(path) + if type(path) == "table" then return path; end + local s = {}; + for part in tostring(path):gmatch("[%w_]+") do + t_insert(s, part); + end + return s; +end + +function get_object(path) + path = get_path(path) + return data:get(unpack(path)), path; +end +function set_object(path, object) + path = get_path(path); + data:set(unpack(path), object); +end + +data:set("ls", function(_dir) + local obj, dir = get_object(_dir); + if not obj then error("object not found: " .. t_concat(dir, '/')); end + local r = {}; + if type(obj) == "table" then + for key, val in pairs(obj) do + r[key] = type(val); + end + end + return r; +end); +data:set("get", get_object); +data:set("set", set_object); +data:set("echo", function(...) return {...}; end); +data:set("_G", _G); + +return _M; diff -r b61c3589cd7b -r 43f7653fb662 core/usermanager.lua --- a/core/usermanager.lua Sat Mar 14 16:03:48 2009 +0000 +++ b/core/usermanager.lua Sat Mar 14 16:05:22 2009 +0000 @@ -11,8 +11,12 @@ require "util.datamanager" local datamanager = datamanager; local log = require "util.logger".init("usermanager"); +local type = type; local error = error; +local ipairs = ipairs; local hashes = require "util.hashes"; +local jid_bare = require "util.jid".bare; +local config = require "core.configmanager"; module "usermanager" @@ -59,4 +63,15 @@ return methods; end +function is_admin(jid) + local admins = config.get("*", "core", "admins") or {}; + if type(admins) == "table" then + jid = jid_bare(jid); + for _,admin in ipairs(admins) do + if admin == jid then return true; end + end + else log("debug", "Option core.admins is not a table"); end + return nil; +end + return _M; diff -r b61c3589cd7b -r 43f7653fb662 plugins/mod_legacyauth.lua --- a/plugins/mod_legacyauth.lua Sat Mar 14 16:03:48 2009 +0000 +++ b/plugins/mod_legacyauth.lua Sat Mar 14 16:05:22 2009 +0000 @@ -12,6 +12,9 @@ local t_concat = table.concat; module:add_feature("jabber:iq:auth"); +module:add_event_hook("stream-features", function (session, features) + if 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) diff -r b61c3589cd7b -r 43f7653fb662 plugins/mod_saslauth.lua --- a/plugins/mod_saslauth.lua Sat Mar 14 16:03:48 2009 +0000 +++ b/plugins/mod_saslauth.lua Sat Mar 14 16:05:22 2009 +0000 @@ -17,6 +17,7 @@ local tostring = tostring; local jid_split = require "util.jid".split local md5 = require "util.hashes".md5; +local config = require "core.configmanager"; local log = require "util.logger".init("mod_saslauth"); @@ -106,7 +107,9 @@ -- 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:tag("mechanism"):text("ANONYMOUS"):up(); + if config.get(session.host or "*", "core", "sasl_anonymous") then + features:tag("mechanism"):text("ANONYMOUS"):up(); + end features:up(); else features:tag("bind", bind_attr):tag("required"):up():up(); diff -r b61c3589cd7b -r 43f7653fb662 plugins/mod_xmlrpc.lua --- a/plugins/mod_xmlrpc.lua Sat Mar 14 16:03:48 2009 +0000 +++ b/plugins/mod_xmlrpc.lua Sat Mar 14 16:05:22 2009 +0000 @@ -14,6 +14,11 @@ local pcall = pcall; local unpack = unpack; local tostring = tostring; +local is_admin = require "core.usermanager".is_admin; +local jid_split = require "util.jid".split; +local b64_decode = require "util.encodings".base64.decode; +local get_method = require "core.objectmanager".get_object; +local validate_credentials = require "core.usermanager".validate_credentials; local translate_request = require "util.xmlrpc".translate_request; local create_response = require "util.xmlrpc".create_response; @@ -60,12 +65,6 @@ return stanza.tags[1]; end -local function get_method(method) - return function(...) - return {method = method; args = {...}}; - end -end - local function handle_xmlrpc_request(method, args) method = get_method(method); if not method then return create_error_response(404, "method not found"); end @@ -85,29 +84,37 @@ local query = stanza.tags[1]; if query.name == "query" then if #query.tags == 1 then - local success, method, args = pcall(translate_request, query.tags[1]); - if success then - local result = handle_xmlrpc_request(method, args); - origin.send(st.reply(stanza):tag('query', {xmlns='jabber:iq:rpc'}):add_child(result)); - else - origin.send(st.error_reply(stanza, "modify", "bad-request", method)); - end - else - origin.send(st.error_reply(stanza, "modify", "bad-request", "No content in XML-RPC request")); - end - else - origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); - end + if is_admin(stanza.attr.from) then + local success, method, args = pcall(translate_request, query.tags[1]); + if success then + local result = handle_xmlrpc_request(method, args); + origin.send(st.reply(stanza):tag('query', {xmlns='jabber:iq:rpc'}):add_child(result)); + else + origin.send(st.error_reply(stanza, "modify", "bad-request", method)); + end + else origin.send(st.error_reply(stanza, "auth", "forbidden", "No content in XML-RPC request")); end + else origin.send(st.error_reply(stanza, "modify", "bad-request", "No content in XML-RPC request")); end + else origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); end end module:add_iq_handler({"c2s", "s2sin"}, "jabber:iq:rpc", handle_xmpp_request); module:add_feature("jabber:iq:rpc"); +-- TODO add to disco replies -local default_headers = { ["Content-Type"] = "text/xml" }; +local default_headers = { ['Content-Type'] = 'text/xml' }; +local unauthorized_response = { status = '401 UNAUTHORIZED', headers = {['Content-Type']='text/html', ['WWW-Authenticate']='Basic realm="WallyWorld"'}; body = "Authentication required"; }; local function handle_http_request(method, body, request) + -- authenticate user + local username, password = b64_decode(request['authorization'] or ''):gmatch('([^:]*):(.*)')(); -- TODO digest auth + local node, host = jid_split(username); + if not validate_credentials(host, node, password) and is_admin(username) then + return unauthorized_response; + end + -- parse request local stanza = body and parse_xml(body); if (not stanza) or request.method ~= "POST" then return "You really don't look like an XML-RPC client to me... what do you want?"; end + -- execute request local success, method, args = pcall(translate_request, stanza); if success then return { headers = default_headers; body = tostring(handle_xmlrpc_request(method, args)) }; diff -r b61c3589cd7b -r 43f7653fb662 util/xmlrpc.lua --- a/util/xmlrpc.lua Sat Mar 14 16:03:48 2009 +0000 +++ b/util/xmlrpc.lua Sat Mar 14 16:05:22 2009 +0000 @@ -41,6 +41,9 @@ number=function(stanza, object) stanza:tag("int"):text(tostring(object)):up(); end; + ["nil"]=function(stanza, object) -- nil extension + stanza:tag("nil"):up(); + end; }; _lua_to_xmlrpc = function(stanza, object) local h = map[type(object)]; @@ -146,6 +149,9 @@ if tostring(tonumber(n)) == n then n = tonumber(n); end return n; end; + ["nil"]=function(stanza) -- nil extension + return nil; + end; } _xmlrpc_to_lua = function(stanza) local h = rmap[stanza.name];