Software / code / prosody
Annotate
core/sessionmanager.lua @ 703:f9909efed20c
componentmanager: Removed unneeded parameter from componentmanager.deregister_component
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Tue, 13 Jan 2009 19:17:25 +0500 |
| parent | 623:5af5a64a729f |
| child | 694:b97b05261156 |
| rev | line source |
|---|---|
| 615 | 1 -- Prosody IM v0.2 |
|
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
2 -- Copyright (C) 2008 Matthew Wild |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
3 -- Copyright (C) 2008 Waqas Hussain |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
4 -- |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
5 -- This program is free software; you can redistribute it and/or |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
6 -- modify it under the terms of the GNU General Public License |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
7 -- as published by the Free Software Foundation; either version 2 |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
8 -- of the License, or (at your option) any later version. |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
9 -- |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
10 -- This program is distributed in the hope that it will be useful, |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
13 -- GNU General Public License for more details. |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
14 -- |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
15 -- You should have received a copy of the GNU General Public License |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
16 -- along with this program; if not, write to the Free Software |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
17 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
18 -- |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
19 |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
429
diff
changeset
|
20 |
| 30 | 21 |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
22 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
|
23 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
|
24 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
|
25 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
|
26 local format = import("string", "format"); |
| 38 | 27 |
| 28 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
|
29 local sessions = sessions; |
| 38 | 30 |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
31 local modulemanager = require "core.modulemanager"; |
| 30 | 32 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
|
33 local error = error; |
| 145 | 34 local uuid_generate = require "util.uuid".generate; |
|
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
77
diff
changeset
|
35 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
|
36 local config_get = require "core.configmanager".get; |
|
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
|
37 |
|
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
38 local fire_event = require "core.eventmanager".fire_event; |
|
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
39 |
|
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
40 local gettime = require "socket".gettime; |
|
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
41 |
|
339
c6446bbfe40c
Fix sending of unavailable presence on disconnect
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
42 local st = require "util.stanza"; |
|
c6446bbfe40c
Fix sending of unavailable presence on disconnect
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
43 |
|
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 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
|
45 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
|
46 |
| 30 | 47 module "sessionmanager" |
| 48 | |
|
123
ebd65feb188c
Fix for not destroying sessions when connection closed.
Matthew Wild <mwild1@gmail.com>
parents:
118
diff
changeset
|
49 local open_sessions = 0; |
|
ebd65feb188c
Fix for not destroying sessions when connection closed.
Matthew Wild <mwild1@gmail.com>
parents:
118
diff
changeset
|
50 |
| 30 | 51 function new_session(conn) |
|
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
52 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
|
53 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
|
54 session.trace = newproxy(true); |
|
583
5821eaa80baa
Remove print()s from sessionmanager and s2smanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
55 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
|
56 end |
|
123
ebd65feb188c
Fix for not destroying sessions when connection closed.
Matthew Wild <mwild1@gmail.com>
parents:
118
diff
changeset
|
57 open_sessions = open_sessions + 1; |
|
356
8ff322b550a3
Log number of open sessions on session creation
Matthew Wild <mwild1@gmail.com>
parents:
339
diff
changeset
|
58 log("info", "open sessions now: ".. open_sessions); |
| 30 | 59 local w = conn.write; |
| 60 session.send = function (t) w(tostring(t)); end | |
| 61 return session; | |
| 62 end | |
| 63 | |
|
339
c6446bbfe40c
Fix sending of unavailable presence on disconnect
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
64 function destroy_session(session, err) |
|
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
|
65 (session.log or log)("info", "Destroying session"); |
| 331 | 66 |
| 67 -- Send unavailable presence | |
|
332
51e130b5c8de
Remove useless check for unavailable presence (which never exists)
Matthew Wild <mwild1@gmail.com>
parents:
331
diff
changeset
|
68 if session.presence then |
| 331 | 69 local pres = st.presence{ type = "unavailable" }; |
|
339
c6446bbfe40c
Fix sending of unavailable presence on disconnect
Matthew Wild <mwild1@gmail.com>
parents:
333
diff
changeset
|
70 if (not err) or err == "closed" then err = "connection closed"; end |
| 331 | 71 pres:tag("status"):text("Disconnected: "..err); |
|
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
|
72 session:dispatch_stanza(pres); |
| 331 | 73 end |
| 74 | |
| 75 -- Remove session/resource from user's session list | |
| 148 | 76 if session.host and session.username then |
|
531
724fd647dc56
Quick fix for an issue that needs more looking into
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
77 -- FIXME: How can the below ever be nil? (but they sometimes are...) |
| 148 | 78 if hosts[session.host] and hosts[session.host].sessions[session.username] then |
|
531
724fd647dc56
Quick fix for an issue that needs more looking into
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
79 if session.resource then |
|
724fd647dc56
Quick fix for an issue that needs more looking into
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
80 hosts[session.host].sessions[session.username].sessions[session.resource] = nil; |
|
724fd647dc56
Quick fix for an issue that needs more looking into
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
81 end |
|
724fd647dc56
Quick fix for an issue that needs more looking into
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
82 |
| 148 | 83 if not next(hosts[session.host].sessions[session.username].sessions) then |
| 84 log("debug", "All resources of %s are now offline", session.username); | |
| 85 hosts[session.host].sessions[session.username] = nil; | |
| 86 end | |
|
532
c24471cadc2c
Added an error log message for this case
Matthew Wild <mwild1@gmail.com>
parents:
531
diff
changeset
|
87 else |
|
c24471cadc2c
Added an error log message for this case
Matthew Wild <mwild1@gmail.com>
parents:
531
diff
changeset
|
88 log("error", "host or session table didn't exist, please report this! Host: %s [%s] Sessions: %s [%s]", |
|
c24471cadc2c
Added an error log message for this case
Matthew Wild <mwild1@gmail.com>
parents:
531
diff
changeset
|
89 tostring(hosts[session.host]), tostring(session.host), |
|
c24471cadc2c
Added an error log message for this case
Matthew Wild <mwild1@gmail.com>
parents:
531
diff
changeset
|
90 tostring(hosts[session.host].sessions[session.username] ), tostring(session.username)); |
|
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
|
91 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
|
92 end |
| 331 | 93 |
|
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 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
|
95 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
|
96 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
|
97 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
|
98 end |
| 38 | 99 end |
| 100 | |
| 101 function make_authenticated(session, username) | |
| 102 session.username = username; | |
| 103 if session.type == "c2s_unauthed" then | |
| 104 session.type = "c2s"; | |
| 105 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
|
106 return true; |
| 38 | 107 end |
| 108 | |
|
304
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
109 -- returns true, nil on success |
|
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
110 -- returns nil, err_type, err, err_message on failure |
| 38 | 111 function bind_resource(session, resource) |
|
304
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
112 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
|
113 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
|
114 -- We don't support binding multiple resources |
|
7b28fa8bbfe5
Code cleanup for resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
115 |
|
44
80d2ade0fd69
Add "uuid" library and make sessionmanager use this.
Matthew Wild <mwild1@gmail.com>
parents:
41
diff
changeset
|
116 resource = resource or uuid_generate(); |
| 38 | 117 --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing |
| 118 | |
| 119 if not hosts[session.host].sessions[session.username] then | |
| 120 hosts[session.host].sessions[session.username] = { sessions = {} }; | |
| 121 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
|
122 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
|
123 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
|
124 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
|
125 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
|
126 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
|
127 if sessions[resource] then |
| 38 | 128 -- 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
|
129 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
|
130 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
|
131 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
|
132 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
|
133 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
|
134 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
|
135 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
|
136 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
|
137 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
|
138 else -- if policy == "kick_old" 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
|
139 hosts[session.host].sessions[session.username].sessions[resource]:close { |
|
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 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
|
141 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
|
142 }; |
|
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 |
|
b1d86f89fa27
Added options to limit the number of resources and for handling of resource conflicts
Waqas Hussain <waqas20@gmail.com>
parents:
357
diff
changeset
|
144 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
|
145 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
|
146 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
|
147 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
|
148 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
|
149 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
|
150 end |
| 38 | 151 end |
| 152 end | |
| 153 | |
| 154 session.resource = resource; | |
| 155 session.full_jid = session.username .. '@' .. session.host .. '/' .. resource; | |
| 156 hosts[session.host].sessions[session.username].sessions[resource] = session; | |
| 157 | |
|
101
c690fa382743
Added some roster management functions
Waqas Hussain <waqas20@gmail.com>
parents:
77
diff
changeset
|
158 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
|
159 |
| 38 | 160 return true; |
| 161 end | |
| 162 | |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
163 function streamopened(session, attr) |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
164 local send = session.send; |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
165 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
|
166 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
|
167 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
|
168 (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
|
169 |
|
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
|
170 |
|
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
|
171 send("<?xml version='1.0'?>"); |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
172 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
|
173 |
|
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
|
174 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
|
175 -- We don't serve this host... |
|
333
8d15b073fdbe
session:disconnect() -> session:close() for consistency with other Lua APIs
Matthew Wild <mwild1@gmail.com>
parents:
332
diff
changeset
|
176 session:close{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)}; |
|
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
|
177 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
|
178 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
|
179 |
|
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
|
180 |
|
357
17bcecb06420
Use a stanza for c2s stream features instead of an array of strings. Removes a FIXME.
Matthew Wild <mwild1@gmail.com>
parents:
356
diff
changeset
|
181 local features = st.stanza("stream:features"); |
|
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
565
diff
changeset
|
182 fire_event("stream-features", session, features); |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
183 |
|
357
17bcecb06420
Use a stanza for c2s stream features instead of an array of strings. Removes a FIXME.
Matthew Wild <mwild1@gmail.com>
parents:
356
diff
changeset
|
184 send(features); |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
185 |
|
357
17bcecb06420
Use a stanza for c2s stream features instead of an array of strings. Removes a FIXME.
Matthew Wild <mwild1@gmail.com>
parents:
356
diff
changeset
|
186 (session.log or log)("info", "Sent reply <stream:stream> to client"); |
|
40
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
187 session.notopen = nil; |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
188 end |
|
2c0147bbd81a
Move stream opening handling from xmlhandlers to sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
189 |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
190 function send_to_available_resources(user, host, stanza) |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
191 local count = 0; |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
192 local to = stanza.attr.to; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
193 stanza.attr.to = nil; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
194 local h = hosts[host]; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
195 if h and h.type == "local" then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
196 local u = h.sessions[user]; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
197 if u then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
198 for k, session in pairs(u.sessions) do |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
199 if session.presence then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
200 session.send(stanza); |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
201 count = count + 1; |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
202 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
203 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
204 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
205 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
156
diff
changeset
|
206 stanza.attr.to = to; |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
207 return count; |
|
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 |
|
614
335f2921ae0c
Newline at end of file for sessionmanager
Matthew Wild <mwild1@gmail.com>
parents:
597
diff
changeset
|
210 return _M; |
