Wed, 02 Jun 2010 17:51:14 +0100
sessionmanager: Initialize new sessions for filtering, and add filters for outgoing bytes and stanzas
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
1 | -- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2032
diff
changeset
|
2 | -- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2032
diff
changeset
|
3 | -- Copyright (C) 2008-2010 Waqas Hussain |
1585
edc066730d11
Switch to using a more generic credentials_callback/handler for SASL auth.
nick@lupine.me.uk
parents:
1523
diff
changeset
|
4 | -- |
758 | 5 | -- This project is MIT/X11 licensed. Please see the |
6 | -- COPYING file in the source package for more information. | |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
449
diff
changeset
|
7 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
449
diff
changeset
|
8 | |
2032
2714ccde2569
usermanager: Removed an unnecessary global access.
Waqas Hussain <waqas20@gmail.com>
parents:
2031
diff
changeset
|
9 | local datamanager = require "util.datamanager"; |
53
14ea0fe6ca86
Session destruction fixes, some debugging code while we fix the rest. Also change logger to be more useful.
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
10 | local log = require "util.logger".init("usermanager"); |
890
5b8da51b0843
usermanager: Added is_admin(jid)
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
11 | local type = type; |
228
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
12 | local error = error; |
890
5b8da51b0843
usermanager: Added is_admin(jid)
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
13 | local ipairs = ipairs; |
228
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
14 | local hashes = require "util.hashes"; |
890
5b8da51b0843
usermanager: Added is_admin(jid)
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
15 | local jid_bare = require "util.jid".bare; |
5b8da51b0843
usermanager: Added is_admin(jid)
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
16 | local config = require "core.configmanager"; |
2929
1e4e314bef33
usermanager: Return sane errors/results when Cyrus SASL is in use.
Waqas Hussain <waqas20@gmail.com>
parents:
2923
diff
changeset
|
17 | local hosts = hosts; |
0 | 18 | |
3064
596303990c7c
usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional (default: not required)
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
19 | local require_provisioning = config.get("*", "core", "cyrus_require_provisioning") or false; |
596303990c7c
usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional (default: not required)
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
20 | |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
21 | local prosody = _G.prosody; |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
22 | |
0 | 23 | module "usermanager" |
24 | ||
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
25 | local new_default_provider; |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
26 | |
3036
0714539bcf71
usermanager: Handle auth providers for components.
Waqas Hussain <waqas20@gmail.com>
parents:
3035
diff
changeset
|
27 | local function host_handler(host) |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
28 | local host_session = hosts[host]; |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
29 | host_session.events.add_handler("item-added/auth-provider", function (provider) |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
30 | if config.get(host, "core", "authentication") == provider.name then |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
31 | host_session.users = provider; |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
32 | end |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
33 | end); |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
34 | host_session.events.add_handler("item-removed/auth-provider", function (provider) |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
35 | if host_session.users == provider then |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
36 | host_session.users = new_default_provider(host); |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
37 | end |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
38 | end); |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
39 | host_session.users = new_default_provider(host); -- Start with the default usermanager provider |
3036
0714539bcf71
usermanager: Handle auth providers for components.
Waqas Hussain <waqas20@gmail.com>
parents:
3035
diff
changeset
|
40 | end |
0714539bcf71
usermanager: Handle auth providers for components.
Waqas Hussain <waqas20@gmail.com>
parents:
3035
diff
changeset
|
41 | prosody.events.add_handler("host-activated", host_handler); |
0714539bcf71
usermanager: Handle auth providers for components.
Waqas Hussain <waqas20@gmail.com>
parents:
3035
diff
changeset
|
42 | prosody.events.add_handler("component-activated", host_handler); |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
43 | |
2929
1e4e314bef33
usermanager: Return sane errors/results when Cyrus SASL is in use.
Waqas Hussain <waqas20@gmail.com>
parents:
2923
diff
changeset
|
44 | local function is_cyrus(host) return config.get(host, "core", "sasl_backend") == "cyrus"; end |
1e4e314bef33
usermanager: Return sane errors/results when Cyrus SASL is in use.
Waqas Hussain <waqas20@gmail.com>
parents:
2923
diff
changeset
|
45 | |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
46 | function new_default_provider(host) |
2999
9a8f942433c4
usermanager: Give the default auth provider a name, you'll never guess what it is.
Matthew Wild <mwild1@gmail.com>
parents:
2987
diff
changeset
|
47 | local provider = { name = "default" }; |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
48 | |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
49 | function provider:test_password(username, password) |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
50 | if is_cyrus(host) then return nil, "Legacy auth not supported with Cyrus SASL."; end |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
51 | local credentials = datamanager.load(username, host, "accounts") or {}; |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
52 | |
228
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
53 | if password == credentials.password then |
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
54 | return true; |
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
55 | else |
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
56 | return nil, "Auth failed. Invalid username or password."; |
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
57 | end |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
58 | end |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
59 | |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
60 | function provider:get_password(username) |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
61 | if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
62 | return (datamanager.load(username, host, "accounts") or {}).password; |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
63 | end |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
64 | |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
65 | function provider:set_password(username, password) |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
66 | if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
67 | local account = datamanager.load(username, host, "accounts"); |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
68 | if account then |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
69 | account.password = password; |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
70 | return datamanager.store(username, host, "accounts", account); |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
71 | end |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
72 | return nil, "Account not available."; |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
73 | end |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
74 | |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
75 | function provider:user_exists(username) |
3065 | 76 | if not(require_provisioning) and is_cyrus(host) then return true; end |
3116 | 77 | local account, err = datamanager.load(username, host, "accounts") ~= nil; -- FIXME also check for empty credentials |
78 | return (account or err) ~= nil; -- FIXME also check for empty credentials | |
228
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
79 | end |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
80 | |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
81 | function provider:create_user(username, password) |
3065 | 82 | if not(require_provisioning) and is_cyrus(host) then return nil, "Account creation/modification not available with Cyrus SASL."; end |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
83 | return datamanager.store(username, host, "accounts", {password = password}); |
228
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
84 | end |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
85 | |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
86 | function provider:get_supported_methods() |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
87 | return {["PLAIN"] = true, ["DIGEST-MD5"] = true}; -- TODO this should be taken from the config |
228
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
88 | end |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
89 | |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
90 | function provider:is_admin(jid) |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
91 | local admins = config.get(host, "core", "admins"); |
3035
5584c928d1f7
usermanager: Fix logic for per-host admin tables (thanks Maranda)
Matthew Wild <mwild1@gmail.com>
parents:
3031
diff
changeset
|
92 | if admins ~= config.get("*", "core", "admins") then |
5584c928d1f7
usermanager: Fix logic for per-host admin tables (thanks Maranda)
Matthew Wild <mwild1@gmail.com>
parents:
3031
diff
changeset
|
93 | if type(admins) == "table" then |
5584c928d1f7
usermanager: Fix logic for per-host admin tables (thanks Maranda)
Matthew Wild <mwild1@gmail.com>
parents:
3031
diff
changeset
|
94 | jid = jid_bare(jid); |
5584c928d1f7
usermanager: Fix logic for per-host admin tables (thanks Maranda)
Matthew Wild <mwild1@gmail.com>
parents:
3031
diff
changeset
|
95 | for _,admin in ipairs(admins) do |
5584c928d1f7
usermanager: Fix logic for per-host admin tables (thanks Maranda)
Matthew Wild <mwild1@gmail.com>
parents:
3031
diff
changeset
|
96 | if admin == jid then return true; end |
5584c928d1f7
usermanager: Fix logic for per-host admin tables (thanks Maranda)
Matthew Wild <mwild1@gmail.com>
parents:
3031
diff
changeset
|
97 | end |
5584c928d1f7
usermanager: Fix logic for per-host admin tables (thanks Maranda)
Matthew Wild <mwild1@gmail.com>
parents:
3031
diff
changeset
|
98 | elseif admins then |
5584c928d1f7
usermanager: Fix logic for per-host admin tables (thanks Maranda)
Matthew Wild <mwild1@gmail.com>
parents:
3031
diff
changeset
|
99 | log("error", "Option 'admins' for host '%s' is not a table", host); |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
100 | end |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
101 | end |
3030
2be7801474fb
usermanager: Fix for is_admin to work with the new auth provider architecture
Matthew Wild <mwild1@gmail.com>
parents:
2999
diff
changeset
|
102 | return is_admin(jid); -- Test whether it's a global admin instead |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
103 | end |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
104 | return provider; |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
105 | end |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
106 | |
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
107 | function validate_credentials(host, username, password, method) |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
108 | return hosts[host].users:test_password(username, password); |
0 | 109 | end |
38 | 110 | |
1585
edc066730d11
Switch to using a more generic credentials_callback/handler for SASL auth.
nick@lupine.me.uk
parents:
1523
diff
changeset
|
111 | function get_password(username, host) |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
112 | return hosts[host].users:get_password(username); |
1585
edc066730d11
Switch to using a more generic credentials_callback/handler for SASL auth.
nick@lupine.me.uk
parents:
1523
diff
changeset
|
113 | end |
2987
0acfae4da199
usermanager: Support for pluggable authentication providers
Matthew Wild <mwild1@gmail.com>
parents:
2934
diff
changeset
|
114 | |
2934
060bb8217fea
usermanager: Added function set_password.
Waqas Hussain <waqas20@gmail.com>
parents:
2929
diff
changeset
|
115 | function set_password(username, host, password) |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
116 | return hosts[host].users:set_password(username, password); |
2934
060bb8217fea
usermanager: Added function set_password.
Waqas Hussain <waqas20@gmail.com>
parents:
2929
diff
changeset
|
117 | end |
1585
edc066730d11
Switch to using a more generic credentials_callback/handler for SASL auth.
nick@lupine.me.uk
parents:
1523
diff
changeset
|
118 | |
60
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
53
diff
changeset
|
119 | function user_exists(username, host) |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
120 | return hosts[host].users:user_exists(username); |
60
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
53
diff
changeset
|
121 | end |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
53
diff
changeset
|
122 | |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
53
diff
changeset
|
123 | function create_user(username, password, host) |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
124 | return hosts[host].users:create_user(username, password); |
60
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
53
diff
changeset
|
125 | end |
44800be871f5
User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents:
53
diff
changeset
|
126 | |
228
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
127 | function get_supported_methods(host) |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
128 | return hosts[host].users:get_supported_methods(); |
228
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
129 | end |
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
130 | |
2030
d9382a16af5b
usermanager: Changed function is_admin to allow checking for host-specific admins.
Waqas Hussain <waqas20@gmail.com>
parents:
1589
diff
changeset
|
131 | function is_admin(jid, host) |
3030
2be7801474fb
usermanager: Fix for is_admin to work with the new auth provider architecture
Matthew Wild <mwild1@gmail.com>
parents:
2999
diff
changeset
|
132 | if host and host ~= "*" then |
3053
8bd3857a75ee
usermanager: Changed auth provider functions to methods.
Waqas Hussain <waqas20@gmail.com>
parents:
3037
diff
changeset
|
133 | return hosts[host].users:is_admin(jid); |
3030
2be7801474fb
usermanager: Fix for is_admin to work with the new auth provider architecture
Matthew Wild <mwild1@gmail.com>
parents:
2999
diff
changeset
|
134 | else -- Test only whether this JID is a global admin |
2be7801474fb
usermanager: Fix for is_admin to work with the new auth provider architecture
Matthew Wild <mwild1@gmail.com>
parents:
2999
diff
changeset
|
135 | local admins = config.get("*", "core", "admins"); |
2be7801474fb
usermanager: Fix for is_admin to work with the new auth provider architecture
Matthew Wild <mwild1@gmail.com>
parents:
2999
diff
changeset
|
136 | if type(admins) == "table" then |
2be7801474fb
usermanager: Fix for is_admin to work with the new auth provider architecture
Matthew Wild <mwild1@gmail.com>
parents:
2999
diff
changeset
|
137 | jid = jid_bare(jid); |
2be7801474fb
usermanager: Fix for is_admin to work with the new auth provider architecture
Matthew Wild <mwild1@gmail.com>
parents:
2999
diff
changeset
|
138 | for _,admin in ipairs(admins) do |
2be7801474fb
usermanager: Fix for is_admin to work with the new auth provider architecture
Matthew Wild <mwild1@gmail.com>
parents:
2999
diff
changeset
|
139 | if admin == jid then return true; end |
2be7801474fb
usermanager: Fix for is_admin to work with the new auth provider architecture
Matthew Wild <mwild1@gmail.com>
parents:
2999
diff
changeset
|
140 | end |
2be7801474fb
usermanager: Fix for is_admin to work with the new auth provider architecture
Matthew Wild <mwild1@gmail.com>
parents:
2999
diff
changeset
|
141 | elseif admins then |
3031
421890f3f247
usermanager: Bump log level of incorrect config option warnings
Matthew Wild <mwild1@gmail.com>
parents:
3030
diff
changeset
|
142 | log("error", "Option 'admins' for host '%s' is not a table", host); |
3030
2be7801474fb
usermanager: Fix for is_admin to work with the new auth provider architecture
Matthew Wild <mwild1@gmail.com>
parents:
2999
diff
changeset
|
143 | end |
2030
d9382a16af5b
usermanager: Changed function is_admin to allow checking for host-specific admins.
Waqas Hussain <waqas20@gmail.com>
parents:
1589
diff
changeset
|
144 | return nil; |
d9382a16af5b
usermanager: Changed function is_admin to allow checking for host-specific admins.
Waqas Hussain <waqas20@gmail.com>
parents:
1589
diff
changeset
|
145 | end |
890
5b8da51b0843
usermanager: Added is_admin(jid)
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
146 | end |
5b8da51b0843
usermanager: Added is_admin(jid)
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
147 | |
3037
0319abdcf04f
usermanager: Export new_default_provider()
Matthew Wild <mwild1@gmail.com>
parents:
3036
diff
changeset
|
148 | _M.new_default_provider = new_default_provider; |
0319abdcf04f
usermanager: Export new_default_provider()
Matthew Wild <mwild1@gmail.com>
parents:
3036
diff
changeset
|
149 | |
228
875842235836
Updated usermanager with DIGEST-MD5 support
Waqas Hussain <waqas20@gmail.com>
parents:
60
diff
changeset
|
150 | return _M; |