Sat, 04 Oct 2008 02:43:23 +0100
New "import" module to help tidy up all the local declarations at the top of modules
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; |
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
|
3 | local ipairs, print= ipairs, print; |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
4 | |
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; | |
9 | ||
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
10 | local modulemanager = require "core.modulemanager"; |
30 | 11 | 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
|
12 | local error = error; |
44
80d2ade0fd69
Add "uuid" library and make sessionmanager use this.
Matthew Wild <mwild1@gmail.com>
parents:
41
diff
changeset
|
13 | local uuid_generate = require "util.uuid".uuid_generate; |
30 | 14 | module "sessionmanager" |
15 | ||
16 | function new_session(conn) | |
17 | local session = { conn = conn, notopen = true, priority = 0, type = "c2s_unauthed" }; | |
18 | local w = conn.write; | |
19 | session.send = function (t) w(tostring(t)); end | |
20 | return session; | |
21 | end | |
22 | ||
38 | 23 | function destroy_session(session) |
24 | end | |
25 | ||
30 | 26 | function send_to_session(session, data) |
38 | 27 | log("debug", "Sending: %s", tostring(data)); |
30 | 28 | session.conn.write(tostring(data)); |
29 | end | |
30 | ||
38 | 31 | function make_authenticated(session, username) |
32 | session.username = username; | |
33 | session.resource = resource; | |
34 | if session.type == "c2s_unauthed" then | |
35 | session.type = "c2s"; | |
36 | end | |
37 | end | |
38 | ||
39 | function bind_resource(session, resource) | |
40 | if not session.username then return false, "auth"; end | |
41 | 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
|
42 | resource = resource or uuid_generate(); |
38 | 43 | --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing |
44 | ||
45 | if not hosts[session.host].sessions[session.username] then | |
46 | hosts[session.host].sessions[session.username] = { sessions = {} }; | |
47 | else | |
48 | if hosts[session.host].sessions[session.username].sessions[resource] then | |
49 | -- Resource conflict | |
50 | return false, "conflict"; | |
51 | end | |
52 | end | |
53 | ||
54 | session.resource = resource; | |
55 | session.full_jid = session.username .. '@' .. session.host .. '/' .. resource; | |
56 | hosts[session.host].sessions[session.username].sessions[resource] = session; | |
57 | ||
58 | return true; | |
59 | end | |
60 | ||
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
61 | function streamopened(session, attr) |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
62 | local send = session.send; |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
63 | 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
|
64 | 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
|
65 | session.streamid = m_random(1000000, 99999999); |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
66 | 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
|
67 | send("<?xml version='1.0'?>"); |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
68 | 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
|
69 | |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
70 | local features = {}; |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
71 | 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
|
72 | |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
73 | send("<stream:features>"); |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
74 | |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
75 | for _, feature in ipairs(features) do |
41
68297fef35ff
An oops in sessionmanager stream:features code :)
Matthew Wild <mwild1@gmail.com>
parents:
40
diff
changeset
|
76 | 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
|
77 | end |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
78 | |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
79 | 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
|
80 | log("info", "Stream opened successfully"); |
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
81 | session.notopen = nil; |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
82 | end |
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
83 | |
30 | 84 | return _M; |