Software / code / prosody
Annotate
plugins/mod_presence.lua @ 1209:86b01a837126
mod_presence: Leave alone the from attribute of session.presence. Big thanks to albert for figuring out the steps to reproduce this bug, and for giving us a ([very] slight) performance increase!
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 May 2009 02:55:14 +0100 |
| parent | 1150:d71a8f28f18b |
| child | 1210:342f401f354c |
| rev | line source |
|---|---|
| 1009 | 1 -- Prosody IM v0.4 |
| 2 -- Copyright (C) 2008-2009 Matthew Wild | |
| 3 -- Copyright (C) 2008-2009 Waqas Hussain | |
| 4 -- | |
| 5 -- This project is MIT/X11 licensed. Please see the | |
| 6 -- COPYING file in the source package for more information. | |
| 7 -- | |
| 8 | |
| 9 | |
| 10 | |
| 11 local log = require "util.logger".init("mod_presence") | |
| 12 | |
| 13 local require = require; | |
| 14 local pairs, ipairs = pairs, ipairs; | |
| 15 local t_concat = table.concat; | |
| 16 local s_find = string.find; | |
| 17 local tonumber = tonumber; | |
| 18 | |
| 19 local st = require "util.stanza"; | |
| 20 local jid_split = require "util.jid".split; | |
| 21 local jid_bare = require "util.jid".bare; | |
| 22 local hosts = hosts; | |
| 23 | |
| 24 local rostermanager = require "core.rostermanager"; | |
| 25 local sessionmanager = require "core.sessionmanager"; | |
| 26 local offlinemanager = require "core.offlinemanager"; | |
| 27 | |
|
1044
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
28 local _core_route_stanza = core_route_stanza; |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
29 local core_route_stanza; |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
30 function core_route_stanza(origin, stanza) |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
31 if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
32 local node, host = jid_split(stanza.attr.to); |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
33 host = hosts[host]; |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
34 if host and host.type == "local" then |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
35 handle_inbound_presence_subscriptions_and_probes(origin, stanza, jid_bare(stanza.attr.from), jid_bare(stanza.attr.to), core_route_stanza); |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
36 return; |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
37 end |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
38 end |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
39 _core_route_stanza(origin, stanza); |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
40 end |
|
41a0c76127f4
mod_presence: Fix for local presence subscriptions and probes
Waqas Hussain <waqas20@gmail.com>
parents:
1023
diff
changeset
|
41 |
| 1009 | 42 function handle_presence(origin, stanza, from_bare, to_bare, core_route_stanza, inbound) |
| 43 local type = stanza.attr.type; | |
| 44 if type and type ~= "unavailable" and type ~= "error" then | |
| 45 if inbound then | |
| 46 handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza); | |
| 47 else | |
| 48 handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza); | |
| 49 end | |
| 50 elseif not inbound and not stanza.attr.to then | |
| 51 handle_normal_presence(origin, stanza, core_route_stanza); | |
| 52 else | |
| 53 core_route_stanza(origin, stanza); | |
| 54 end | |
| 55 end | |
| 56 | |
| 57 function handle_normal_presence(origin, stanza, core_route_stanza) | |
| 58 if origin.roster then | |
| 59 for jid in pairs(origin.roster) do -- broadcast to all interested contacts | |
| 60 local subscription = origin.roster[jid].subscription; | |
| 61 if subscription == "both" or subscription == "from" then | |
| 62 stanza.attr.to = jid; | |
| 63 core_route_stanza(origin, stanza); | |
| 64 end | |
| 65 end | |
| 66 local node, host = jid_split(stanza.attr.from); | |
| 67 for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast to all resources | |
|
1057
2677f5a4e66b
mod_presence: Broadcast a user's presence to only the user's 'available' resources
Waqas Hussain <waqas20@gmail.com>
parents:
1044
diff
changeset
|
68 if res ~= origin and res.presence then -- to resource |
| 1009 | 69 stanza.attr.to = res.full_jid; |
| 70 core_route_stanza(origin, stanza); | |
| 71 end | |
| 72 end | |
| 73 if stanza.attr.type == nil and not origin.presence then -- initial presence | |
| 74 local probe = st.presence({from = origin.full_jid, type = "probe"}); | |
| 75 for jid in pairs(origin.roster) do -- probe all contacts we are subscribed to | |
| 76 local subscription = origin.roster[jid].subscription; | |
| 77 if subscription == "both" or subscription == "to" then | |
| 78 probe.attr.to = jid; | |
| 79 core_route_stanza(origin, probe); | |
| 80 end | |
| 81 end | |
| 82 for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast from all available resources | |
| 83 if res ~= origin and res.presence then | |
| 84 res.presence.attr.to = origin.full_jid; | |
| 85 core_route_stanza(res, res.presence); | |
| 86 res.presence.attr.to = nil; | |
| 87 end | |
| 88 end | |
| 89 if origin.roster.pending then -- resend incoming subscription requests | |
| 90 for jid in pairs(origin.roster.pending) do | |
| 91 origin.send(st.presence({type="subscribe", from=jid})); -- TODO add to attribute? Use original? | |
| 92 end | |
| 93 end | |
| 94 local request = st.presence({type="subscribe", from=origin.username.."@"..origin.host}); | |
| 95 for jid, item in pairs(origin.roster) do -- resend outgoing subscription requests | |
| 96 if item.ask then | |
| 97 request.attr.to = jid; | |
| 98 core_route_stanza(origin, request); | |
| 99 end | |
| 100 end | |
| 101 local offline = offlinemanager.load(node, host); | |
| 102 if offline then | |
| 103 for _, msg in ipairs(offline) do | |
| 104 origin.send(msg); -- FIXME do we need to modify to/from in any way? | |
| 105 end | |
| 106 offlinemanager.deleteAll(node, host); | |
| 107 end | |
| 108 end | |
| 109 origin.priority = 0; | |
| 110 if stanza.attr.type == "unavailable" then | |
| 111 origin.presence = nil; | |
| 112 if origin.directed then | |
| 113 local old_from = stanza.attr.from; | |
| 114 stanza.attr.from = origin.full_jid; | |
| 115 for jid in pairs(origin.directed) do | |
| 116 stanza.attr.to = jid; | |
| 117 core_route_stanza(origin, stanza); | |
| 118 end | |
| 119 stanza.attr.from = old_from; | |
| 120 origin.directed = nil; | |
| 121 end | |
| 122 else | |
| 123 origin.presence = stanza; | |
| 124 local priority = stanza:child_with_name("priority"); | |
| 125 if priority and #priority > 0 then | |
| 126 priority = t_concat(priority); | |
| 127 if s_find(priority, "^[+-]?[0-9]+$") then | |
| 128 priority = tonumber(priority); | |
| 129 if priority < -128 then priority = -128 end | |
| 130 if priority > 127 then priority = 127 end | |
| 131 origin.priority = priority; | |
| 132 end | |
| 133 end | |
| 134 end | |
| 135 stanza.attr.to = nil; -- reset it | |
| 136 else | |
| 137 log("error", "presence recieved from client with no roster"); | |
| 138 end | |
| 139 end | |
| 140 | |
| 141 function send_presence_of_available_resources(user, host, jid, recipient_session, core_route_stanza) | |
| 142 local h = hosts[host]; | |
| 143 local count = 0; | |
| 144 if h and h.type == "local" then | |
| 145 local u = h.sessions[user]; | |
| 146 if u then | |
| 147 for k, session in pairs(u.sessions) do | |
| 148 local pres = session.presence; | |
| 149 if pres then | |
| 150 pres.attr.to = jid; | |
| 151 core_route_stanza(session, pres); | |
| 152 pres.attr.to = nil; | |
| 153 count = count + 1; | |
| 154 end | |
| 155 end | |
| 156 end | |
| 157 end | |
| 158 log("info", "broadcasted presence of "..count.." resources from "..user.."@"..host.." to "..jid); | |
| 159 return count; | |
| 160 end | |
| 161 | |
| 162 function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza) | |
| 163 local node, host = jid_split(from_bare); | |
| 164 local st_from, st_to = stanza.attr.from, stanza.attr.to; | |
| 165 stanza.attr.from, stanza.attr.to = from_bare, to_bare; | |
| 166 log("debug", "outbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare); | |
| 167 if stanza.attr.type == "subscribe" then | |
| 168 -- 1. route stanza | |
| 169 -- 2. roster push (subscription = none, ask = subscribe) | |
| 170 if rostermanager.set_contact_pending_out(node, host, to_bare) then | |
| 171 rostermanager.roster_push(node, host, to_bare); | |
| 172 end -- else file error | |
| 173 core_route_stanza(origin, stanza); | |
| 174 elseif stanza.attr.type == "unsubscribe" then | |
| 175 -- 1. route stanza | |
| 176 -- 2. roster push (subscription = none or from) | |
| 177 if rostermanager.unsubscribe(node, host, to_bare) then | |
| 178 rostermanager.roster_push(node, host, to_bare); -- FIXME do roster push when roster has in fact not changed? | |
| 179 end -- else file error | |
| 180 core_route_stanza(origin, stanza); | |
| 181 elseif stanza.attr.type == "subscribed" then | |
| 182 -- 1. route stanza | |
| 183 -- 2. roster_push () | |
| 184 -- 3. send_presence_of_available_resources | |
| 185 if rostermanager.subscribed(node, host, to_bare) then | |
| 186 rostermanager.roster_push(node, host, to_bare); | |
| 187 end | |
| 188 core_route_stanza(origin, stanza); | |
| 189 send_presence_of_available_resources(node, host, to_bare, origin, core_route_stanza); | |
| 190 elseif stanza.attr.type == "unsubscribed" then | |
| 191 -- 1. route stanza | |
| 192 -- 2. roster push (subscription = none or to) | |
| 193 if rostermanager.unsubscribed(node, host, to_bare) then | |
| 194 rostermanager.roster_push(node, host, to_bare); | |
| 195 end | |
| 196 core_route_stanza(origin, stanza); | |
| 197 end | |
| 198 stanza.attr.from, stanza.attr.to = st_from, st_to; | |
| 199 end | |
| 200 | |
| 201 function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza) | |
| 202 local node, host = jid_split(to_bare); | |
| 203 local st_from, st_to = stanza.attr.from, stanza.attr.to; | |
| 204 stanza.attr.from, stanza.attr.to = from_bare, to_bare; | |
| 205 log("debug", "inbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare); | |
| 206 if stanza.attr.type == "probe" then | |
| 207 if rostermanager.is_contact_subscribed(node, host, from_bare) then | |
| 208 if 0 == send_presence_of_available_resources(node, host, from_bare, origin, core_route_stanza) then | |
| 209 -- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too) | |
| 210 end | |
| 211 else | |
| 212 core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"})); | |
| 213 end | |
| 214 elseif stanza.attr.type == "subscribe" then | |
| 215 if rostermanager.is_contact_subscribed(node, host, from_bare) then | |
| 216 core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="subscribed"})); -- already subscribed | |
| 217 -- Sending presence is not clearly stated in the RFC, but it seems appropriate | |
| 218 if 0 == send_presence_of_available_resources(node, host, from_bare, origin, core_route_stanza) then | |
| 219 -- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too) | |
| 220 end | |
| 221 else | |
| 222 if not rostermanager.is_contact_pending_in(node, host, from_bare) then | |
| 223 if rostermanager.set_contact_pending_in(node, host, from_bare) then | |
| 224 sessionmanager.send_to_available_resources(node, host, stanza); | |
| 225 end -- TODO else return error, unable to save | |
| 226 end | |
| 227 end | |
| 228 elseif stanza.attr.type == "unsubscribe" then | |
| 229 if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then | |
| 230 rostermanager.roster_push(node, host, from_bare); | |
| 231 end | |
| 232 elseif stanza.attr.type == "subscribed" then | |
| 233 if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then | |
| 234 rostermanager.roster_push(node, host, from_bare); | |
| 235 end | |
| 236 elseif stanza.attr.type == "unsubscribed" then | |
| 237 if rostermanager.process_inbound_subscription_cancellation(node, host, from_bare) then | |
| 238 rostermanager.roster_push(node, host, from_bare); | |
| 239 end | |
| 240 end -- discard any other type | |
| 241 stanza.attr.from, stanza.attr.to = st_from, st_to; | |
| 242 end | |
| 243 | |
| 244 local function presence_handler(data) | |
| 245 local origin, stanza = data.origin, data.stanza; | |
| 246 local to = stanza.attr.to; | |
| 247 local node, host = jid_split(to); | |
| 248 local to_bare = jid_bare(to); | |
| 249 local from_bare = jid_bare(stanza.attr.from); | |
| 250 if origin.type == "c2s" then | |
| 251 if to ~= nil and not(origin.roster[to_bare] and (origin.roster[to_bare].subscription == "both" or origin.roster[to_bare].subscription == "from")) then -- directed presence | |
| 252 origin.directed = origin.directed or {}; | |
|
1150
d71a8f28f18b
mod_presence: Added a FIXME comment about directed presence
Waqas Hussain <waqas20@gmail.com>
parents:
1147
diff
changeset
|
253 origin.directed[to] = true; -- FIXME does it make more sense to add to_bare rather than to? |
| 1009 | 254 end |
|
1019
8d750336e517
mod_presence: Fix incorrect internal routing for probes and subscriptions
Waqas Hussain <waqas20@gmail.com>
parents:
1011
diff
changeset
|
255 if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then |
| 1009 | 256 handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza); |
| 257 elseif not to then | |
|
1011
beb039827c9f
Stopped using presencemanager in stanza_router
Waqas Hussain <waqas20@gmail.com>
parents:
1009
diff
changeset
|
258 handle_normal_presence(origin, stanza, core_route_stanza); |
| 1009 | 259 else |
| 260 core_route_stanza(origin, stanza); | |
| 261 end | |
| 262 elseif (origin.type == "s2sin" or origin.type == "component") and hosts[host] then | |
|
1019
8d750336e517
mod_presence: Fix incorrect internal routing for probes and subscriptions
Waqas Hussain <waqas20@gmail.com>
parents:
1011
diff
changeset
|
263 if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then |
| 1009 | 264 handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza); |
| 265 else | |
| 266 core_route_stanza(origin, stanza); | |
| 267 end | |
| 268 end | |
|
1147
513c1d071045
mod_presence: return true from the presence handler
Waqas Hussain <waqas20@gmail.com>
parents:
1057
diff
changeset
|
269 return true; |
| 1009 | 270 end |
| 271 | |
| 272 local add_handler = require "core.eventmanager2".add_handler; | |
| 273 local remove_handler = require "core.eventmanager2".remove_handler; | |
| 274 | |
| 275 add_handler(module:get_host().."/presence", presence_handler); | |
| 276 module.unload = function() | |
| 277 remove_handler(module:get_host().."/presence", presence_handler); | |
| 278 end |
