author | Matthew Wild <mwild1@gmail.com> |
Sat, 27 Apr 2013 14:59:00 +0100 | |
changeset 5527 | 7e7f45f587a1 |
parent 5459 | 3a821511b9ec |
child 5776 | bd0ff8ae98a8 |
child 6602 | f93e1b2ec327 |
permissions | -rw-r--r-- |
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1479
diff
changeset
|
1 |
-- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2858
diff
changeset
|
2 |
-- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2858
diff
changeset
|
3 |
-- Copyright (C) 2008-2010 Waqas Hussain |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
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:
429
diff
changeset
|
7 |
-- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
8 |
|
4981
95c18750b89e
sessionmanager: Clean up some unused variables and imports
Matthew Wild <mwild1@gmail.com>
parents:
4961
diff
changeset
|
9 |
local tostring, setmetatable = tostring, setmetatable; |
95c18750b89e
sessionmanager: Clean up some unused variables and imports
Matthew Wild <mwild1@gmail.com>
parents:
4961
diff
changeset
|
10 |
local pairs, next= pairs, next; |
38 | 11 |
|
12 |
local hosts = hosts; |
|
1223
9767e52f861c
sessionmanager: Added reference to globals full_sessions and bare_sessions
Waqas Hussain <waqas20@gmail.com>
parents:
1222
diff
changeset
|
13 |
local full_sessions = full_sessions; |
9767e52f861c
sessionmanager: Added reference to globals full_sessions and bare_sessions
Waqas Hussain <waqas20@gmail.com>
parents:
1222
diff
changeset
|
14 |
local bare_sessions = bare_sessions; |
38 | 15 |
|
1684
645e18990211
core.sessionmanager, xmppclient_listener: Move responsibility for setting session.log to the former from the latter, much more sensible
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
16 |
local logger = require "util.logger"; |
645e18990211
core.sessionmanager, xmppclient_listener: Move responsibility for setting session.log to the former from the latter, much more sensible
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
17 |
local log = logger.init("sessionmanager"); |
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
77
diff
changeset
|
18 |
local rm_load_roster = require "core.rostermanager".load_roster; |
429
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
19 |
local config_get = require "core.configmanager".get; |
2832
8c754c61c72e
sessionmanager: Added resource prepping, and invalid resource checking to the bind_resource function.
Waqas Hussain <waqas20@gmail.com>
parents:
2816
diff
changeset
|
20 |
local resourceprep = require "util.encodings".stringprep.resourceprep; |
3236
4727b2b0e069
sessionmanager: Moved nodeprep to sessionmanager.make_authenticated.
Waqas Hussain <waqas20@gmail.com>
parents:
3091
diff
changeset
|
21 |
local nodeprep = require "util.encodings".stringprep.nodeprep; |
4552
414d857ee125
sessionmanager: Require uuid_generate()
Matthew Wild <mwild1@gmail.com>
parents:
4548
diff
changeset
|
22 |
local uuid_generate = require "util.uuid".generate; |
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:
49
diff
changeset
|
23 |
|
3145
675241be2935
sessionmanager: Rename filters_initialize->initialize_filters
Matthew Wild <mwild1@gmail.com>
parents:
3143
diff
changeset
|
24 |
local initialize_filters = require "util.filters".initialize; |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
25 |
local gettime = require "socket".gettime; |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
26 |
|
30 | 27 |
module "sessionmanager" |
28 |
||
29 |
function new_session(conn) |
|
1469
9f2b6e2bc498
sessionmanager: Newly created sessions shouldn't have a priority. Fixes one of the stanza-gobbling bugs \o/
Matthew Wild <mwild1@gmail.com>
parents:
1450
diff
changeset
|
30 |
local session = { conn = conn, type = "c2s_unauthed", conntime = gettime() }; |
3145
675241be2935
sessionmanager: Rename filters_initialize->initialize_filters
Matthew Wild <mwild1@gmail.com>
parents:
3143
diff
changeset
|
31 |
local filter = initialize_filters(session); |
30 | 32 |
local w = conn.write; |
3143
887a6374f51c
sessionmanager: Initialize new sessions for filtering, and add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
3091
diff
changeset
|
33 |
session.send = function (t) |
887a6374f51c
sessionmanager: Initialize new sessions for filtering, and add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
3091
diff
changeset
|
34 |
if t.name then |
887a6374f51c
sessionmanager: Initialize new sessions for filtering, and add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
3091
diff
changeset
|
35 |
t = filter("stanzas/out", t); |
887a6374f51c
sessionmanager: Initialize new sessions for filtering, and add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
3091
diff
changeset
|
36 |
end |
887a6374f51c
sessionmanager: Initialize new sessions for filtering, and add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
3091
diff
changeset
|
37 |
if t then |
887a6374f51c
sessionmanager: Initialize new sessions for filtering, and add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
3091
diff
changeset
|
38 |
t = filter("bytes/out", tostring(t)); |
887a6374f51c
sessionmanager: Initialize new sessions for filtering, and add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
3091
diff
changeset
|
39 |
if t then |
887a6374f51c
sessionmanager: Initialize new sessions for filtering, and add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
3091
diff
changeset
|
40 |
return w(conn, t); |
887a6374f51c
sessionmanager: Initialize new sessions for filtering, and add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
3091
diff
changeset
|
41 |
end |
887a6374f51c
sessionmanager: Initialize new sessions for filtering, and add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
3091
diff
changeset
|
42 |
end |
887a6374f51c
sessionmanager: Initialize new sessions for filtering, and add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
3091
diff
changeset
|
43 |
end |
2103
0e0bc74c64a0
sessionmanager: Use : syntax for calling connection methods
Matthew Wild <mwild1@gmail.com>
parents:
1929
diff
changeset
|
44 |
session.ip = conn:ip(); |
5306
10bc0e2aa55e
s2smanager: Generate session names used for logging the same way everywhere
Kim Alvefur <zash@zash.se>
parents:
5211
diff
changeset
|
45 |
local conn_name = "c2s"..tostring(session):match("[a-f0-9]+$"); |
1684
645e18990211
core.sessionmanager, xmppclient_listener: Move responsibility for setting session.log to the former from the latter, much more sensible
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
46 |
session.log = logger.init(conn_name); |
645e18990211
core.sessionmanager, xmppclient_listener: Move responsibility for setting session.log to the former from the latter, much more sensible
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
47 |
|
30 | 48 |
return session; |
49 |
end |
|
50 |
||
2746
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
51 |
local resting_session = { -- Resting, not dead |
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
52 |
destroyed = true; |
2915
f47bd0f7e2e6
sessionmanager, s2smanager: Add type of ?2s_destroyed to resting sessions (fixes a logging traceback, thanks Flo)
Matthew Wild <mwild1@gmail.com>
parents:
2752
diff
changeset
|
53 |
type = "c2s_destroyed"; |
2750
4a6f32e6a8e5
sessionmanager: Add close method to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
54 |
close = function (session) |
4a6f32e6a8e5
sessionmanager: Add close method to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
55 |
session.log("debug", "Attempt to close already-closed session"); |
4a6f32e6a8e5
sessionmanager: Add close method to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
56 |
end; |
3459
543f31cdde19
sessionmanager, s2smanager: Give resting sessions a pass-through filter, fixes #202
Matthew Wild <mwild1@gmail.com>
parents:
3437
diff
changeset
|
57 |
filter = function (type, data) return data; end; |
2746
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
58 |
}; resting_session.__index = resting_session; |
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
59 |
|
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
60 |
function retire_session(session) |
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
61 |
local log = session.log or log; |
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
62 |
for k in pairs(session) do |
5447
92b88476873a
sessionmanager, s2smanager: Remove open_session tracing
Matthew Wild <mwild1@gmail.com>
parents:
5377
diff
changeset
|
63 |
if k ~= "log" and k ~= "id" then |
2746
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
64 |
session[k] = nil; |
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
65 |
end |
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
66 |
end |
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
67 |
|
4961
29b24a4028ed
sessionmanager: Have session.send() of a retired session return false to indicate failure
Matthew Wild <mwild1@gmail.com>
parents:
4813
diff
changeset
|
68 |
function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); return false; end |
2746
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
69 |
function session.data(data) log("debug", "Discarding data received from resting session: %s", tostring(data)); end |
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
70 |
return setmetatable(session, resting_session); |
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
71 |
end |
2857
6036c4b75235
sessionmanager, s2smanager: Give sessions dummy data handlers that log when data is received by a destroyed session
Matthew Wild <mwild1@gmail.com>
parents:
2832
diff
changeset
|
72 |
|
339
c6446bbfe40c
Fix sending of unavailable presence on disconnect
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
73 |
function destroy_session(session, err) |
4995
47a7ac6508b3
sessionmanager: Lower 'destroying session' message to 'debug' level (from 'info')
Matthew Wild <mwild1@gmail.com>
parents:
4993
diff
changeset
|
74 |
(session.log or log)("debug", "Destroying session for %s (%s@%s)%s", session.full_jid or "(unknown)", session.username or "(unknown)", session.host or "(unknown)", err and (": "..err) or ""); |
2752
18d8009f06cb
sessionmanager: Don't re-destroy destroyed sessions
Matthew Wild <mwild1@gmail.com>
parents:
2751
diff
changeset
|
75 |
if session.destroyed then return; end |
331 | 76 |
|
77 |
-- Remove session/resource from user's session list |
|
1225
1e01a913baf5
sessionmanager: Fixed an old FIXME: A problem caused by an error on an authenticated but unbound session
Waqas Hussain <waqas20@gmail.com>
parents:
1224
diff
changeset
|
78 |
if session.full_jid then |
4230
23b68616b6d8
sessionmanager: Fire pre-resource-unbind to allow plugins (such as mod_smacks) to hook and prevent/override session destruction
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
79 |
local host_session = hosts[session.host]; |
23b68616b6d8
sessionmanager: Fire pre-resource-unbind to allow plugins (such as mod_smacks) to hook and prevent/override session destruction
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
80 |
|
23b68616b6d8
sessionmanager: Fire pre-resource-unbind to allow plugins (such as mod_smacks) to hook and prevent/override session destruction
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
81 |
-- Allow plugins to prevent session destruction |
23b68616b6d8
sessionmanager: Fire pre-resource-unbind to allow plugins (such as mod_smacks) to hook and prevent/override session destruction
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
82 |
if host_session.events.fire_event("pre-resource-unbind", {session=session, error=err}) then |
23b68616b6d8
sessionmanager: Fire pre-resource-unbind to allow plugins (such as mod_smacks) to hook and prevent/override session destruction
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
83 |
return; |
23b68616b6d8
sessionmanager: Fire pre-resource-unbind to allow plugins (such as mod_smacks) to hook and prevent/override session destruction
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
84 |
end |
23b68616b6d8
sessionmanager: Fire pre-resource-unbind to allow plugins (such as mod_smacks) to hook and prevent/override session destruction
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
85 |
|
23b68616b6d8
sessionmanager: Fire pre-resource-unbind to allow plugins (such as mod_smacks) to hook and prevent/override session destruction
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
86 |
host_session.sessions[session.username].sessions[session.resource] = nil; |
1226
3b5f9dac2045
sessionmanager: Removed a redundant check
Waqas Hussain <waqas20@gmail.com>
parents:
1225
diff
changeset
|
87 |
full_sessions[session.full_jid] = nil; |
2580
61f0acd9086f
sessionmanager: Whitespace fix
Matthew Wild <mwild1@gmail.com>
parents:
2449
diff
changeset
|
88 |
|
4230
23b68616b6d8
sessionmanager: Fire pre-resource-unbind to allow plugins (such as mod_smacks) to hook and prevent/override session destruction
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
89 |
if not next(host_session.sessions[session.username].sessions) then |
1225
1e01a913baf5
sessionmanager: Fixed an old FIXME: A problem caused by an error on an authenticated but unbound session
Waqas Hussain <waqas20@gmail.com>
parents:
1224
diff
changeset
|
90 |
log("debug", "All resources of %s are now offline", session.username); |
4230
23b68616b6d8
sessionmanager: Fire pre-resource-unbind to allow plugins (such as mod_smacks) to hook and prevent/override session destruction
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
91 |
host_session.sessions[session.username] = nil; |
1301
d10d84f755b5
sessionmanager: It really is username@host, not host@username :)
Waqas Hussain <waqas20@gmail.com>
parents:
1290
diff
changeset
|
92 |
bare_sessions[session.username..'@'..session.host] = nil; |
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:
49
diff
changeset
|
93 |
end |
2591
d540a75a11db
sessionmanager: Fire resource-unbind event after removing session from sessions table
Matthew Wild <mwild1@gmail.com>
parents:
2580
diff
changeset
|
94 |
|
4230
23b68616b6d8
sessionmanager: Fire pre-resource-unbind to allow plugins (such as mod_smacks) to hook and prevent/override session destruction
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
95 |
host_session.events.fire_event("resource-unbind", {session=session, error=err}); |
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:
49
diff
changeset
|
96 |
end |
331 | 97 |
|
2746
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2622
diff
changeset
|
98 |
retire_session(session); |
38 | 99 |
end |
100 |
||
101 |
function make_authenticated(session, username) |
|
3236
4727b2b0e069
sessionmanager: Moved nodeprep to sessionmanager.make_authenticated.
Waqas Hussain <waqas20@gmail.com>
parents:
3091
diff
changeset
|
102 |
username = nodeprep(username); |
3239
5ea90ee96022
sessionmanager: Fixed a traceback on invalid usernames (typo in previous commit).
Waqas Hussain <waqas20@gmail.com>
parents:
3236
diff
changeset
|
103 |
if not username or #username == 0 then return nil, "Invalid username"; end |
38 | 104 |
session.username = username; |
105 |
if session.type == "c2s_unauthed" then |
|
106 |
session.type = "c2s"; |
|
107 |
end |
|
1076
ba3639692493
sessionmanager: Miscellaneous logging improvements, changing levels, improving messages and using session loggers where possible
Matthew Wild <mwild1@gmail.com>
parents:
970
diff
changeset
|
108 |
session.log("info", "Authenticated as %s@%s", username or "(unknown)", session.host or "(unknown)"); |
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:
49
diff
changeset
|
109 |
return true; |
38 | 110 |
end |
111 |
||
304
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
112 |
-- returns true, nil on success |
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
113 |
-- returns nil, err_type, err, err_message on failure |
38 | 114 |
function bind_resource(session, resource) |
304
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
115 |
if not session.username then return nil, "auth", "not-authorized", "Cannot bind resource before authentication"; end |
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
116 |
if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end |
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
117 |
-- We don't support binding multiple resources |
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
118 |
|
2832
8c754c61c72e
sessionmanager: Added resource prepping, and invalid resource checking to the bind_resource function.
Waqas Hussain <waqas20@gmail.com>
parents:
2816
diff
changeset
|
119 |
resource = resourceprep(resource); |
8c754c61c72e
sessionmanager: Added resource prepping, and invalid resource checking to the bind_resource function.
Waqas Hussain <waqas20@gmail.com>
parents:
2816
diff
changeset
|
120 |
resource = resource ~= "" and resource or uuid_generate(); |
38 | 121 |
--FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing |
122 |
||
123 |
if not hosts[session.host].sessions[session.username] then |
|
1224
35fa588e43a6
sessionmanager: Add/remove sessions from full_sessions and bare_sessions when binding/unbinding sessions
Waqas Hussain <waqas20@gmail.com>
parents:
1223
diff
changeset
|
124 |
local sessions = { sessions = {} }; |
35fa588e43a6
sessionmanager: Add/remove sessions from full_sessions and bare_sessions when binding/unbinding sessions
Waqas Hussain <waqas20@gmail.com>
parents:
1223
diff
changeset
|
125 |
hosts[session.host].sessions[session.username] = sessions; |
1290
c253905a8a55
sessionmanager: It's username@host, not host@username :)
Matthew Wild <mwild1@gmail.com>
parents:
1226
diff
changeset
|
126 |
bare_sessions[session.username..'@'..session.host] = sessions; |
38 | 127 |
else |
429
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
128 |
local sessions = hosts[session.host].sessions[session.username].sessions; |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
129 |
if sessions[resource] then |
38 | 130 |
-- Resource conflict |
5377
898454038524
core.*: Complete removal of all traces of the "core" section and section-related code.
Kim Alvefur <zash@zash.se>
parents:
5306
diff
changeset
|
131 |
local policy = config_get(session.host, "conflict_resolve"); |
429
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
132 |
local increment; |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
133 |
if policy == "random" then |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
134 |
resource = uuid_generate(); |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
135 |
increment = true; |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
136 |
elseif policy == "increment" then |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
137 |
increment = true; -- TODO ping old resource |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
138 |
elseif policy == "kick_new" then |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
139 |
return nil, "cancel", "conflict", "Resource already exists"; |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
140 |
else -- if policy == "kick_old" then |
791
a4be1d80775c
Fixed: kick_old resource conflict resolution policy could fail with a backtrace
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
141 |
sessions[resource]:close { |
429
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
142 |
condition = "conflict"; |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
143 |
text = "Replaced by new connection"; |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
144 |
}; |
791
a4be1d80775c
Fixed: kick_old resource conflict resolution policy could fail with a backtrace
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
145 |
if not next(sessions) then |
a4be1d80775c
Fixed: kick_old resource conflict resolution policy could fail with a backtrace
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
146 |
hosts[session.host].sessions[session.username] = { sessions = sessions }; |
1471
8b3753b080fc
sessionmanager: Reset bare_sessions[user] after resource conflict resolution. Fixes the other stanza gobbling bug \o/
Matthew Wild <mwild1@gmail.com>
parents:
1469
diff
changeset
|
147 |
bare_sessions[session.username.."@"..session.host] = hosts[session.host].sessions[session.username]; |
791
a4be1d80775c
Fixed: kick_old resource conflict resolution policy could fail with a backtrace
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
148 |
end |
429
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
149 |
end |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
150 |
if increment and sessions[resource] then |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
151 |
local count = 1; |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
152 |
while sessions[resource.."#"..count] do |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
153 |
count = count + 1; |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
154 |
end |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
155 |
resource = resource.."#"..count; |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
156 |
end |
38 | 157 |
end |
158 |
end |
|
159 |
||
160 |
session.resource = resource; |
|
161 |
session.full_jid = session.username .. '@' .. session.host .. '/' .. resource; |
|
162 |
hosts[session.host].sessions[session.username].sessions[resource] = session; |
|
1224
35fa588e43a6
sessionmanager: Add/remove sessions from full_sessions and bare_sessions when binding/unbinding sessions
Waqas Hussain <waqas20@gmail.com>
parents:
1223
diff
changeset
|
163 |
full_sessions[session.full_jid] = session; |
38 | 164 |
|
3088
a233aa051125
sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
165 |
local err; |
a233aa051125
sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
166 |
session.roster, err = rm_load_roster(session.username, session.host); |
a233aa051125
sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
167 |
if err then |
a233aa051125
sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
168 |
full_sessions[session.full_jid] = nil; |
a233aa051125
sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
169 |
hosts[session.host].sessions[session.username].sessions[resource] = nil; |
a233aa051125
sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
170 |
session.full_jid = nil; |
a233aa051125
sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
171 |
session.resource = nil; |
3091
d6a059af2077
rostermanager: Correctly clear the bare_sessions table on roster load errors during bind.
Waqas Hussain <waqas20@gmail.com>
parents:
3089
diff
changeset
|
172 |
if next(bare_sessions[session.username..'@'..session.host].sessions) == nil then |
3088
a233aa051125
sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
173 |
bare_sessions[session.username..'@'..session.host] = nil; |
a233aa051125
sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
174 |
hosts[session.host].sessions[session.username] = nil; |
a233aa051125
sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
175 |
end |
5211
80635a6cb126
sessionmanager: Log the actual error message when roster loading fails.
Waqas Hussain <waqas20@gmail.com>
parents:
4995
diff
changeset
|
176 |
session.log("error", "Roster loading failed: %s", err); |
3088
a233aa051125
sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
177 |
return nil, "cancel", "internal-server-error", "Error loading roster"; |
a233aa051125
sessionmanager: If roster loading fails during resource bind, kick the user with an internal-server-error.
Waqas Hussain <waqas20@gmail.com>
parents:
2925
diff
changeset
|
178 |
end |
77
531b981f2d17
Load roster on resource bind
Waqas Hussain <waqas20@gmail.com>
parents:
57
diff
changeset
|
179 |
|
1478
da11f2652ae9
sessionmanager: Replace raw session by an event data table for resource bind/unbind events, allowing extra data
Waqas Hussain <waqas20@gmail.com>
parents:
1471
diff
changeset
|
180 |
hosts[session.host].events.fire_event("resource-bind", {session=session}); |
1379
03d8a930053f
sessionmanager: Fire event on resource bind
Matthew Wild <mwild1@gmail.com>
parents:
1301
diff
changeset
|
181 |
|
38 | 182 |
return true; |
183 |
end |
|
184 |
||
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
185 |
function send_to_available_resources(user, host, stanza) |
2140
94b7ba39787d
sessionmanager: Fixed and cleaned function send_to_available_resources(). The 'to' attribute for presence subscription stanzas is now preserved.
Waqas Hussain <waqas20@gmail.com>
parents:
1929
diff
changeset
|
186 |
local jid = user.."@"..host; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
187 |
local count = 0; |
2140
94b7ba39787d
sessionmanager: Fixed and cleaned function send_to_available_resources(). The 'to' attribute for presence subscription stanzas is now preserved.
Waqas Hussain <waqas20@gmail.com>
parents:
1929
diff
changeset
|
188 |
local user = bare_sessions[jid]; |
94b7ba39787d
sessionmanager: Fixed and cleaned function send_to_available_resources(). The 'to' attribute for presence subscription stanzas is now preserved.
Waqas Hussain <waqas20@gmail.com>
parents:
1929
diff
changeset
|
189 |
if user then |
94b7ba39787d
sessionmanager: Fixed and cleaned function send_to_available_resources(). The 'to' attribute for presence subscription stanzas is now preserved.
Waqas Hussain <waqas20@gmail.com>
parents:
1929
diff
changeset
|
190 |
for k, session in pairs(user.sessions) do |
94b7ba39787d
sessionmanager: Fixed and cleaned function send_to_available_resources(). The 'to' attribute for presence subscription stanzas is now preserved.
Waqas Hussain <waqas20@gmail.com>
parents:
1929
diff
changeset
|
191 |
if session.presence then |
94b7ba39787d
sessionmanager: Fixed and cleaned function send_to_available_resources(). The 'to' attribute for presence subscription stanzas is now preserved.
Waqas Hussain <waqas20@gmail.com>
parents:
1929
diff
changeset
|
192 |
session.send(stanza); |
94b7ba39787d
sessionmanager: Fixed and cleaned function send_to_available_resources(). The 'to' attribute for presence subscription stanzas is now preserved.
Waqas Hussain <waqas20@gmail.com>
parents:
1929
diff
changeset
|
193 |
count = count + 1; |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
194 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
195 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
196 |
end |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
197 |
return count; |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
198 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
199 |
|
2141
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
200 |
function send_to_interested_resources(user, host, stanza) |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
201 |
local jid = user.."@"..host; |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
202 |
local count = 0; |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
203 |
local user = bare_sessions[jid]; |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
204 |
if user then |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
205 |
for k, session in pairs(user.sessions) do |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
206 |
if session.interested then |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
207 |
session.send(stanza); |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
208 |
count = count + 1; |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
209 |
end |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
210 |
end |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
211 |
end |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
212 |
return count; |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
213 |
end |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
214 |
|
614
335f2921ae0c
Newline at end of file for sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
597
diff
changeset
|
215 |
return _M; |