Fri, 01 Oct 2010 16:44:49 +0200
mod_adhoc: Answer disco#info for node=xmlns_cmd
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 | |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
9 | |
30 | 10 | |
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
|
11 | local tonumber, tostring, setmetatable = tonumber, tostring, setmetatable; |
126
63863534b1f1
Final fix for marking user offline when all resources are gone :)
Matthew Wild <mwild1@gmail.com>
parents:
125
diff
changeset
|
12 | local ipairs, pairs, print, next= ipairs, pairs, print, next; |
49
1cd2a8db392d
New "import" module to help tidy up all the local declarations at the top of modules
Matthew Wild <mwild1@gmail.com>
parents:
44
diff
changeset
|
13 | local format = import("string", "format"); |
38 | 14 | |
15 | local hosts = hosts; | |
1223
9767e52f861c
sessionmanager: Added reference to globals full_sessions and bare_sessions
Waqas Hussain <waqas20@gmail.com>
parents:
1222
diff
changeset
|
16 | 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
|
17 | local bare_sessions = bare_sessions; |
38 | 18 | |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
19 | local modulemanager = require "core.modulemanager"; |
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
|
20 | 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
|
21 | local log = logger.init("sessionmanager"); |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
22 | local error = error; |
145 | 23 | local uuid_generate = require "util.uuid".generate; |
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
77
diff
changeset
|
24 | 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
|
25 | local config_get = require "core.configmanager".get; |
930
fed53329818d
Fixed: sessionmanager: Apply nameprep on hostname passed in stream tag (part of issue #57)
Waqas Hussain <waqas20@gmail.com>
parents:
894
diff
changeset
|
26 | local nameprep = require "util.encodings".stringprep.nameprep; |
2832
8c754c61c72e
sessionmanager: Added resource prepping, and invalid resource checking to the bind_resource function.
Waqas Hussain <waqas20@gmail.com>
parents:
2816
diff
changeset
|
27 | 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
|
28 | local nodeprep = require "util.encodings".stringprep.nodeprep; |
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
|
29 | |
3145
675241be2935
sessionmanager: Rename filters_initialize->initialize_filters
Matthew Wild <mwild1@gmail.com>
parents:
3143
diff
changeset
|
30 | local initialize_filters = require "util.filters".initialize; |
3437
1e93b4d46d92
sessionmanager: Remove dependency on eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
3240
diff
changeset
|
31 | local fire_event = prosody.events.fire_event; |
1872
1905eca82ddf
sessionmanager: Add c2s_timeout option for unauthenticated client connections
Matthew Wild <mwild1@gmail.com>
parents:
1684
diff
changeset
|
32 | local add_task = require "util.timer".add_task; |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
33 | local gettime = require "socket".gettime; |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
34 | |
339
c6446bbfe40c
Fix sending of unavailable presence on disconnect
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
35 | local st = require "util.stanza"; |
c6446bbfe40c
Fix sending of unavailable presence on disconnect
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
36 | |
1872
1905eca82ddf
sessionmanager: Add c2s_timeout option for unauthenticated client connections
Matthew Wild <mwild1@gmail.com>
parents:
1684
diff
changeset
|
37 | local c2s_timeout = config_get("*", "core", "c2s_timeout"); |
1905eca82ddf
sessionmanager: Add c2s_timeout option for unauthenticated client connections
Matthew Wild <mwild1@gmail.com>
parents:
1684
diff
changeset
|
38 | |
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
|
39 | local newproxy = newproxy; |
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
|
40 | local getmetatable = getmetatable; |
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
|
41 | |
30 | 42 | module "sessionmanager" |
43 | ||
123
ebd65feb188c
Fix for not destroying sessions when connection closed.
Matthew Wild <mwild1@gmail.com>
parents:
118
diff
changeset
|
44 | local open_sessions = 0; |
ebd65feb188c
Fix for not destroying sessions when connection closed.
Matthew Wild <mwild1@gmail.com>
parents:
118
diff
changeset
|
45 | |
30 | 46 | 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
|
47 | local session = { conn = conn, type = "c2s_unauthed", conntime = gettime() }; |
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
|
48 | if true then |
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
|
49 | session.trace = newproxy(true); |
583
5821eaa80baa
Remove print()s from sessionmanager and s2smanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
50 | getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end; |
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
|
51 | end |
123
ebd65feb188c
Fix for not destroying sessions when connection closed.
Matthew Wild <mwild1@gmail.com>
parents:
118
diff
changeset
|
52 | open_sessions = open_sessions + 1; |
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
|
53 | log("debug", "open sessions now: ".. open_sessions); |
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
|
54 | |
3145
675241be2935
sessionmanager: Rename filters_initialize->initialize_filters
Matthew Wild <mwild1@gmail.com>
parents:
3143
diff
changeset
|
55 | local filter = initialize_filters(session); |
30 | 56 | 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
|
57 | 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
|
58 | 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
|
59 | 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
|
60 | 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
|
61 | 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
|
62 | 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
|
63 | 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
|
64 | 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
|
65 | 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
|
66 | 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
|
67 | end |
2100
0e0bc74c64a0
sessionmanager: Use : syntax for calling connection methods
Matthew Wild <mwild1@gmail.com>
parents:
1929
diff
changeset
|
68 | session.ip = conn:ip(); |
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
|
69 | local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$"); |
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
|
70 | session.log = logger.init(conn_name); |
1872
1905eca82ddf
sessionmanager: Add c2s_timeout option for unauthenticated client connections
Matthew Wild <mwild1@gmail.com>
parents:
1684
diff
changeset
|
71 | |
1905eca82ddf
sessionmanager: Add c2s_timeout option for unauthenticated client connections
Matthew Wild <mwild1@gmail.com>
parents:
1684
diff
changeset
|
72 | if c2s_timeout then |
1905eca82ddf
sessionmanager: Add c2s_timeout option for unauthenticated client connections
Matthew Wild <mwild1@gmail.com>
parents:
1684
diff
changeset
|
73 | add_task(c2s_timeout, function () |
1905eca82ddf
sessionmanager: Add c2s_timeout option for unauthenticated client connections
Matthew Wild <mwild1@gmail.com>
parents:
1684
diff
changeset
|
74 | if session.type == "c2s_unauthed" then |
1905eca82ddf
sessionmanager: Add c2s_timeout option for unauthenticated client connections
Matthew Wild <mwild1@gmail.com>
parents:
1684
diff
changeset
|
75 | session:close("connection-timeout"); |
1905eca82ddf
sessionmanager: Add c2s_timeout option for unauthenticated client connections
Matthew Wild <mwild1@gmail.com>
parents:
1684
diff
changeset
|
76 | end |
1905eca82ddf
sessionmanager: Add c2s_timeout option for unauthenticated client connections
Matthew Wild <mwild1@gmail.com>
parents:
1684
diff
changeset
|
77 | end); |
1905eca82ddf
sessionmanager: Add c2s_timeout option for unauthenticated client connections
Matthew Wild <mwild1@gmail.com>
parents:
1684
diff
changeset
|
78 | end |
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
|
79 | |
30 | 80 | return session; |
81 | end | |
82 | ||
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
|
83 | 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
|
84 | 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
|
85 | type = "c2s_destroyed"; |
2750
4a6f32e6a8e5
sessionmanager: Add close method to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
86 | close = function (session) |
4a6f32e6a8e5
sessionmanager: Add close method to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
87 | 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
|
88 | end; |
3459
543f31cdde19
sessionmanager, s2smanager: Give resting sessions a pass-through filter, fixes #202
Matthew Wild <mwild1@gmail.com>
parents:
3437
diff
changeset
|
89 | 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
|
90 | }; 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
|
91 | |
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
|
92 | 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
|
93 | 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
|
94 | for k in pairs(session) do |
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
|
95 | if k ~= "trace" and k ~= "log" and k ~= "id" then |
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
|
96 | 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
|
97 | 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
|
98 | 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
|
99 | |
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
|
100 | function session.send(data) log("debug", "Discarding data sent to 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
|
101 | 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
|
102 | 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
|
103 | 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
|
104 | |
339
c6446bbfe40c
Fix sending of unavailable presence on disconnect
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
105 | function destroy_session(session, err) |
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
|
106 | (session.log or log)("info", "Destroying session for %s (%s@%s)", session.full_jid or "(unknown)", session.username or "(unknown)", session.host or "(unknown)"); |
2752
18d8009f06cb
sessionmanager: Don't re-destroy destroyed sessions
Matthew Wild <mwild1@gmail.com>
parents:
2751
diff
changeset
|
107 | if session.destroyed then return; end |
331 | 108 | |
109 | -- 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
|
110 | if session.full_jid then |
1226
3b5f9dac2045
sessionmanager: Removed a redundant check
Waqas Hussain <waqas20@gmail.com>
parents:
1225
diff
changeset
|
111 | hosts[session.host].sessions[session.username].sessions[session.resource] = nil; |
3b5f9dac2045
sessionmanager: Removed a redundant check
Waqas Hussain <waqas20@gmail.com>
parents:
1225
diff
changeset
|
112 | full_sessions[session.full_jid] = nil; |
2580
61f0acd9086f
sessionmanager: Whitespace fix
Matthew Wild <mwild1@gmail.com>
parents:
2449
diff
changeset
|
113 | |
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
|
114 | if not next(hosts[session.host].sessions[session.username].sessions) then |
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
|
115 | log("debug", "All resources of %s are now offline", session.username); |
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
|
116 | hosts[session.host].sessions[session.username] = nil; |
1301
d10d84f755b5
sessionmanager: It really is username@host, not host@username :)
Waqas Hussain <waqas20@gmail.com>
parents:
1290
diff
changeset
|
117 | 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
|
118 | end |
2591
d540a75a11db
sessionmanager: Fire resource-unbind event after removing session from sessions table
Matthew Wild <mwild1@gmail.com>
parents:
2580
diff
changeset
|
119 | |
d540a75a11db
sessionmanager: Fire resource-unbind event after removing session from sessions table
Matthew Wild <mwild1@gmail.com>
parents:
2580
diff
changeset
|
120 | hosts[session.host].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
|
121 | end |
331 | 122 | |
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
|
123 | retire_session(session); |
38 | 124 | end |
125 | ||
126 | function make_authenticated(session, username) | |
3236
4727b2b0e069
sessionmanager: Moved nodeprep to sessionmanager.make_authenticated.
Waqas Hussain <waqas20@gmail.com>
parents:
3091
diff
changeset
|
127 | 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
|
128 | if not username or #username == 0 then return nil, "Invalid username"; end |
38 | 129 | session.username = username; |
130 | if session.type == "c2s_unauthed" then | |
131 | session.type = "c2s"; | |
132 | 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
|
133 | 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
|
134 | return true; |
38 | 135 | end |
136 | ||
304
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
137 | -- returns true, nil on success |
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
138 | -- returns nil, err_type, err, err_message on failure |
38 | 139 | function bind_resource(session, resource) |
304
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
140 | 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
|
141 | 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
|
142 | -- We don't support binding multiple resources |
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
143 | |
2832
8c754c61c72e
sessionmanager: Added resource prepping, and invalid resource checking to the bind_resource function.
Waqas Hussain <waqas20@gmail.com>
parents:
2816
diff
changeset
|
144 | 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
|
145 | resource = resource ~= "" and resource or uuid_generate(); |
38 | 146 | --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing |
147 | ||
148 | 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
|
149 | 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
|
150 | 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
|
151 | bare_sessions[session.username..'@'..session.host] = sessions; |
38 | 152 | 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
|
153 | 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
|
154 | local limit = config_get(session.host, "core", "max_resources") or 10; |
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 | if #sessions >= limit then |
3089
69fb1cb6b551
sessionmanager: Change error for reaching resource limit from 'conflict' to 'resource-constraint' during session bind.
Waqas Hussain <waqas20@gmail.com>
parents:
3088
diff
changeset
|
156 | return nil, "cancel", "resource-constraint", "Resource limit reached; only "..limit.." resources allowed"; |
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
|
157 | 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
|
158 | if sessions[resource] then |
38 | 159 | -- Resource conflict |
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
|
160 | local policy = config_get(session.host, "core", "conflict_resolve"); |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
161 | 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
|
162 | 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
|
163 | 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
|
164 | 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
|
165 | 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
|
166 | 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
|
167 | 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
|
168 | 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
|
169 | 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
|
170 | 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
|
171 | 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
|
172 | 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
|
173 | }; |
791
a4be1d80775c
Fixed: kick_old resource conflict resolution policy could fail with a backtrace
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
174 | 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
|
175 | 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
|
176 | 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
|
177 | 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
|
178 | 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
|
179 | 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
|
180 | 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
|
181 | 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
|
182 | 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
|
183 | 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
|
184 | 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
|
185 | end |
38 | 186 | end |
187 | end | |
188 | ||
189 | session.resource = resource; | |
190 | session.full_jid = session.username .. '@' .. session.host .. '/' .. resource; | |
191 | 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
|
192 | full_sessions[session.full_jid] = session; |
38 | 193 | |
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
|
194 | 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
|
195 | 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
|
196 | 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
|
197 | 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
|
198 | 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
|
199 | 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
|
200 | 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
|
201 | 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
|
202 | 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
|
203 | 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
|
204 | end |
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
|
205 | 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
|
206 | end |
77
531b981f2d17
Load roster on resource bind
Waqas Hussain <waqas20@gmail.com>
parents:
57
diff
changeset
|
207 | |
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
|
208 | 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
|
209 | |
38 | 210 | return true; |
211 | end | |
212 | ||
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
213 | function streamopened(session, attr) |
970
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
214 | local send = session.send; |
2751
1d7746c3a8c6
sessionmanager: Return stream error when incoming stream header is missing 'to' attribute
Matthew Wild <mwild1@gmail.com>
parents:
2750
diff
changeset
|
215 | session.host = attr.to; |
1d7746c3a8c6
sessionmanager: Return stream error when incoming stream header is missing 'to' attribute
Matthew Wild <mwild1@gmail.com>
parents:
2750
diff
changeset
|
216 | if not session.host then |
1d7746c3a8c6
sessionmanager: Return stream error when incoming stream header is missing 'to' attribute
Matthew Wild <mwild1@gmail.com>
parents:
2750
diff
changeset
|
217 | session:close{ condition = "improper-addressing", |
1d7746c3a8c6
sessionmanager: Return stream error when incoming stream header is missing 'to' attribute
Matthew Wild <mwild1@gmail.com>
parents:
2750
diff
changeset
|
218 | text = "A 'to' attribute is required on stream headers" }; |
1d7746c3a8c6
sessionmanager: Return stream error when incoming stream header is missing 'to' attribute
Matthew Wild <mwild1@gmail.com>
parents:
2750
diff
changeset
|
219 | return; |
1d7746c3a8c6
sessionmanager: Return stream error when incoming stream header is missing 'to' attribute
Matthew Wild <mwild1@gmail.com>
parents:
2750
diff
changeset
|
220 | end |
970
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
221 | session.host = nameprep(session.host); |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
222 | session.version = tonumber(attr.version) or 0; |
1873
3b770710a1ee
sessionmanager: Use UUID for stream ids to clients, no math.random anymore :)
Matthew Wild <mwild1@gmail.com>
parents:
1872
diff
changeset
|
223 | session.streamid = uuid_generate(); |
970
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
224 | (session.log or session)("debug", "Client sent opening <stream:stream> to %s", session.host); |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
225 | |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
226 | if not hosts[session.host] then |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
227 | -- We don't serve this host... |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
228 | session:close{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)}; |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
229 | return; |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
230 | end |
1929
b8e6764ffefd
sessionmanager: Mark client streams as opened sooner to avoid wrapping errors in unnecessary stream tags
Paul Aurich <paul@darkrain42.org>
parents:
1873
diff
changeset
|
231 | |
b8e6764ffefd
sessionmanager: Mark client streams as opened sooner to avoid wrapping errors in unnecessary stream tags
Paul Aurich <paul@darkrain42.org>
parents:
1873
diff
changeset
|
232 | send("<?xml version='1.0'?>"); |
b8e6764ffefd
sessionmanager: Mark client streams as opened sooner to avoid wrapping errors in unnecessary stream tags
Paul Aurich <paul@darkrain42.org>
parents:
1873
diff
changeset
|
233 | send(format("<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='%s' from='%s' version='1.0' xml:lang='en'>", session.streamid, session.host)); |
b8e6764ffefd
sessionmanager: Mark client streams as opened sooner to avoid wrapping errors in unnecessary stream tags
Paul Aurich <paul@darkrain42.org>
parents:
1873
diff
changeset
|
234 | |
b8e6764ffefd
sessionmanager: Mark client streams as opened sooner to avoid wrapping errors in unnecessary stream tags
Paul Aurich <paul@darkrain42.org>
parents:
1873
diff
changeset
|
235 | (session.log or log)("debug", "Sent reply <stream:stream> to client"); |
b8e6764ffefd
sessionmanager: Mark client streams as opened sooner to avoid wrapping errors in unnecessary stream tags
Paul Aurich <paul@darkrain42.org>
parents:
1873
diff
changeset
|
236 | session.notopen = nil; |
b8e6764ffefd
sessionmanager: Mark client streams as opened sooner to avoid wrapping errors in unnecessary stream tags
Paul Aurich <paul@darkrain42.org>
parents:
1873
diff
changeset
|
237 | |
1213
de66fa750daf
sessionmanager, mod_tls: Mark a session as secure when TLS is active
Matthew Wild <mwild1@gmail.com>
parents:
1076
diff
changeset
|
238 | -- If session.secure is *false* (not nil) then it means we /were/ encrypting |
de66fa750daf
sessionmanager, mod_tls: Mark a session as secure when TLS is active
Matthew Wild <mwild1@gmail.com>
parents:
1076
diff
changeset
|
239 | -- since we now have a new stream header, session is secured |
de66fa750daf
sessionmanager, mod_tls: Mark a session as secure when TLS is active
Matthew Wild <mwild1@gmail.com>
parents:
1076
diff
changeset
|
240 | if session.secure == false then |
de66fa750daf
sessionmanager, mod_tls: Mark a session as secure when TLS is active
Matthew Wild <mwild1@gmail.com>
parents:
1076
diff
changeset
|
241 | session.secure = true; |
de66fa750daf
sessionmanager, mod_tls: Mark a session as secure when TLS is active
Matthew Wild <mwild1@gmail.com>
parents:
1076
diff
changeset
|
242 | end |
1929
b8e6764ffefd
sessionmanager: Mark client streams as opened sooner to avoid wrapping errors in unnecessary stream tags
Paul Aurich <paul@darkrain42.org>
parents:
1873
diff
changeset
|
243 | |
970
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
244 | local features = st.stanza("stream:features"); |
2606
c3fe88d4b921
sessionmanager: Fire stream-features event using new events API.
Waqas Hussain <waqas20@gmail.com>
parents:
2591
diff
changeset
|
245 | hosts[session.host].events.fire_event("stream-features", { origin = session, features = features }); |
970
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
246 | fire_event("stream-features", session, features); |
1929
b8e6764ffefd
sessionmanager: Mark client streams as opened sooner to avoid wrapping errors in unnecessary stream tags
Paul Aurich <paul@darkrain42.org>
parents:
1873
diff
changeset
|
247 | |
970
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
248 | send(features); |
1929
b8e6764ffefd
sessionmanager: Mark client streams as opened sooner to avoid wrapping errors in unnecessary stream tags
Paul Aurich <paul@darkrain42.org>
parents:
1873
diff
changeset
|
249 | |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
250 | end |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
251 | |
959
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
950
diff
changeset
|
252 | function streamclosed(session) |
2747
168104895051
sessionmanager, s2smanager: Close session on </stream:stream>
Matthew Wild <mwild1@gmail.com>
parents:
2746
diff
changeset
|
253 | session.log("debug", "Received </stream:stream>"); |
168104895051
sessionmanager, s2smanager: Close session on </stream:stream>
Matthew Wild <mwild1@gmail.com>
parents:
2746
diff
changeset
|
254 | session:close(); |
959
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
950
diff
changeset
|
255 | end |
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
950
diff
changeset
|
256 | |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
257 | 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
|
258 | local jid = user.."@"..host; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
259 | 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
|
260 | 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
|
261 | 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
|
262 | 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
|
263 | 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
|
264 | 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
|
265 | count = count + 1; |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
266 | end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
267 | end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
268 | end |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
269 | return count; |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
270 | end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
271 | |
2141
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
272 | 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
|
273 | local jid = user.."@"..host; |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
274 | local count = 0; |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
275 | local user = bare_sessions[jid]; |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
276 | if user then |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
277 | 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
|
278 | if session.interested then |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
279 | session.send(stanza); |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
280 | count = count + 1; |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
281 | end |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
282 | end |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
283 | end |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
284 | return count; |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
285 | end |
f544729f9228
sessionmanager: Added function send_to_interested_resources().
Waqas Hussain <waqas20@gmail.com>
parents:
2140
diff
changeset
|
286 | |
614
335f2921ae0c
Newline at end of file for sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
597
diff
changeset
|
287 | return _M; |