Software / code / prosody
Annotate
core/sessionmanager.lua @ 332:51e130b5c8de
Remove useless check for unavailable presence (which never exists)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 18 Nov 2008 19:40:04 +0000 |
| parent | 331:830fd67f9378 |
| child | 333:8d15b073fdbe |
| rev | line source |
|---|---|
| 30 | 1 |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
2 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
|
3 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
|
4 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
|
5 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
|
6 local format = import("string", "format"); |
| 38 | 7 |
| 8 local hosts = hosts; | |
|
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
|
9 local sessions = sessions; |
| 38 | 10 |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
11 local modulemanager = require "core.modulemanager"; |
| 30 | 12 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
|
13 local error = error; |
| 145 | 14 local uuid_generate = require "util.uuid".generate; |
|
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
77
diff
changeset
|
15 local rm_load_roster = require "core.rostermanager".load_roster; |
|
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
|
16 |
|
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
|
17 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
|
18 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
|
19 |
| 30 | 20 module "sessionmanager" |
| 21 | |
|
123
ebd65feb188c
Fix for not destroying sessions when connection closed.
Matthew Wild <mwild1@gmail.com>
parents:
118
diff
changeset
|
22 local open_sessions = 0; |
|
ebd65feb188c
Fix for not destroying sessions when connection closed.
Matthew Wild <mwild1@gmail.com>
parents:
118
diff
changeset
|
23 |
| 30 | 24 function new_session(conn) |
|
99
ba08b8a4eeef
Abstract connections with "connection listeners"
Matthew Wild <mwild1@gmail.com>
parents:
77
diff
changeset
|
25 local session = { conn = conn, priority = 0, type = "c2s_unauthed" }; |
|
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
|
26 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
|
27 session.trace = newproxy(true); |
|
123
ebd65feb188c
Fix for not destroying sessions when connection closed.
Matthew Wild <mwild1@gmail.com>
parents:
118
diff
changeset
|
28 getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("Session got collected, now "..open_sessions.." sessions are allocated") 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
|
29 end |
|
123
ebd65feb188c
Fix for not destroying sessions when connection closed.
Matthew Wild <mwild1@gmail.com>
parents:
118
diff
changeset
|
30 open_sessions = open_sessions + 1; |
| 30 | 31 local w = conn.write; |
| 32 session.send = function (t) w(tostring(t)); end | |
| 33 return session; | |
| 34 end | |
| 35 | |
| 38 | 36 function destroy_session(session) |
|
156
884c43c7028a
Fix for sessionmanager to not throw error when session doesn't have a private logger
Matthew Wild <mwild1@gmail.com>
parents:
150
diff
changeset
|
37 (session.log or log)("info", "Destroying session"); |
| 331 | 38 |
| 39 -- Send unavailable presence | |
|
332
51e130b5c8de
Remove useless check for unavailable presence (which never exists)
Matthew Wild <mwild1@gmail.com>
parents:
331
diff
changeset
|
40 if session.presence then |
| 331 | 41 local pres = st.presence{ type = "unavailable" }; |
| 42 if err == "closed" then err = "connection closed"; end | |
| 43 pres:tag("status"):text("Disconnected: "..err); | |
| 44 session.stanza_dispatch(pres); | |
| 45 end | |
| 46 | |
| 47 -- Remove session/resource from user's session list | |
| 148 | 48 if session.host and session.username then |
|
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
|
49 if session.resource 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
|
50 hosts[session.host].sessions[session.username].sessions[session.resource] = 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
|
51 end |
| 148 | 52 if hosts[session.host] and hosts[session.host].sessions[session.username] then |
| 53 if not next(hosts[session.host].sessions[session.username].sessions) then | |
| 54 log("debug", "All resources of %s are now offline", session.username); | |
| 55 hosts[session.host].sessions[session.username] = nil; | |
| 56 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
|
57 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
|
58 end |
| 331 | 59 |
|
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
|
60 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
|
61 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
|
62 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
|
63 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
|
64 end |
| 38 | 65 end |
| 66 | |
| 67 function make_authenticated(session, username) | |
| 68 session.username = username; | |
| 69 if session.type == "c2s_unauthed" then | |
| 70 session.type = "c2s"; | |
| 71 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
|
72 return true; |
| 38 | 73 end |
| 74 | |
|
304
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
75 -- returns true, nil on success |
|
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
76 -- returns nil, err_type, err, err_message on failure |
| 38 | 77 function bind_resource(session, resource) |
|
304
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
78 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
|
79 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
|
80 -- We don't support binding multiple resources |
|
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
81 |
|
44
80d2ade0fd69
Add "uuid" library and make sessionmanager use this.
Matthew Wild <mwild1@gmail.com>
parents:
41
diff
changeset
|
82 resource = resource or uuid_generate(); |
| 38 | 83 --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing |
| 84 | |
| 85 if not hosts[session.host].sessions[session.username] then | |
| 86 hosts[session.host].sessions[session.username] = { sessions = {} }; | |
| 87 else | |
| 88 if hosts[session.host].sessions[session.username].sessions[resource] then | |
| 89 -- Resource conflict | |
|
304
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
90 return nil, "cancel", "conflict", "Resource already exists"; -- TODO kick old resource |
| 38 | 91 end |
| 92 end | |
| 93 | |
| 94 session.resource = resource; | |
| 95 session.full_jid = session.username .. '@' .. session.host .. '/' .. resource; | |
| 96 hosts[session.host].sessions[session.username].sessions[resource] = session; | |
| 97 | |
|
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
77
diff
changeset
|
98 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
|
99 |
| 38 | 100 return true; |
| 101 end | |
| 102 | |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
103 function streamopened(session, attr) |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
104 local send = session.send; |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
105 session.host = attr.to or error("Client failed to specify destination hostname"); |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
106 session.version = tonumber(attr.version) or 0; |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
107 session.streamid = m_random(1000000, 99999999); |
|
329
3be63719428e
Allow us to close client connections, with or without a stream error. Partially fixes #8, we still need the same for s2s (though it should be almost a straight copy of the code, I'm too tired atm)
Matthew Wild <mwild1@gmail.com>
parents:
317
diff
changeset
|
108 (session.log or session)("debug", "Client sent opening <stream:stream> to %s", session.host); |
|
3be63719428e
Allow us to close client connections, with or without a stream error. Partially fixes #8, we still need the same for s2s (though it should be almost a straight copy of the code, I'm too tired atm)
Matthew Wild <mwild1@gmail.com>
parents:
317
diff
changeset
|
109 |
|
3be63719428e
Allow us to close client connections, with or without a stream error. Partially fixes #8, we still need the same for s2s (though it should be almost a straight copy of the code, I'm too tired atm)
Matthew Wild <mwild1@gmail.com>
parents:
317
diff
changeset
|
110 |
|
3be63719428e
Allow us to close client connections, with or without a stream error. Partially fixes #8, we still need the same for s2s (though it should be almost a straight copy of the code, I'm too tired atm)
Matthew Wild <mwild1@gmail.com>
parents:
317
diff
changeset
|
111 send("<?xml version='1.0'?>"); |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
112 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)); |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
113 |
|
329
3be63719428e
Allow us to close client connections, with or without a stream error. Partially fixes #8, we still need the same for s2s (though it should be almost a straight copy of the code, I'm too tired atm)
Matthew Wild <mwild1@gmail.com>
parents:
317
diff
changeset
|
114 if not hosts[session.host] then |
|
3be63719428e
Allow us to close client connections, with or without a stream error. Partially fixes #8, we still need the same for s2s (though it should be almost a straight copy of the code, I'm too tired atm)
Matthew Wild <mwild1@gmail.com>
parents:
317
diff
changeset
|
115 -- We don't serve this host... |
|
3be63719428e
Allow us to close client connections, with or without a stream error. Partially fixes #8, we still need the same for s2s (though it should be almost a straight copy of the code, I'm too tired atm)
Matthew Wild <mwild1@gmail.com>
parents:
317
diff
changeset
|
116 session:disconnect{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)}; |
|
3be63719428e
Allow us to close client connections, with or without a stream error. Partially fixes #8, we still need the same for s2s (though it should be almost a straight copy of the code, I'm too tired atm)
Matthew Wild <mwild1@gmail.com>
parents:
317
diff
changeset
|
117 return; |
|
3be63719428e
Allow us to close client connections, with or without a stream error. Partially fixes #8, we still need the same for s2s (though it should be almost a straight copy of the code, I'm too tired atm)
Matthew Wild <mwild1@gmail.com>
parents:
317
diff
changeset
|
118 end |
|
3be63719428e
Allow us to close client connections, with or without a stream error. Partially fixes #8, we still need the same for s2s (though it should be almost a straight copy of the code, I'm too tired atm)
Matthew Wild <mwild1@gmail.com>
parents:
317
diff
changeset
|
119 |
|
3be63719428e
Allow us to close client connections, with or without a stream error. Partially fixes #8, we still need the same for s2s (though it should be almost a straight copy of the code, I'm too tired atm)
Matthew Wild <mwild1@gmail.com>
parents:
317
diff
changeset
|
120 |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
121 local features = {}; |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
122 modulemanager.fire_event("stream-features", session, features); |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
123 |
|
329
3be63719428e
Allow us to close client connections, with or without a stream error. Partially fixes #8, we still need the same for s2s (though it should be almost a straight copy of the code, I'm too tired atm)
Matthew Wild <mwild1@gmail.com>
parents:
317
diff
changeset
|
124 -- FIXME: Need to send() this all at once |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
125 send("<stream:features>"); |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
126 |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
127 for _, feature in ipairs(features) do |
|
312
63e523629389
Fixed sessionmanager to not send session in place of stream features...
Waqas Hussain <waqas20@gmail.com>
parents:
309
diff
changeset
|
128 send(tostring(feature)); |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
129 end |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
130 |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
131 send("</stream:features>"); |
|
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
|
132 log("info", "Stream opened successfully"); |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
133 session.notopen = nil; |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
134 end |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
135 |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
136 function send_to_available_resources(user, host, stanza) |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
137 local count = 0; |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
138 local to = stanza.attr.to; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
139 stanza.attr.to = nil; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
140 local h = hosts[host]; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
141 if h and h.type == "local" then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
142 local u = h.sessions[user]; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
143 if u then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
144 for k, session in pairs(u.sessions) do |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
145 if session.presence then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
146 session.send(stanza); |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
147 count = count + 1; |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
148 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
149 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
150 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
151 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
152 stanza.attr.to = to; |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
153 return count; |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
154 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
155 |
| 30 | 156 return _M; |