Software /
code /
prosody
Annotate
core/sessionmanager.lua @ 176:e5cd2a03891d
Outbound presence subscription
author | Waqas Hussain <waqas20@gmail.com> |
---|---|
date | Sat, 25 Oct 2008 21:16:08 +0500 |
parent | 175:5f71d290bb44 |
child | 304:7b28fa8bbfe5 |
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"); |
148 | 38 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
|
39 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
|
40 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
|
41 end |
148 | 42 if hosts[session.host] and hosts[session.host].sessions[session.username] then |
43 if not next(hosts[session.host].sessions[session.username].sessions) then | |
44 log("debug", "All resources of %s are now offline", session.username); | |
45 hosts[session.host].sessions[session.username] = nil; | |
46 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 |
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 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
|
49 session.conn = 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
|
50 session.disconnect = 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 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
|
52 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
|
53 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
|
54 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
|
55 end |
38 | 56 end |
57 | |
30 | 58 function send_to_session(session, data) |
38 | 59 log("debug", "Sending: %s", tostring(data)); |
30 | 60 session.conn.write(tostring(data)); |
61 end | |
62 | |
38 | 63 function make_authenticated(session, username) |
64 session.username = username; | |
65 if session.type == "c2s_unauthed" then | |
66 session.type = "c2s"; | |
67 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
|
68 return true; |
38 | 69 end |
70 | |
71 function bind_resource(session, resource) | |
72 if not session.username then return false, "auth"; end | |
73 if session.resource then return false, "constraint"; end -- We don't support binding multiple resources | |
44
80d2ade0fd69
Add "uuid" library and make sessionmanager use this.
Matthew Wild <mwild1@gmail.com>
parents:
41
diff
changeset
|
74 resource = resource or uuid_generate(); |
38 | 75 --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing |
76 | |
77 if not hosts[session.host].sessions[session.username] then | |
78 hosts[session.host].sessions[session.username] = { sessions = {} }; | |
79 else | |
80 if hosts[session.host].sessions[session.username].sessions[resource] then | |
81 -- Resource conflict | |
112 | 82 return false, "conflict"; -- TODO kick old resource |
38 | 83 end |
84 end | |
85 | |
86 session.resource = resource; | |
87 session.full_jid = session.username .. '@' .. session.host .. '/' .. resource; | |
88 hosts[session.host].sessions[session.username].sessions[resource] = session; | |
89 | |
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
77
diff
changeset
|
90 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
|
91 |
38 | 92 return true; |
93 end | |
94 | |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
95 function streamopened(session, attr) |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
96 local send = session.send; |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
97 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
|
98 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
|
99 session.streamid = m_random(1000000, 99999999); |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
100 print(session, session.host, "Client opened stream"); |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
101 send("<?xml version='1.0'?>"); |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
102 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
|
103 |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
104 local features = {}; |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
105 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
|
106 |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
107 send("<stream:features>"); |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
108 |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
109 for _, feature in ipairs(features) do |
41
68297fef35ff
An oops in sessionmanager stream:features code :)
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
110 send_to_session(session, tostring(feature)); |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
111 end |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
112 |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
113 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
|
114 log("info", "Stream opened successfully"); |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
115 session.notopen = nil; |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
116 end |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
117 |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
118 function send_to_available_resources(user, host, stanza) |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
119 local count = 0; |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
120 local to = stanza.attr.to; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
121 stanza.attr.to = nil; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
122 local h = hosts[host]; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
123 if h and h.type == "local" then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
124 local u = h.sessions[user]; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
125 if u then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
126 for k, session in pairs(u.sessions) do |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
127 if session.presence then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
128 session.send(stanza); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
129 count = count + 1; |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
130 end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
131 end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
132 end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
133 end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
134 stanza.attr.to = to; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
135 return count; |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
136 end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
137 |
30 | 138 return _M; |