mirror of
https://github.com/bjc/prosody.git
synced 2025-04-04 13:47:41 +03:00
d73714b4f4
We began moving away from simple "is this user an admin?" permission checks
before 0.12, with the introduction of mod_authz_internal and the ability to
dynamically change the roles of individual users.
The approach in 0.12 still had various limitations however, and apart from
the introduction of roles other than "admin" and the ability to pull that info
from storage, not much actually changed.
This new framework shakes things up a lot, though aims to maintain the same
functionality and behaviour on the surface for a default Prosody
configuration. That is, if you don't take advantage of any of the new
features, you shouldn't notice any change.
The biggest change visible to developers is that usermanager.is_admin() (and
the auth provider is_admin() method) have been removed. Gone. Completely.
Permission checks should now be performed using a new module API method:
module:may(action_name, context)
This method accepts an action name, followed by either a JID (string) or
(preferably) a table containing 'origin'/'session' and 'stanza' fields (e.g.
the standard object passed to most events). It will return true if the action
should be permitted, or false/nil otherwise.
Modules should no longer perform permission checks based on the role name.
E.g. a lot of code previously checked if the user's role was prosody:admin
before permitting some action. Since many roles might now exist with similar
permissions, and the permissions of prosody:admin may be redefined
dynamically, it is no longer suitable to use this method for permission
checks. Use module:may().
If you start an action name with ':' (recommended) then the current module's
name will automatically be used as a prefix.
To define a new permission, use the new module API:
module:default_permission(role_name, action_name)
module:default_permissions(role_name, { action_name[, action_name...] })
This grants the specified role permission to execute the named action(s) by
default. This may be overridden via other mechanisms external to your module.
The built-in roles that developers should use are:
- prosody:user (normal user)
- prosody:admin (host admin)
- prosody:operator (global admin)
The new prosody:operator role is intended for server-wide actions (such as
shutting down Prosody).
Finally, all usage of is_admin() in modules has been fixed by this commit.
Some of these changes were trickier than others, but no change is expected to
break existing deployments.
EXCEPT: mod_auth_ldap no longer supports the ldap_admin_filter option. It's
very possible nobody is using this, but if someone is then we can later update
it to pull roles from LDAP somehow.
103 lines
3.2 KiB
Lua
103 lines
3.2 KiB
Lua
-- Copyright (C) 2009-2010 Florian Zeitz
|
|
--
|
|
-- This file is MIT/X11 licensed. Please see the
|
|
-- COPYING file in the source package for more information.
|
|
--
|
|
|
|
local st, uuid = require "util.stanza", require "util.uuid";
|
|
|
|
local xmlns_cmd = "http://jabber.org/protocol/commands";
|
|
|
|
local states = {}
|
|
|
|
local _M = {};
|
|
|
|
local function _cmdtag(desc, status, sessionid, action)
|
|
local cmd = st.stanza("command", { xmlns = xmlns_cmd, node = desc.node, status = status });
|
|
if sessionid then cmd.attr.sessionid = sessionid; end
|
|
if action then cmd.attr.action = action; end
|
|
|
|
return cmd;
|
|
end
|
|
|
|
function _M.new(name, node, handler, permission)
|
|
if not permission then
|
|
error "adhoc.new() expects a permission argument, none given"
|
|
elseif permission == "user" then
|
|
error "the permission mode 'user' has been renamed 'any', please update your code"
|
|
end
|
|
if permission == "admin" then
|
|
module:default_permission("prosody:admin", "mod_adhoc:"..node);
|
|
permission = "check";
|
|
elseif permission == "global_admin" then
|
|
module:default_permission("prosody:operator", "mod_adhoc:"..node);
|
|
permission = "check";
|
|
end
|
|
return { name = name, node = node, handler = handler, cmdtag = _cmdtag, permission = permission };
|
|
end
|
|
|
|
function _M.handle_cmd(command, origin, stanza)
|
|
local cmdtag = stanza.tags[1]
|
|
local sessionid = cmdtag.attr.sessionid or uuid.generate();
|
|
local dataIn = {
|
|
origin = origin;
|
|
stanza = stanza;
|
|
to = stanza.attr.to;
|
|
from = stanza.attr.from;
|
|
action = cmdtag.attr.action or "execute";
|
|
form = cmdtag:get_child("x", "jabber:x:data");
|
|
};
|
|
|
|
local data, state = command:handler(dataIn, states[sessionid]);
|
|
states[sessionid] = state;
|
|
local cmdreply;
|
|
if data.status == "completed" then
|
|
states[sessionid] = nil;
|
|
cmdreply = command:cmdtag("completed", sessionid);
|
|
elseif data.status == "canceled" then
|
|
states[sessionid] = nil;
|
|
cmdreply = command:cmdtag("canceled", sessionid);
|
|
elseif data.status == "error" then
|
|
states[sessionid] = nil;
|
|
local reply = st.error_reply(stanza, data.error);
|
|
origin.send(reply);
|
|
return true;
|
|
else
|
|
cmdreply = command:cmdtag("executing", sessionid);
|
|
data.actions = data.actions or { "complete" };
|
|
end
|
|
|
|
for name, content in pairs(data) do
|
|
if name == "info" then
|
|
cmdreply:tag("note", {type="info"}):text(content):up();
|
|
elseif name == "warn" then
|
|
cmdreply:tag("note", {type="warn"}):text(content):up();
|
|
elseif name == "error" then
|
|
cmdreply:tag("note", {type="error"}):text(content.message):up();
|
|
elseif name == "actions" then
|
|
local actions = st.stanza("actions", { execute = content.default });
|
|
for _, action in ipairs(content) do
|
|
if (action == "prev") or (action == "next") or (action == "complete") then
|
|
actions:tag(action):up();
|
|
else
|
|
module:log("error", "Command %q at node %q provided an invalid action %q",
|
|
command.name, command.node, action);
|
|
end
|
|
end
|
|
cmdreply:add_child(actions);
|
|
elseif name == "form" then
|
|
cmdreply:add_child((content.layout or content):form(content.values));
|
|
elseif name == "result" then
|
|
cmdreply:add_child((content.layout or content):form(content.values, "result"));
|
|
elseif name == "other" then
|
|
cmdreply:add_child(content);
|
|
end
|
|
end
|
|
local reply = st.reply(stanza);
|
|
reply:add_child(cmdreply);
|
|
origin.send(reply);
|
|
|
|
return true;
|
|
end
|
|
|
|
return _M;
|