Sat, 17 Oct 2009 23:48:30 +0500
modulemanager: Slightly rearranged code for more robust unloading of modules.
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1218
diff
changeset
|
1 | -- Prosody IM |
760
90ce865eebd8
Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
2 | -- Copyright (C) 2008-2009 Matthew Wild |
90ce865eebd8
Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
3 | -- Copyright (C) 2008-2009 Waqas Hussain |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
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:
438
diff
changeset
|
7 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
8 | |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
9 | |
30 | 10 | |
11 | local st = require "util.stanza"; | |
12 | local t_concat = table.concat; | |
13 | ||
1912
126401a7159f
require_encryption deprecated, use c2s_require_encryption instead
Matthew Wild <mwild1@gmail.com>
parents:
1833
diff
changeset
|
14 | local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption"); |
1216
fd8ce71bc72b
mod_saslauth, mod_legacyauth: Deny logins to unsecure sessions when require_encryption config option is true
Matthew Wild <mwild1@gmail.com>
parents:
1042
diff
changeset
|
15 | |
1042
a3d77353c18a
mod_*: Fix a load of global accesses
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
16 | local sessionmanager = require "core.sessionmanager"; |
a3d77353c18a
mod_*: Fix a load of global accesses
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
17 | local usermanager = require "core.usermanager"; |
1828
ced7a6b8bcd0
mod_legacyauth: Added node and resource prepping.
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
18 | local nodeprep = require "util.encodings".stringprep.nodeprep; |
ced7a6b8bcd0
mod_legacyauth: Added node and resource prepping.
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
19 | local resourceprep = require "util.encodings".stringprep.resourceprep; |
1042
a3d77353c18a
mod_*: Fix a load of global accesses
Matthew Wild <mwild1@gmail.com>
parents:
894
diff
changeset
|
20 | |
541
3521e0851c9e
Change modules to use the new add_feature module API method.
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
21 | module:add_feature("jabber:iq:auth"); |
891
236d1ce9fa99
mod_legacyauth: Added stream feature: <auth xmlns='http://jabber.org/features/iq-auth'/>
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
22 | module:add_event_hook("stream-features", function (session, features) |
1218
8e02c10c9e60
mod_legacyauth: Hide stream feature when secure auth is enabled, and session isn't secure
Matthew Wild <mwild1@gmail.com>
parents:
1216
diff
changeset
|
23 | if secure_auth_only and not session.secure then |
8e02c10c9e60
mod_legacyauth: Hide stream feature when secure auth is enabled, and session isn't secure
Matthew Wild <mwild1@gmail.com>
parents:
1216
diff
changeset
|
24 | -- Sorry, not offering to insecure streams! |
8e02c10c9e60
mod_legacyauth: Hide stream feature when secure auth is enabled, and session isn't secure
Matthew Wild <mwild1@gmail.com>
parents:
1216
diff
changeset
|
25 | return; |
8e02c10c9e60
mod_legacyauth: Hide stream feature when secure auth is enabled, and session isn't secure
Matthew Wild <mwild1@gmail.com>
parents:
1216
diff
changeset
|
26 | elseif not session.username then |
8e02c10c9e60
mod_legacyauth: Hide stream feature when secure auth is enabled, and session isn't secure
Matthew Wild <mwild1@gmail.com>
parents:
1216
diff
changeset
|
27 | features:tag("auth", {xmlns='http://jabber.org/features/iq-auth'}):up(); |
8e02c10c9e60
mod_legacyauth: Hide stream feature when secure auth is enabled, and session isn't secure
Matthew Wild <mwild1@gmail.com>
parents:
1216
diff
changeset
|
28 | end |
891
236d1ce9fa99
mod_legacyauth: Added stream feature: <auth xmlns='http://jabber.org/features/iq-auth'/>
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
29 | end); |
421
63be85693710
Modules now sending disco replies
Waqas Hussain <waqas20@gmail.com>
parents:
308
diff
changeset
|
30 | |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
421
diff
changeset
|
31 | module:add_iq_handler("c2s_unauthed", "jabber:iq:auth", |
30 | 32 | function (session, stanza) |
1216
fd8ce71bc72b
mod_saslauth, mod_legacyauth: Deny logins to unsecure sessions when require_encryption config option is true
Matthew Wild <mwild1@gmail.com>
parents:
1042
diff
changeset
|
33 | if secure_auth_only and not session.secure then |
fd8ce71bc72b
mod_saslauth, mod_legacyauth: Deny logins to unsecure sessions when require_encryption config option is true
Matthew Wild <mwild1@gmail.com>
parents:
1042
diff
changeset
|
34 | session.send(st.error_reply(stanza, "modify", "not-acceptable", "Encryption (SSL or TLS) is required to connect to this server")); |
fd8ce71bc72b
mod_saslauth, mod_legacyauth: Deny logins to unsecure sessions when require_encryption config option is true
Matthew Wild <mwild1@gmail.com>
parents:
1042
diff
changeset
|
35 | return true; |
fd8ce71bc72b
mod_saslauth, mod_legacyauth: Deny logins to unsecure sessions when require_encryption config option is true
Matthew Wild <mwild1@gmail.com>
parents:
1042
diff
changeset
|
36 | end |
fd8ce71bc72b
mod_saslauth, mod_legacyauth: Deny logins to unsecure sessions when require_encryption config option is true
Matthew Wild <mwild1@gmail.com>
parents:
1042
diff
changeset
|
37 | |
30 | 38 | local username = stanza.tags[1]:child_with_name("username"); |
39 | local password = stanza.tags[1]:child_with_name("password"); | |
40 | local resource = stanza.tags[1]:child_with_name("resource"); | |
41 | if not (username and password and resource) then | |
42 | local reply = st.reply(stanza); | |
308
6345cf3e994a
Fixed mod_legacyauth to use session.send for sending stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
304
diff
changeset
|
43 | session.send(reply:query("jabber:iq:auth") |
30 | 44 | :tag("username"):up() |
45 | :tag("password"):up() | |
46 | :tag("resource"):up()); | |
47 | else | |
48 | username, password, resource = t_concat(username), t_concat(password), t_concat(resource); | |
1828
ced7a6b8bcd0
mod_legacyauth: Added node and resource prepping.
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
49 | username = nodeprep(username); |
ced7a6b8bcd0
mod_legacyauth: Added node and resource prepping.
Waqas Hussain <waqas20@gmail.com>
parents:
1523
diff
changeset
|
50 | resource = resourceprep(resource) |
30 | 51 | local reply = st.reply(stanza); |
52 | if usermanager.validate_credentials(session.host, username, password) then | |
53 | -- Authentication successful! | |
38 | 54 | local success, err = sessionmanager.make_authenticated(session, username); |
55 | if success then | |
304
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
154
diff
changeset
|
56 | local err_type, err_msg; |
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
154
diff
changeset
|
57 | success, err_type, err, err_msg = sessionmanager.bind_resource(session, resource); |
38 | 58 | if not success then |
304
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
154
diff
changeset
|
59 | session.send(st.error_reply(stanza, err_type, err, err_msg)); |
1829
a805e4fe104a
mod_legacyauth: Undo auth on bind fail. Legacy auth is atomic.
Waqas Hussain <waqas20@gmail.com>
parents:
1828
diff
changeset
|
60 | session.username, session.type = nil, "c2s_unauthed"; -- FIXME should this be placed in sessionmanager? |
38 | 61 | return true; |
1830
5408d5100bd0
mod_legacyauth: Don't allow server-generated resource identifiers, as these are not support by legacy auth.
Waqas Hussain <waqas20@gmail.com>
parents:
1829
diff
changeset
|
62 | elseif resource ~= session.resource then -- server changed resource, not supported by legacy auth |
5408d5100bd0
mod_legacyauth: Don't allow server-generated resource identifiers, as these are not support by legacy auth.
Waqas Hussain <waqas20@gmail.com>
parents:
1829
diff
changeset
|
63 | session.send(st.error_reply(stanza, "cancel", "conflict", "The requested resource could not be assigned to this session.")); |
5408d5100bd0
mod_legacyauth: Don't allow server-generated resource identifiers, as these are not support by legacy auth.
Waqas Hussain <waqas20@gmail.com>
parents:
1829
diff
changeset
|
64 | session:close(); -- FIXME undo resource bind and auth instead of closing the session? |
5408d5100bd0
mod_legacyauth: Don't allow server-generated resource identifiers, as these are not support by legacy auth.
Waqas Hussain <waqas20@gmail.com>
parents:
1829
diff
changeset
|
65 | return true; |
38 | 66 | end |
30 | 67 | end |
308
6345cf3e994a
Fixed mod_legacyauth to use session.send for sending stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
304
diff
changeset
|
68 | session.send(st.reply(stanza)); |
30 | 69 | else |
1689
5eb806590525
mod_legacyauth: Refactored a bit
Waqas Hussain <waqas20@gmail.com>
parents:
1688
diff
changeset
|
70 | session.send(st.error_reply(stanza, "auth", "not-authorized")); |
30 | 71 | end |
72 | end | |
1689
5eb806590525
mod_legacyauth: Refactored a bit
Waqas Hussain <waqas20@gmail.com>
parents:
1688
diff
changeset
|
73 | return true; |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
421
diff
changeset
|
74 | end); |