author | Waqas Hussain <waqas20@gmail.com> |
Fri, 17 Sep 2010 03:52:11 +0500 | |
changeset 3496 | 9408d1e10e17 |
parent 2923 | b7049746bd29 |
child 5017 | a6bae9d72c8f |
permissions | -rw-r--r-- |
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1042
diff
changeset
|
1 |
-- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2709
diff
changeset
|
2 |
-- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2709
diff
changeset
|
3 |
-- Copyright (C) 2008-2010 Waqas Hussain |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
4 |
-- |
758 | 5 |
-- This project is MIT/X11 licensed. Please see the |
6 |
-- COPYING file in the source package for more information. |
|
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
7 |
-- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
8 |
|
2004
5033348feba8
mod_vcard: Cleaned up unused variables and global accesses.
Waqas Hussain <waqas20@gmail.com>
parents:
2003
diff
changeset
|
9 |
local st = require "util.stanza" |
5033348feba8
mod_vcard: Cleaned up unused variables and global accesses.
Waqas Hussain <waqas20@gmail.com>
parents:
2003
diff
changeset
|
10 |
local jid_split = require "util.jid".split; |
1042
a3d77353c18a
mod_*: Fix a load of global accesses
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
11 |
local datamanager = require "util.datamanager" |
86
a2085854c72c
Added: vCard plugin: mod_vcard
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
12 |
|
2004
5033348feba8
mod_vcard: Cleaned up unused variables and global accesses.
Waqas Hussain <waqas20@gmail.com>
parents:
2003
diff
changeset
|
13 |
module:add_feature("vcard-temp"); |
86
a2085854c72c
Added: vCard plugin: mod_vcard
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
14 |
|
2004
5033348feba8
mod_vcard: Cleaned up unused variables and global accesses.
Waqas Hussain <waqas20@gmail.com>
parents:
2003
diff
changeset
|
15 |
local function handle_vcard(event) |
2001
2f73fe2b3edd
mod_vcard: Moved completely to new event based hooks.
Waqas Hussain <waqas20@gmail.com>
parents:
2000
diff
changeset
|
16 |
local session, stanza = event.origin, event.stanza; |
2002
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
17 |
local to = stanza.attr.to; |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
18 |
if stanza.attr.type == "get" then |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
19 |
local vCard; |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
20 |
if to then |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
21 |
local node, host = jid_split(to); |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
22 |
vCard = st.deserialize(datamanager.load(node, host, "vcard")); -- load vCard for user or server |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
23 |
else |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
24 |
vCard = st.deserialize(datamanager.load(session.username, session.host, "vcard"));-- load user's own vCard |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
25 |
end |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
26 |
if vCard then |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
27 |
session.send(st.reply(stanza):add_child(vCard)); -- send vCard! |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
28 |
else |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
29 |
session.send(st.error_reply(stanza, "cancel", "item-not-found")); |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
30 |
end |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
31 |
else |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
32 |
if not to then |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
33 |
if datamanager.store(session.username, session.host, "vcard", st.preserialize(stanza.tags[1])) then |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
34 |
session.send(st.reply(stanza)); |
1956
ec04b571fa86
mod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full JID by ejabberd MUC rooms
Matthew Wild <mwild1@gmail.com>
parents:
1779
diff
changeset
|
35 |
else |
2002
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
36 |
-- TODO unable to write file, file may be locked, etc, what's the correct error? |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
37 |
session.send(st.error_reply(stanza, "wait", "internal-server-error")); |
1956
ec04b571fa86
mod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full JID by ejabberd MUC rooms
Matthew Wild <mwild1@gmail.com>
parents:
1779
diff
changeset
|
38 |
end |
2002
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
39 |
else |
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
40 |
session.send(st.error_reply(stanza, "auth", "forbidden")); |
1956
ec04b571fa86
mod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full JID by ejabberd MUC rooms
Matthew Wild <mwild1@gmail.com>
parents:
1779
diff
changeset
|
41 |
end |
ec04b571fa86
mod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full JID by ejabberd MUC rooms
Matthew Wild <mwild1@gmail.com>
parents:
1779
diff
changeset
|
42 |
end |
2002
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
43 |
return true; |
1956
ec04b571fa86
mod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full JID by ejabberd MUC rooms
Matthew Wild <mwild1@gmail.com>
parents:
1779
diff
changeset
|
44 |
end |
ec04b571fa86
mod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full JID by ejabberd MUC rooms
Matthew Wild <mwild1@gmail.com>
parents:
1779
diff
changeset
|
45 |
|
2001
2f73fe2b3edd
mod_vcard: Moved completely to new event based hooks.
Waqas Hussain <waqas20@gmail.com>
parents:
2000
diff
changeset
|
46 |
module:hook("iq/bare/vcard-temp:vCard", handle_vcard); |
2f73fe2b3edd
mod_vcard: Moved completely to new event based hooks.
Waqas Hussain <waqas20@gmail.com>
parents:
2000
diff
changeset
|
47 |
module:hook("iq/host/vcard-temp:vCard", handle_vcard); |
86
a2085854c72c
Added: vCard plugin: mod_vcard
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
48 |
|
1956
ec04b571fa86
mod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full JID by ejabberd MUC rooms
Matthew Wild <mwild1@gmail.com>
parents:
1779
diff
changeset
|
49 |
-- COMPAT: https://support.process-one.net/browse/EJAB-1045 |
ec04b571fa86
mod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full JID by ejabberd MUC rooms
Matthew Wild <mwild1@gmail.com>
parents:
1779
diff
changeset
|
50 |
if module:get_option("vcard_compatibility") then |
2002
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
51 |
module:hook("iq/full", function(data) |
1956
ec04b571fa86
mod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full JID by ejabberd MUC rooms
Matthew Wild <mwild1@gmail.com>
parents:
1779
diff
changeset
|
52 |
local stanza = data.stanza; |
2002
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
53 |
local payload = stanza.tags[1]; |
2709
db3497124ca2
mod_vcard: Stricter matching of vcard stanzas with vcard_compatibility enabled, fixes intercepting stanzas to the full JID that it shouldn't
Matthew Wild <mwild1@gmail.com>
parents:
2004
diff
changeset
|
54 |
if stanza.attr.type == "get" and payload.name == "vCard" and payload.attr.xmlns == "vcard-temp" then |
2002
fa71261d8a15
mod_vcard: Refactoring and cleanup.
Waqas Hussain <waqas20@gmail.com>
parents:
2001
diff
changeset
|
55 |
return handle_vcard(data); |
1956
ec04b571fa86
mod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full JID by ejabberd MUC rooms
Matthew Wild <mwild1@gmail.com>
parents:
1779
diff
changeset
|
56 |
end |
ec04b571fa86
mod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full JID by ejabberd MUC rooms
Matthew Wild <mwild1@gmail.com>
parents:
1779
diff
changeset
|
57 |
end, 1); |
ec04b571fa86
mod_vcard: Add vcard_compatibility option to handle vcard stanzas routed to the full JID by ejabberd MUC rooms
Matthew Wild <mwild1@gmail.com>
parents:
1779
diff
changeset
|
58 |
end |