Software / code / prosody
Annotate
core/sessionmanager.lua @ 57:126b25079399
Fix setting resource before we even know what it is
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 04 Oct 2008 17:59:32 +0100 |
| parent | 53:14ea0fe6ca86 |
| child | 77:531b981f2d17 |
| 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; |
|
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
|
3 local ipairs, pairs, print= ipairs, pairs, print; |
|
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; |
|
44
80d2ade0fd69
Add "uuid" library and make sessionmanager use this.
Matthew Wild <mwild1@gmail.com>
parents:
41
diff
changeset
|
14 local uuid_generate = require "util.uuid".uuid_generate; |
|
53
14ea0fe6ca86
Session destruction fixes, some debugging code while we fix the rest. Also change logger to be more useful.
Matthew Wild <mwild1@gmail.com>
parents:
49
diff
changeset
|
15 |
|
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 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
|
17 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
|
18 |
| 30 | 19 module "sessionmanager" |
| 20 | |
| 21 function new_session(conn) | |
| 22 local session = { conn = conn, notopen = true, 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
|
23 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
|
24 session.trace = newproxy(true); |
|
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
|
25 getmetatable(session.trace).__gc = function () print("Session got collected") 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
|
26 end |
| 30 | 27 local w = conn.write; |
| 28 session.send = function (t) w(tostring(t)); end | |
| 29 return session; | |
| 30 end | |
| 31 | |
| 38 | 32 function destroy_session(session) |
|
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
|
33 if not (session and session.disconnect) then return; 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
|
34 log("debug", "Destroying session..."); |
|
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 session.disconnect(); |
|
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 if session.username 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
|
37 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
|
38 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
|
39 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
|
40 local nomore = true; |
|
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 for res, ssn in pairs(hosts[session.host].sessions[session.username]) 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
|
42 nomore = false; |
|
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
|
43 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
|
44 if nomore 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 hosts[session.host].sessions[session.username] = 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
|
46 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
|
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 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
|
49 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
|
50 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
|
51 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
|
52 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
|
53 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
|
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 collectgarbage("collect"); |
|
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
|
56 collectgarbage("collect"); |
|
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 collectgarbage("collect"); |
|
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 collectgarbage("collect"); |
|
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
|
59 collectgarbage("collect"); |
| 38 | 60 end |
| 61 | |
| 30 | 62 function send_to_session(session, data) |
| 38 | 63 log("debug", "Sending: %s", tostring(data)); |
| 30 | 64 session.conn.write(tostring(data)); |
| 65 end | |
| 66 | |
| 38 | 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 | |
| 75 function bind_resource(session, resource) | |
| 76 if not session.username then return false, "auth"; end | |
| 77 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
|
78 resource = resource or uuid_generate(); |
| 38 | 79 --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing |
| 80 | |
| 81 if not hosts[session.host].sessions[session.username] then | |
| 82 hosts[session.host].sessions[session.username] = { sessions = {} }; | |
| 83 else | |
| 84 if hosts[session.host].sessions[session.username].sessions[resource] then | |
| 85 -- Resource conflict | |
| 86 return false, "conflict"; | |
| 87 end | |
| 88 end | |
| 89 | |
| 90 session.resource = resource; | |
| 91 session.full_jid = session.username .. '@' .. session.host .. '/' .. resource; | |
| 92 hosts[session.host].sessions[session.username].sessions[resource] = session; | |
| 93 | |
| 94 return true; | |
| 95 end | |
| 96 | |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
97 function streamopened(session, attr) |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
98 local send = session.send; |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
99 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
|
100 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
|
101 session.streamid = m_random(1000000, 99999999); |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
102 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
|
103 send("<?xml version='1.0'?>"); |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
104 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
|
105 |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
106 local features = {}; |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
107 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
|
108 |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
109 send("<stream:features>"); |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
110 |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
111 for _, feature in ipairs(features) do |
|
41
68297fef35ff
An oops in sessionmanager stream:features code :)
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
112 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
|
113 end |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
114 |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
115 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
|
116 log("info", "Stream opened successfully"); |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
117 session.notopen = nil; |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
118 end |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
119 |
| 30 | 120 return _M; |
