aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/componentmanager.lua25
-rw-r--r--core/configmanager.lua8
-rw-r--r--core/discomanager.lua66
-rw-r--r--core/modulemanager.lua88
-rw-r--r--core/s2smanager.lua1
-rw-r--r--core/sessionmanager.lua6
-rw-r--r--core/usermanager.lua15
7 files changed, 65 insertions, 144 deletions
diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index 08868236..80b3fc58 100644
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -6,18 +6,14 @@
-- COPYING file in the source package for more information.
--
-
-
local prosody = prosody;
local log = require "util.logger".init("componentmanager");
local configmanager = require "core.configmanager";
local modulemanager = require "core.modulemanager";
-local core_route_stanza = core_route_stanza;
local jid_split = require "util.jid".split;
local events_new = require "util.events".new;
local st = require "util.stanza";
local hosts = hosts;
-local serialize = require "util.serialization".serialize
local pairs, type, tostring = pairs, type, tostring;
@@ -25,27 +21,16 @@ local components = {};
local disco_items = require "util.multitable".new();
local NULL = {};
-require "core.discomanager".addDiscoItemsHandler("*host", function(reply, to, from, node)
- if #node == 0 and hosts[to] then
- for jid in pairs(disco_items:get(to) or NULL) do
- reply:tag("item", {jid = jid}):up();
- end
- return true;
- end
-end);
-
-prosody.events.add_handler("server-starting", function () core_route_stanza = _G.core_route_stanza; end);
module "componentmanager"
local function default_component_handler(origin, stanza)
log("warn", "Stanza being handled by default component, bouncing error");
- if stanza.attr.type ~= "error" then
- core_route_stanza(nil, st.error_reply(stanza, "wait", "service-unavailable", "Component unavailable"));
+ if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
+ origin.send(st.error_reply(stanza, "wait", "service-unavailable", "Component unavailable"));
end
end
-local components_loaded_once;
function load_enabled_components(config)
local defined_hosts = config or configmanager.getconfig();
@@ -76,7 +61,7 @@ function handle_stanza(origin, stanza)
log("debug", "%s stanza being handled by component: %s", stanza.name, host);
component(origin, stanza, hosts[host]);
else
- log("error", "Component manager recieved a stanza for a non-existing component: " .. (stanza.attr.to or serialize(stanza)));
+ log("error", "Component manager recieved a stanza for a non-existing component: "..tostring(stanza));
end
end
@@ -138,4 +123,8 @@ function set_component_handler(host, handler)
components[host] = handler;
end
+function get_children(host)
+ return disco_items:get(host) or NULL;
+end
+
return _M;
diff --git a/core/configmanager.lua b/core/configmanager.lua
index b7ee605f..1fbe83b8 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -68,7 +68,7 @@ function load(filename, format)
if parsers[format] and parsers[format].load then
local f, err = io.open(filename);
if f then
- local ok, err = parsers[format].load(f:read("*a"));
+ local ok, err = parsers[format].load(f:read("*a"), filename);
f:close();
if ok then
eventmanager.fire_event("config-reloaded", { filename = filename, format = format });
@@ -99,7 +99,7 @@ do
local loadstring, pcall, setmetatable = _G.loadstring, _G.pcall, _G.setmetatable;
local setfenv, rawget, tostring = _G.setfenv, _G.rawget, _G.tostring;
parsers.lua = {};
- function parsers.lua.load(data)
+ function parsers.lua.load(data, filename)
local env;
-- The ' = true' are needed so as not to set off __newindex when we assign the functions below
env = setmetatable({ Host = true; host = true; Component = true, component = true,
@@ -139,7 +139,7 @@ do
local f, err = io.open(file);
if f then
local data = f:read("*a");
- local ok, err = parsers.lua.load(data);
+ local ok, err = parsers.lua.load(data, file);
if not ok then error(err:gsub("%[string.-%]", file), 0); end
end
if not f then error("Error loading included "..file..": "..err, 0); end
@@ -147,7 +147,7 @@ do
end
env.include = env.Include;
- local chunk, err = loadstring(data);
+ local chunk, err = loadstring(data, "@"..filename);
if not chunk then
return nil, err;
diff --git a/core/discomanager.lua b/core/discomanager.lua
deleted file mode 100644
index 742907dd..00000000
--- a/core/discomanager.lua
+++ /dev/null
@@ -1,66 +0,0 @@
--- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
---
--- This project is MIT/X11 licensed. Please see the
--- COPYING file in the source package for more information.
---
-
-
-
-local helper = require "util.discohelper".new();
-local hosts = hosts;
-local jid_split = require "util.jid".split;
-local jid_bare = require "util.jid".bare;
-local usermanager_user_exists = require "core.usermanager".user_exists;
-local rostermanager_is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;
-local print = print;
-
-do
- helper:addDiscoInfoHandler("*host", function(reply, to, from, node)
- if hosts[to] then
- reply:tag("identity", {category="server", type="im", name="Prosody"}):up();
- return true;
- end
- end);
- helper:addDiscoInfoHandler("*node", function(reply, to, from, node)
- local node, host = jid_split(to);
- if hosts[host] and rostermanager_is_contact_subscribed(node, host, jid_bare(from)) then
- reply:tag("identity", {category="account", type="registered"}):up();
- return true;
- end
- end);
- helper:addDiscoItemsHandler("*host", function(reply, to, from, node)
- if hosts[to] and hosts[to].type == "local" then
- return true;
- end
- end);
-end
-
-module "discomanager"
-
-function handle(stanza)
- return helper:handle(stanza);
-end
-
-function addDiscoItemsHandler(jid, func)
- return helper:addDiscoItemsHandler(jid, func);
-end
-
-function addDiscoInfoHandler(jid, func)
- return helper:addDiscoInfoHandler(jid, func);
-end
-
-function set(plugin, var, origin)
- -- TODO handle origin and host based on plugin.
- local handler = function(reply, to, from, node) -- service discovery
- if #node == 0 then
- reply:tag("feature", {var = var}):up();
- return true;
- end
- end
- addDiscoInfoHandler("*node", handler);
- addDiscoInfoHandler("*host", handler);
-end
-
-return _M;
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 250551ed..6bc8e285 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -6,13 +6,10 @@
-- COPYING file in the source package for more information.
--
-
-
local plugin_dir = CFG_PLUGINDIR or "./plugins/";
local logger = require "util.logger";
local log = logger.init("modulemanager");
-local addDiscoInfoHandler = require "core.discomanager".addDiscoInfoHandler;
local eventmanager = require "core.eventmanager";
local config = require "core.configmanager";
local multitable_new = require "util.multitable".new;
@@ -50,8 +47,6 @@ local handler_info = {};
local modulehelpers = setmetatable({}, { __index = _G });
-local features_table = multitable_new();
-local identities_table = multitable_new();
local handler_table = multitable_new();
local hooked = multitable_new();
local hooks = multitable_new();
@@ -171,8 +166,6 @@ function unload(host, name, ...)
end
end
modulemap[host][name] = nil;
- features_table:remove(host, name);
- identities_table:remove(host, name);
local params = handler_table:get(host, name); -- , {module.host, origin_type, tag, xmlns}
for _, param in pairs(params or NULL) do
local handlers = stanza_handlers:get(param[1], param[2], param[3], param[4]);
@@ -328,50 +321,11 @@ function api:add_iq_handler(origin_type, xmlns, handler)
self:add_handler(origin_type, "iq", xmlns, handler);
end
-addDiscoInfoHandler("*host", function(reply, to, from, node)
- if #node == 0 then
- local done = {};
- for module, identities in pairs(identities_table:get(to) or NULL) do -- for each module
- for identity, attr in pairs(identities) do
- if not done[identity] then
- reply:tag("identity", attr):up(); -- TODO cache
- done[identity] = true;
- end
- end
- end
- for module, identities in pairs(identities_table:get("*") or NULL) do -- for each module
- for identity, attr in pairs(identities) do
- if not done[identity] then
- reply:tag("identity", attr):up(); -- TODO cache
- done[identity] = true;
- end
- end
- end
- for module, features in pairs(features_table:get(to) or NULL) do -- for each module
- for feature in pairs(features) do
- if not done[feature] then
- reply:tag("feature", {var = feature}):up(); -- TODO cache
- done[feature] = true;
- end
- end
- end
- for module, features in pairs(features_table:get("*") or NULL) do -- for each module
- for feature in pairs(features) do
- if not done[feature] then
- reply:tag("feature", {var = feature}):up(); -- TODO cache
- done[feature] = true;
- end
- end
- end
- return next(done) ~= nil;
- end
-end);
-
function api:add_feature(xmlns)
- features_table:set(self.host, self.name, xmlns, true);
+ self:add_item("feature", xmlns);
end
-function api:add_identity(category, type)
- identities_table:set(self.host, self.name, category.."\0"..type, {category = category, type = type});
+function api:add_identity(category, type, name)
+ self:add_item("identity", {category = category, type = type, name = name});
end
local event_hook = function(host, mod_name, event_name, ...)
@@ -418,6 +372,42 @@ function api:require(lib)
return f();
end
+function api:get_option(name, default_value)
+ return config.get(self.host, self.name, name) or config.get(self.host, "core", name) or default_value;
+end
+
+local t_remove = _G.table.remove;
+local module_items = multitable_new();
+function api:add_item(key, value)
+ self.items = self.items or {};
+ self.items[key] = self.items[key] or {};
+ t_insert(self.items[key], value);
+ self:fire_event("item-added/"..key, {source = self, item = value});
+end
+function api:remove_item(key, value)
+ local t = self.items and self.items[key] or NULL;
+ for i = #t,1,-1 do
+ if t[i] == value then
+ t_remove(self.items[key], i);
+ self:fire_event("item-removed/"..key, {source = self, item = value});
+ return value;
+ end
+ end
+end
+
+function api:get_host_items(key)
+ local result = {};
+ for mod_name, module in pairs(modulemap[self.host]) do
+ module = module.module;
+ if module.items then
+ for _, item in ipairs(module.items[key] or NULL) do
+ t_insert(result, item);
+ end
+ end
+ end
+ return result;
+end
+
--------------------------------------------------------------------
local actions = {};
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 6388168f..fbce0c2b 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -127,6 +127,7 @@ function new_incoming(conn)
end
open_sessions = open_sessions + 1;
local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$"));
+ session.log = log;
session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end
incoming_s2s[session] = true;
add_task(connect_timeout, function ()
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 1b1b36df..59f0eadf 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -19,7 +19,8 @@ local full_sessions = full_sessions;
local bare_sessions = bare_sessions;
local modulemanager = require "core.modulemanager";
-local log = require "util.logger".init("sessionmanager");
+local logger = require "util.logger";
+local log = logger.init("sessionmanager");
local error = error;
local uuid_generate = require "util.uuid".generate;
local rm_load_roster = require "core.rostermanager".load_roster;
@@ -50,6 +51,9 @@ function new_session(conn)
local w = conn.write;
session.send = function (t) w(tostring(t)); end
session.ip = conn.ip();
+ local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
+ session.log = logger.init(conn_name);
+
return session;
end
diff --git a/core/usermanager.lua b/core/usermanager.lua
index bd7772ca..6c36fa29 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -1,7 +1,7 @@
-- Prosody IM
-- Copyright (C) 2008-2009 Matthew Wild
-- Copyright (C) 2008-2009 Waqas Hussain
---
+--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
@@ -23,6 +23,7 @@ module "usermanager"
function validate_credentials(host, username, password, method)
log("debug", "User '%s' is being validated", username);
local credentials = datamanager.load(username, host, "accounts") or {};
+
if method == nil then method = "PLAIN"; end
if method == "PLAIN" and credentials.password then -- PLAIN, do directly
if password == credentials.password then
@@ -30,7 +31,7 @@ function validate_credentials(host, username, password, method)
else
return nil, "Auth failed. Invalid username or password.";
end
- end
+ end
-- must do md5
-- make credentials md5
local pwd = credentials.password;
@@ -49,6 +50,10 @@ function validate_credentials(host, username, password, method)
end
end
+function get_password(username, host)
+ return (datamanager.load(username, host, "accounts") or {}).password
+end
+
function user_exists(username, host)
return datamanager.load(username, host, "accounts") ~= nil; -- FIXME also check for empty credentials
end
@@ -58,13 +63,11 @@ function create_user(username, password, host)
end
function get_supported_methods(host)
- local methods = {["PLAIN"] = true}; -- TODO this should be taken from the config
- methods["DIGEST-MD5"] = true;
- return methods;
+ return {["PLAIN"] = true, ["DIGEST-MD5"] = true}; -- TODO this should be taken from the config
end
function is_admin(jid)
- local admins = config.get("*", "core", "admins") or {};
+ local admins = config.get("*", "core", "admins");
if type(admins) == "table" then
jid = jid_bare(jid);
for _,admin in ipairs(admins) do