Software /
code /
prosody
Annotate
core/sessionmanager.lua @ 1410:b71a9e29adc3
stanza_router: Remove even more old routing code
author | Waqas Hussain <waqas20@gmail.com> |
---|---|
date | Thu, 25 Jun 2009 08:13:21 +0500 |
parent | 1395:1c547fb4e570 |
child | 1450:c1c7b27b983b |
rev | line source |
---|---|
896 | 1 -- Prosody IM v0.4 |
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:
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 |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
11 local tonumber, tostring = tonumber, tostring; |
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; |
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
|
13 local collectgarbage = collectgarbage; |
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
|
14 local m_random = import("math", "random"); |
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
|
15 local format = import("string", "format"); |
38 | 16 |
17 local hosts = hosts; | |
1223
9767e52f861c
sessionmanager: Added reference to globals full_sessions and bare_sessions
Waqas Hussain <waqas20@gmail.com>
parents:
1222
diff
changeset
|
18 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
|
19 local bare_sessions = bare_sessions; |
38 | 20 |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
21 local modulemanager = require "core.modulemanager"; |
30 | 22 local log = require "util.logger".init("sessionmanager"); |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
23 local error = error; |
145 | 24 local uuid_generate = require "util.uuid".generate; |
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
77
diff
changeset
|
25 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
|
26 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:
896
diff
changeset
|
27 local nameprep = require "util.encodings".stringprep.nameprep; |
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
|
28 |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
29 local fire_event = require "core.eventmanager".fire_event; |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
30 |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
31 local gettime = require "socket".gettime; |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
32 |
339
c6446bbfe40c
Fix sending of unavailable presence on disconnect
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
33 local st = require "util.stanza"; |
c6446bbfe40c
Fix sending of unavailable presence on disconnect
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
34 |
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
|
35 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
|
36 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
|
37 |
30 | 38 module "sessionmanager" |
39 | |
123
ebd65feb188c
Fix for not destroying sessions when connection closed.
Matthew Wild <mwild1@gmail.com>
parents:
118
diff
changeset
|
40 local open_sessions = 0; |
ebd65feb188c
Fix for not destroying sessions when connection closed.
Matthew Wild <mwild1@gmail.com>
parents:
118
diff
changeset
|
41 |
30 | 42 function new_session(conn) |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
43 local session = { conn = conn, priority = 0, 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
|
44 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
|
45 session.trace = newproxy(true); |
583
5821eaa80baa
Remove print()s from sessionmanager and s2smanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
46 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
|
47 end |
123
ebd65feb188c
Fix for not destroying sessions when connection closed.
Matthew Wild <mwild1@gmail.com>
parents:
118
diff
changeset
|
48 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
|
49 log("debug", "open sessions now: ".. open_sessions); |
30 | 50 local w = conn.write; |
51 session.send = function (t) w(tostring(t)); end | |
694
b97b05261156
Set session.ip to the IP address of connecting clients
Matthew Wild <mwild1@gmail.com>
parents:
623
diff
changeset
|
52 session.ip = conn.ip(); |
30 | 53 return session; |
54 end | |
55 | |
339
c6446bbfe40c
Fix sending of unavailable presence on disconnect
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
56 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
|
57 (session.log or log)("info", "Destroying session for %s (%s@%s)", session.full_jid or "(unknown)", session.username or "(unknown)", session.host or "(unknown)"); |
331 | 58 |
59 -- Send unavailable presence | |
332
51e130b5c8de
Remove useless check for unavailable presence (which never exists)
Matthew Wild <mwild1@gmail.com>
parents:
331
diff
changeset
|
60 if session.presence then |
331 | 61 local pres = st.presence{ type = "unavailable" }; |
339
c6446bbfe40c
Fix sending of unavailable presence on disconnect
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
62 if (not err) or err == "closed" then err = "connection closed"; end |
950
a00b4269de70
core.sessionmanager: Hop out of <status> tag so that MUC doesn't insert into the wrong level
Matthew Wild <mwild1@gmail.com>
parents:
930
diff
changeset
|
63 pres:tag("status"):text("Disconnected: "..err):up(); |
597
e33d384e1b2e
stanza_dispatch = core_process_stanza, fixed for xmpp{client,server} listeners, and sessionmanager for the new syntax
Matthew Wild <mwild1@gmail.com>
parents:
583
diff
changeset
|
64 session:dispatch_stanza(pres); |
331 | 65 end |
66 | |
67 -- 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
|
68 if session.full_jid then |
1395
1c547fb4e570
sessionmanager: Fire event on resource unbind
Waqas Hussain <waqas20@gmail.com>
parents:
1379
diff
changeset
|
69 hosts[session.host].events.fire_event("resource-unbind", session); |
1c547fb4e570
sessionmanager: Fire event on resource unbind
Waqas Hussain <waqas20@gmail.com>
parents:
1379
diff
changeset
|
70 |
1226
3b5f9dac2045
sessionmanager: Removed a redundant check
Waqas Hussain <waqas20@gmail.com>
parents:
1225
diff
changeset
|
71 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
|
72 full_sessions[session.full_jid] = nil; |
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
|
73 |
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
|
74 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
|
75 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
|
76 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
|
77 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
|
78 end |
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
|
79 end |
331 | 80 |
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
|
81 for k in pairs(session) do |
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
|
82 if k ~= "trace" 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
|
83 session[k] = nil; |
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
|
84 end |
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
|
85 end |
38 | 86 end |
87 | |
88 function make_authenticated(session, username) | |
89 session.username = username; | |
90 if session.type == "c2s_unauthed" then | |
91 session.type = "c2s"; | |
92 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
|
93 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
|
94 return true; |
38 | 95 end |
96 | |
304
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
97 -- returns true, nil on success |
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
98 -- returns nil, err_type, err, err_message on failure |
38 | 99 function bind_resource(session, resource) |
304
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
100 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
|
101 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
|
102 -- We don't support binding multiple resources |
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
103 |
44
80d2ade0fd69
Add "uuid" library and make sessionmanager use this.
Matthew Wild <mwild1@gmail.com>
parents:
41
diff
changeset
|
104 resource = resource or uuid_generate(); |
38 | 105 --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing |
106 | |
107 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
|
108 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
|
109 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
|
110 bare_sessions[session.username..'@'..session.host] = sessions; |
38 | 111 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
|
112 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
|
113 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
|
114 if #sessions >= limit 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
|
115 return nil, "cancel", "conflict", "Resource limit reached; only "..limit.." resources allowed"; |
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
116 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
|
117 if sessions[resource] then |
38 | 118 -- 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
|
119 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
|
120 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
|
121 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
|
122 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
|
123 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
|
124 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
|
125 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
|
126 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
|
127 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
|
128 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
|
129 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
|
130 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
|
131 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
|
132 }; |
791
a4be1d80775c
Fixed: kick_old resource conflict resolution policy could fail with a backtrace
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
133 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
|
134 hosts[session.host].sessions[session.username] = { sessions = sessions }; |
a4be1d80775c
Fixed: kick_old resource conflict resolution policy could fail with a backtrace
Waqas Hussain <waqas20@gmail.com>
parents:
760
diff
changeset
|
135 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
|
136 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
|
137 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
|
138 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
|
139 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
|
140 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
|
141 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
|
142 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
|
143 end |
38 | 144 end |
145 end | |
146 | |
147 session.resource = resource; | |
148 session.full_jid = session.username .. '@' .. session.host .. '/' .. resource; | |
149 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
|
150 full_sessions[session.full_jid] = session; |
38 | 151 |
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
77
diff
changeset
|
152 session.roster = rm_load_roster(session.username, session.host); |
77
531b981f2d17
Load roster on resource bind
Waqas Hussain <waqas20@gmail.com>
parents:
57
diff
changeset
|
153 |
1379
03d8a930053f
sessionmanager: Fire event on resource bind
Matthew Wild <mwild1@gmail.com>
parents:
1301
diff
changeset
|
154 hosts[session.host].events.fire_event("resource-bind", session); |
03d8a930053f
sessionmanager: Fire event on resource bind
Matthew Wild <mwild1@gmail.com>
parents:
1301
diff
changeset
|
155 |
38 | 156 return true; |
157 end | |
158 | |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
159 function streamopened(session, attr) |
970
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
160 local send = session.send; |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
161 session.host = attr.to or error("Client failed to specify destination hostname"); |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
162 session.host = nameprep(session.host); |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
163 session.version = tonumber(attr.version) or 0; |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
164 session.streamid = m_random(1000000, 99999999); |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
165 (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
|
166 |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
167 send("<?xml version='1.0'?>"); |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
168 send(format("<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='%s' from='%s' version='1.0'>", session.streamid, session.host)); |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
169 |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
170 if not hosts[session.host] then |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
171 -- We don't serve this host... |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
172 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
|
173 return; |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
174 end |
1213
de66fa750daf
sessionmanager, mod_tls: Mark a session as secure when TLS is active
Matthew Wild <mwild1@gmail.com>
parents:
1076
diff
changeset
|
175 |
de66fa750daf
sessionmanager, mod_tls: Mark a session as secure when TLS is active
Matthew Wild <mwild1@gmail.com>
parents:
1076
diff
changeset
|
176 -- 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
|
177 -- 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
|
178 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
|
179 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
|
180 end |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
181 |
970
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
182 local features = st.stanza("stream:features"); |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
183 fire_event("stream-features", session, features); |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
184 |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
185 send(features); |
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
186 |
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
|
187 (session.log or log)("debug", "Sent reply <stream:stream> to client"); |
970
5516f9e66482
sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
188 session.notopen = nil; |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
189 end |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
190 |
959
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
950
diff
changeset
|
191 function streamclosed(session) |
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
950
diff
changeset
|
192 session.send("</stream:stream>"); |
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
950
diff
changeset
|
193 session.notopen = true; |
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
950
diff
changeset
|
194 end |
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
950
diff
changeset
|
195 |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
196 function send_to_available_resources(user, host, stanza) |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
197 local count = 0; |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
198 local to = stanza.attr.to; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
199 stanza.attr.to = nil; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
200 local h = hosts[host]; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
201 if h and h.type == "local" then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
202 local u = h.sessions[user]; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
203 if u then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
204 for k, session in pairs(u.sessions) do |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
205 if session.presence then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
206 session.send(stanza); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
207 count = count + 1; |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
208 end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
209 end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
210 end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
211 end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
212 stanza.attr.to = to; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
213 return count; |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
214 end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
215 |
614
335f2921ae0c
Newline at end of file for sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
597
diff
changeset
|
216 return _M; |