author | Kim Alvefur <zash@zash.se> |
Sat, 27 Oct 2012 20:02:10 +0200 | |
changeset 854 | 1c64ab8ae374 |
parent 850 | 0900ba54991e |
child 884 | 2ece37bf9cc6 |
permissions | -rw-r--r-- |
521
6d0d2673f95e
mod_carbons: Add MIT license statement.
Kim Alvefur <zash@zash.se>
parents:
520
diff
changeset
|
1 |
-- XEP-0280: Message Carbons implementation for Prosody |
6d0d2673f95e
mod_carbons: Add MIT license statement.
Kim Alvefur <zash@zash.se>
parents:
520
diff
changeset
|
2 |
-- Copyright (C) 2011 Kim Alvefur |
6d0d2673f95e
mod_carbons: Add MIT license statement.
Kim Alvefur <zash@zash.se>
parents:
520
diff
changeset
|
3 |
-- |
6d0d2673f95e
mod_carbons: Add MIT license statement.
Kim Alvefur <zash@zash.se>
parents:
520
diff
changeset
|
4 |
-- This file is MIT/X11 licensed. |
6d0d2673f95e
mod_carbons: Add MIT license statement.
Kim Alvefur <zash@zash.se>
parents:
520
diff
changeset
|
5 |
|
462 | 6 |
local st = require "util.stanza"; |
7 |
local jid_bare = require "util.jid".bare; |
|
850
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
8 |
local xmlns_carbons = "urn:xmpp:carbons:2"; |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
9 |
local xmlns_carbons_old = "urn:xmpp:carbons:1"; |
462 | 10 |
local xmlns_forward = "urn:xmpp:forward:0"; |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
11 |
local full_sessions, bare_sessions = full_sessions, bare_sessions; |
462 | 12 |
|
804
9927d88a1b2a
mod_carbons: Merge enable and disable handlers
Kim Alvefur <zash@zash.se>
parents:
743
diff
changeset
|
13 |
local function toggle_carbons(event) |
462 | 14 |
local origin, stanza = event.origin, event.stanza; |
15 |
if stanza.attr.type == "set" then |
|
804
9927d88a1b2a
mod_carbons: Merge enable and disable handlers
Kim Alvefur <zash@zash.se>
parents:
743
diff
changeset
|
16 |
local state = stanza.tags[1].name; |
9927d88a1b2a
mod_carbons: Merge enable and disable handlers
Kim Alvefur <zash@zash.se>
parents:
743
diff
changeset
|
17 |
module:log("debug", "%s %sd carbons", origin.full_jid, state); |
850
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
18 |
origin.want_carbons = state == "enable" and stanza.tags[1].attr.xmlns; |
462 | 19 |
origin.send(st.reply(stanza)); |
20 |
return true |
|
21 |
end |
|
804
9927d88a1b2a
mod_carbons: Merge enable and disable handlers
Kim Alvefur <zash@zash.se>
parents:
743
diff
changeset
|
22 |
end |
9927d88a1b2a
mod_carbons: Merge enable and disable handlers
Kim Alvefur <zash@zash.se>
parents:
743
diff
changeset
|
23 |
module:hook("iq/self/"..xmlns_carbons..":disable", toggle_carbons); |
9927d88a1b2a
mod_carbons: Merge enable and disable handlers
Kim Alvefur <zash@zash.se>
parents:
743
diff
changeset
|
24 |
module:hook("iq/self/"..xmlns_carbons..":enable", toggle_carbons); |
462 | 25 |
|
850
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
26 |
-- COMPAT |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
27 |
module:hook("iq/self/"..xmlns_carbons_old..":disable", toggle_carbons); |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
28 |
module:hook("iq/self/"..xmlns_carbons_old..":enable", toggle_carbons); |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
29 |
|
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
30 |
local function message_handler(event, c2s) |
462 | 31 |
local origin, stanza = event.origin, event.stanza; |
32 |
local orig_type = stanza.attr.type; |
|
835
07cc1efde2f8
mod_carbons: Fix handling of messages from remote hosts
Kim Alvefur <zash@zash.se>
parents:
833
diff
changeset
|
33 |
local orig_from = stanza.attr.from; |
462 | 34 |
local orig_to = stanza.attr.to; |
35 |
||
36 |
if not (orig_type == nil |
|
37 |
or orig_type == "normal" |
|
38 |
or orig_type == "chat") then |
|
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
39 |
return -- No carbons for messages of type error or headline |
462 | 40 |
end |
41 |
||
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
42 |
-- Stanza sent by a local client |
836
a86131581180
mod_carbons: Less complicated assignments (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
835
diff
changeset
|
43 |
local bare_jid = jid_bare(orig_from); |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
44 |
local target_session = origin; |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
45 |
local top_priority = false; |
836
a86131581180
mod_carbons: Less complicated assignments (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
835
diff
changeset
|
46 |
local user_sessions = bare_sessions[bare_jid]; |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
47 |
|
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
48 |
-- Stanza about to be delivered to a local client |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
49 |
if not c2s then |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
50 |
bare_jid = jid_bare(orig_to); |
836
a86131581180
mod_carbons: Less complicated assignments (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
835
diff
changeset
|
51 |
target_session = full_sessions[orig_to]; |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
52 |
user_sessions = bare_sessions[bare_jid]; |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
53 |
if not target_session and user_sessions then |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
54 |
-- The top resources will already receive this message per normal routing rules, |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
55 |
-- so we are going to skip them in order to avoid sending duplicated messages. |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
56 |
local top_resources = user_sessions.top_resources; |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
57 |
top_priority = top_resources and top_resources[1].priority |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
58 |
end |
462 | 59 |
end |
60 |
||
585
ce2798a1bc56
mod_carbons: Don't try to send carbons for entirely offline users.
Kim Alvefur <zash@zash.se>
parents:
545
diff
changeset
|
61 |
if not user_sessions then |
605
5175f6d33470
mod_carbons: Add more debug logging
Kim Alvefur <zash@zash.se>
parents:
585
diff
changeset
|
62 |
module:log("debug", "Skip carbons for offline user"); |
585
ce2798a1bc56
mod_carbons: Don't try to send carbons for entirely offline users.
Kim Alvefur <zash@zash.se>
parents:
545
diff
changeset
|
63 |
return -- No use in sending carbons to an offline user |
ce2798a1bc56
mod_carbons: Don't try to send carbons for entirely offline users.
Kim Alvefur <zash@zash.se>
parents:
545
diff
changeset
|
64 |
end |
ce2798a1bc56
mod_carbons: Don't try to send carbons for entirely offline users.
Kim Alvefur <zash@zash.se>
parents:
545
diff
changeset
|
65 |
|
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
66 |
if not c2s and stanza:get_child("private", xmlns_carbons) then |
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
67 |
stanza:maptags(function(tag) |
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
68 |
return tag.attr.xmlns == xmlns_carbons |
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
69 |
and tag.name == "private" and tag or nil; |
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
70 |
end); |
605
5175f6d33470
mod_carbons: Add more debug logging
Kim Alvefur <zash@zash.se>
parents:
585
diff
changeset
|
71 |
module:log("debug", "Message tagged private, ignoring"); |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
72 |
return |
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
73 |
end |
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
74 |
|
832
9087431d35f6
mod_carbons: Add comments and rename some variables to make it clearer
Kim Alvefur <zash@zash.se>
parents:
804
diff
changeset
|
75 |
-- Create the carbon copy and wrap it as per the Stanza Forwarding XEP |
9087431d35f6
mod_carbons: Add comments and rename some variables to make it clearer
Kim Alvefur <zash@zash.se>
parents:
804
diff
changeset
|
76 |
local copy = st.clone(stanza); |
9087431d35f6
mod_carbons: Add comments and rename some variables to make it clearer
Kim Alvefur <zash@zash.se>
parents:
804
diff
changeset
|
77 |
copy.attr.xmlns = "jabber:client"; |
9087431d35f6
mod_carbons: Add comments and rename some variables to make it clearer
Kim Alvefur <zash@zash.se>
parents:
804
diff
changeset
|
78 |
local carbon = st.message{ from = bare_jid, type = orig_type, } |
664
2f11d2473afd
mod_carbons: Move creation of the carbon stanza out of the loop.
Kim Alvefur <zash@zash.se>
parents:
618
diff
changeset
|
79 |
:tag(c2s and "sent" or "received", { xmlns = xmlns_carbons }):up() |
2f11d2473afd
mod_carbons: Move creation of the carbon stanza out of the loop.
Kim Alvefur <zash@zash.se>
parents:
618
diff
changeset
|
80 |
:tag("forwarded", { xmlns = xmlns_forward }) |
832
9087431d35f6
mod_carbons: Add comments and rename some variables to make it clearer
Kim Alvefur <zash@zash.se>
parents:
804
diff
changeset
|
81 |
:add_child(copy):reset(); |
664
2f11d2473afd
mod_carbons: Move creation of the carbon stanza out of the loop.
Kim Alvefur <zash@zash.se>
parents:
618
diff
changeset
|
82 |
|
850
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
83 |
-- COMPAT |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
84 |
local carbon_old = st.message{ from = bare_jid, type = orig_type, } |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
85 |
:tag(c2s and "sent" or "received", { xmlns = xmlns_carbons_old }):up() |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
86 |
:tag("forwarded", { xmlns = xmlns_forward }) |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
87 |
:add_child(copy):reset(); |
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
88 |
|
618
267548522810
mod_carbons: Remove useless protection against loop that can't happen
Kim Alvefur <zash@zash.se>
parents:
617
diff
changeset
|
89 |
user_sessions = user_sessions and user_sessions.sessions; |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
90 |
for _, session in pairs(user_sessions) do |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
91 |
-- Carbons are sent to resources that have enabled it |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
92 |
if session.want_carbons |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
93 |
-- but not the resource that sent the message, or the one that it's directed to |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
94 |
and session ~= target_session |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
95 |
-- and isn't among the top resources that would receive the message per standard routing rules |
837
0ef11dee7050
mod_carbons: Fix logic, top resources should only be excluded for incoming messages
Kim Alvefur <zash@zash.se>
parents:
836
diff
changeset
|
96 |
and (c2s or session.priority ~= top_priority) then |
833
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
97 |
carbon.attr.to = session.full_jid; |
30d49c26d219
mod_carbons: Optimize and clarify (thanks waqas)
Kim Alvefur <zash@zash.se>
parents:
832
diff
changeset
|
98 |
module:log("debug", "Sending carbon to %s", session.full_jid); |
850
0900ba54991e
mod_carbons: Update to latest version of XEP-0280, while supporting the old version.
Kim Alvefur <zash@zash.se>
parents:
837
diff
changeset
|
99 |
local carbon = session.want_carbons == xmlns_carbons_old and carbon_old or carbon; -- COMPAT |
832
9087431d35f6
mod_carbons: Add comments and rename some variables to make it clearer
Kim Alvefur <zash@zash.se>
parents:
804
diff
changeset
|
100 |
session.send(carbon); |
462 | 101 |
end |
102 |
end |
|
103 |
end |
|
104 |
||
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
105 |
local function c2s_message_handler(event) |
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
106 |
return message_handler(event, true) |
462 | 107 |
end |
108 |
||
109 |
-- Stanzas sent by local clients |
|
110 |
module:hook("pre-message/bare", c2s_message_handler, 1); |
|
111 |
module:hook("pre-message/full", c2s_message_handler, 1); |
|
510
59e80326f2b3
mod_carbons: Fix a typo and unindent a line.
Kim Alvefur <zash@zash.se>
parents:
480
diff
changeset
|
112 |
-- Stanzas to local clients |
480
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
113 |
module:hook("message/bare", message_handler, 1); |
0cef5be669de
mod_carbons: Consolidate message handlers
Kim Alvefur <zash@zash.se>
parents:
463
diff
changeset
|
114 |
module:hook("message/full", message_handler, 1); |
462 | 115 |
|
116 |
module:add_feature(xmlns_carbons); |
|
854
1c64ab8ae374
mod_carbons: Advertise support for the previous version
Kim Alvefur <zash@zash.se>
parents:
850
diff
changeset
|
117 |
module:add_feature(xmlns_carbons_old); |