prosody
887d3a0e1e4e
plugins/mod_privacy.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

plugins/mod_privacy.lua @ 2744:887d3a0e1e4e

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 05 Mar 2010 18:35:23 +0000
parent 2616:58148ad08af5
child 2925:692b3c6c5bd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1522
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1293
diff changeset
1 -- Prosody IM
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1293
diff changeset
2 -- Copyright (C) 2008-2009 Matthew Wild
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1293
diff changeset
3 -- Copyright (C) 2008-2009 Waqas Hussain
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
4 -- Copyright (C) 2009 Thilo Cestonaro
1522
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1293
diff changeset
5 --
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1293
diff changeset
6 -- This project is MIT/X11 licensed. Please see the
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1293
diff changeset
7 -- COPYING file in the source package for more information.
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1293
diff changeset
8 --
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1293
diff changeset
9
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
10 local prosody = prosody;
1293
13dde33d5b87 mod_privacy: Initial commit
Waqas Hussain <waqas20@gmail.com>
parents:
diff changeset
11 local st = require "util.stanza";
13dde33d5b87 mod_privacy: Initial commit
Waqas Hussain <waqas20@gmail.com>
parents:
diff changeset
12 local datamanager = require "util.datamanager";
2498
3d08a6cf57ea mod_privacy: Fixed global access.
Waqas Hussain <waqas20@gmail.com>
parents: 2496
diff changeset
13 local bare_sessions, full_sessions = bare_sessions, full_sessions;
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
14 local util_Jid = require "util.jid";
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
15 local jid_bare = util_Jid.bare;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
16 local jid_split = util_Jid.split;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
17 local load_roster = require "core.rostermanager".load_roster;
2498
3d08a6cf57ea mod_privacy: Fixed global access.
Waqas Hussain <waqas20@gmail.com>
parents: 2496
diff changeset
18 local to_number = tonumber;
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
19
2500
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
20 function isListUsed(origin, name, privacy_lists)
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
21 local user = bare_sessions[origin.username.."@"..origin.host];
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
22 if user then
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
23 for resource, session in pairs(user.sessions) do
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
24 if resource ~= origin.resource then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
25 if session.activePrivacyList == name then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
26 return true;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
27 elseif session.activePrivacyList == nil and privacy_lists.default == name then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
28 return true;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
29 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
30 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
31 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
32 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
33 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
34
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
35 function isAnotherSessionUsingDefaultList(origin)
2500
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
36 local user = bare_sessions[origin.username.."@"..origin.host];
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
37 if user then
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
38 for resource, session in pairs(user.sessions) do
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
39 if resource ~= origin.resource and session.activePrivacyList == nil then
2500
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
40 return true;
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
41 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
42 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
43 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
44 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
45
2498
3d08a6cf57ea mod_privacy: Fixed global access.
Waqas Hussain <waqas20@gmail.com>
parents: 2496
diff changeset
46 function sendUnavailable(origin, to, from)
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
47 --[[ example unavailable presence stanza
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
48 <presence from="node@host/resource" type="unavailable" to="node@host" >
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
49 <status>Logged out</status>
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
50 </presence>
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
51 ]]--
2500
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
52 local presence = st.presence({from=from, type="unavailable"});
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
53 presence:tag("status"):text("Logged out");
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
54
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
55 local node, host = jid_bare(to);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
56 local bare = node .. "@" .. host;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
57
2500
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
58 local user = bare_sessions[bare];
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
59 if user then
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
60 for resource, session in pairs(user.sessions) do
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
61 presence.attr.to = session.full_jid;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
62 module:log("debug", "send unavailable to: %s; from: %s", tostring(presence.attr.to), tostring(presence.attr.from));
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
63 origin.send(presence);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
64 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
65 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
66 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
67
2500
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
68 function declineList(privacy_lists, origin, stanza, which)
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
69 if which == "default" then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
70 if isAnotherSessionUsingDefaultList(origin) then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
71 return { "cancel", "conflict", "Another session is online and using the default list."};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
72 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
73 privacy_lists.default = nil;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
74 origin.send(st.reply(stanza));
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
75 elseif which == "active" then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
76 origin.activePrivacyList = nil;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
77 origin.send(st.reply(stanza));
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
78 else
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
79 return {"modify", "bad-request", "Neither default nor active list specifed to decline."};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
80 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
81 return true;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
82 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
83
2500
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
84 function activateList(privacy_lists, origin, stanza, which, name)
2588
741302471a23 mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code
Matthew Wild <mwild1@gmail.com>
parents: 2579
diff changeset
85 local list = privacy_lists.lists[name];
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
86
2588
741302471a23 mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code
Matthew Wild <mwild1@gmail.com>
parents: 2579
diff changeset
87 if which == "default" and list then
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
88 if isAnotherSessionUsingDefaultList(origin) then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
89 return {"cancel", "conflict", "Another session is online and using the default list."};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
90 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
91 privacy_lists.default = name;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
92 origin.send(st.reply(stanza));
2588
741302471a23 mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code
Matthew Wild <mwild1@gmail.com>
parents: 2579
diff changeset
93 elseif which == "active" and list then
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
94 origin.activePrivacyList = name;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
95 origin.send(st.reply(stanza));
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
96 else
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
97 return {"modify", "bad-request", "Either not active or default given or unknown list name specified."};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
98 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
99 return true;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
100 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
101
2500
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
102 function deleteList(privacy_lists, origin, stanza, name)
2588
741302471a23 mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code
Matthew Wild <mwild1@gmail.com>
parents: 2579
diff changeset
103 local list = privacy_lists.lists[name];
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
104
2588
741302471a23 mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code
Matthew Wild <mwild1@gmail.com>
parents: 2579
diff changeset
105 if list then
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
106 if isListUsed(origin, name, privacy_lists) then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
107 return {"cancel", "conflict", "Another session is online and using the list which should be deleted."};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
108 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
109 if privacy_lists.default == name then
2590
2d7e2a28d1d5 mod_privacy: Remove use of to identify unspecified privacy list
Matthew Wild <mwild1@gmail.com>
parents: 2589
diff changeset
110 privacy_lists.default = nil;
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
111 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
112 if origin.activePrivacyList == name then
2590
2d7e2a28d1d5 mod_privacy: Remove use of to identify unspecified privacy list
Matthew Wild <mwild1@gmail.com>
parents: 2589
diff changeset
113 origin.activePrivacyList = nil;
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
114 end
2588
741302471a23 mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code
Matthew Wild <mwild1@gmail.com>
parents: 2579
diff changeset
115 privacy_lists.lists[name] = nil;
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
116 origin.send(st.reply(stanza));
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
117 return true;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
118 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
119 return {"modify", "bad-request", "Not existing list specifed to be deleted."};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
120 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
121
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
122 function createOrReplaceList (privacy_lists, origin, stanza, name, entries, roster)
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
123 local bare_jid = origin.username.."@"..origin.host;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
124
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
125 if privacy_lists.lists == nil then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
126 privacy_lists.lists = {};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
127 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
128
2588
741302471a23 mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code
Matthew Wild <mwild1@gmail.com>
parents: 2579
diff changeset
129 local list = {};
741302471a23 mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code
Matthew Wild <mwild1@gmail.com>
parents: 2579
diff changeset
130 privacy_lists.lists[name] = list;
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
131
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
132 local orderCheck = {};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
133 list.name = name;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
134 list.items = {};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
135
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
136 for _,item in ipairs(entries) do
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
137 if to_number(item.attr.order) == nil or to_number(item.attr.order) < 0 or orderCheck[item.attr.order] ~= nil then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
138 return {"modify", "bad-request", "Order attribute not valid."};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
139 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
140
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
141 if item.attr.type ~= nil and item.attr.type ~= "jid" and item.attr.type ~= "subscription" and item.attr.type ~= "group" then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
142 return {"modify", "bad-request", "Type attribute not valid."};
2516
68a889016a46 mod_privacy: Trailing whitespace (I can't sleep)
Matthew Wild <mwild1@gmail.com>
parents: 2502
diff changeset
143 end
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
144
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
145 local tmp = {};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
146 orderCheck[item.attr.order] = true;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
147
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
148 tmp["type"] = item.attr.type;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
149 tmp["value"] = item.attr.value;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
150 tmp["action"] = item.attr.action;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
151 tmp["order"] = to_number(item.attr.order);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
152 tmp["presence-in"] = false;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
153 tmp["presence-out"] = false;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
154 tmp["message"] = false;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
155 tmp["iq"] = false;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
156
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
157 if #item.tags > 0 then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
158 for _,tag in ipairs(item.tags) do
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
159 tmp[tag.name] = true;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
160 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
161 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
162
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
163 if tmp.type == "group" then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
164 local found = false;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
165 local roster = load_roster(origin.username, origin.host);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
166 for jid,item in pairs(roster) do
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
167 if item.groups ~= nil then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
168 for group in pairs(item.groups) do
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
169 if group == tmp.value then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
170 found = true;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
171 break;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
172 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
173 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
174 if found == true then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
175 break;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
176 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
177 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
178 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
179 if found == false then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
180 return {"cancel", "item-not-found", "Specifed roster group not existing."};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
181 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
182 elseif tmp.type == "subscription" then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
183 if tmp.value ~= "both" and
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
184 tmp.value ~= "to" and
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
185 tmp.value ~= "from" and
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
186 tmp.value ~= "none" then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
187 return {"cancel", "bad-request", "Subscription value must be both, to, from or none."};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
188 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
189 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
190
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
191 if tmp.action ~= "deny" and tmp.action ~= "allow" then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
192 return {"cancel", "bad-request", "Action must be either deny or allow."};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
193 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
194 list.items[#list.items + 1] = tmp;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
195 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
196
2499
145d62abdbfc mod_privacy: Reduced a function.
Waqas Hussain <waqas20@gmail.com>
parents: 2498
diff changeset
197 table.sort(list, function(a, b) return a.order < b.order; end);
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
198
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
199 origin.send(st.reply(stanza));
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
200 if bare_sessions[bare_jid] ~= nil then
2498
3d08a6cf57ea mod_privacy: Fixed global access.
Waqas Hussain <waqas20@gmail.com>
parents: 2496
diff changeset
201 local iq = st.iq ( { type = "set", id="push1" } );
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
202 iq:tag ("query", { xmlns = "jabber:iq:privacy" } );
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
203 iq:tag ("list", { name = list.name } ):up();
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
204 iq:up();
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
205 for resource, session in pairs(bare_sessions[bare_jid].sessions) do
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
206 iq.attr.to = bare_jid.."/"..resource
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
207 session.send(iq);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
208 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
209 else
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
210 return {"cancel", "bad-request", "internal error."};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
211 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
212 return true;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
213 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
214
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
215 function getList(privacy_lists, origin, stanza, name)
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
216 local reply = st.reply(stanza);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
217 reply:tag("query", {xmlns="jabber:iq:privacy"});
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
218
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
219 if name == nil then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
220 if privacy_lists.lists then
2590
2d7e2a28d1d5 mod_privacy: Remove use of to identify unspecified privacy list
Matthew Wild <mwild1@gmail.com>
parents: 2589
diff changeset
221 if origin.ActivePrivacyList then
2d7e2a28d1d5 mod_privacy: Remove use of to identify unspecified privacy list
Matthew Wild <mwild1@gmail.com>
parents: 2589
diff changeset
222 reply:tag("active", {name=origin.activePrivacyList}):up();
2d7e2a28d1d5 mod_privacy: Remove use of to identify unspecified privacy list
Matthew Wild <mwild1@gmail.com>
parents: 2589
diff changeset
223 end
2d7e2a28d1d5 mod_privacy: Remove use of to identify unspecified privacy list
Matthew Wild <mwild1@gmail.com>
parents: 2589
diff changeset
224 if privacy_lists.default then
2d7e2a28d1d5 mod_privacy: Remove use of to identify unspecified privacy list
Matthew Wild <mwild1@gmail.com>
parents: 2589
diff changeset
225 reply:tag("default", {name=privacy_lists.default}):up();
2d7e2a28d1d5 mod_privacy: Remove use of to identify unspecified privacy list
Matthew Wild <mwild1@gmail.com>
parents: 2589
diff changeset
226 end
2615
c5f7c803fe7d mod_privacy: Fix to correctly iterate over lists stored in new format
Matthew Wild <mwild1@gmail.com>
parents: 2614
diff changeset
227 for name,list in pairs(privacy_lists.lists) do
c5f7c803fe7d mod_privacy: Fix to correctly iterate over lists stored in new format
Matthew Wild <mwild1@gmail.com>
parents: 2614
diff changeset
228 reply:tag("list", {name=name}):up();
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
229 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
230 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
231 else
2588
741302471a23 mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code
Matthew Wild <mwild1@gmail.com>
parents: 2579
diff changeset
232 local list = privacy_lists.lists[name];
741302471a23 mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code
Matthew Wild <mwild1@gmail.com>
parents: 2579
diff changeset
233 if list then
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
234 reply = reply:tag("list", {name=list.name});
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
235 for _,item in ipairs(list.items) do
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
236 reply:tag("item", {type=item.type, value=item.value, action=item.action, order=item.order});
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
237 if item["message"] then reply:tag("message"):up(); end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
238 if item["iq"] then reply:tag("iq"):up(); end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
239 if item["presence-in"] then reply:tag("presence-in"):up(); end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
240 if item["presence-out"] then reply:tag("presence-out"):up(); end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
241 reply:up();
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
242 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
243 else
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
244 return {"cancel", "item-not-found", "Unknown list specified."};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
245 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
246 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
247
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
248 origin.send(reply);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
249 return true;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
250 end
1293
13dde33d5b87 mod_privacy: Initial commit
Waqas Hussain <waqas20@gmail.com>
parents:
diff changeset
251
13dde33d5b87 mod_privacy: Initial commit
Waqas Hussain <waqas20@gmail.com>
parents:
diff changeset
252 module:hook("iq/bare/jabber:iq:privacy:query", function(data)
13dde33d5b87 mod_privacy: Initial commit
Waqas Hussain <waqas20@gmail.com>
parents:
diff changeset
253 local origin, stanza = data.origin, data.stanza;
13dde33d5b87 mod_privacy: Initial commit
Waqas Hussain <waqas20@gmail.com>
parents:
diff changeset
254
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
255 if stanza.attr.to == nil then -- only service requests to own bare JID
1293
13dde33d5b87 mod_privacy: Initial commit
Waqas Hussain <waqas20@gmail.com>
parents:
diff changeset
256 local query = stanza.tags[1]; -- the query element
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
257 local valid = false;
2614
7a589e9e2372 mod_privacy: Upgrade old privacy lists to new storage format, so they don't get lost
Matthew Wild <mwild1@gmail.com>
parents: 2590
diff changeset
258 local privacy_lists = datamanager.load(origin.username, origin.host, "privacy") or { lists = {} };
7a589e9e2372 mod_privacy: Upgrade old privacy lists to new storage format, so they don't get lost
Matthew Wild <mwild1@gmail.com>
parents: 2590
diff changeset
259
7a589e9e2372 mod_privacy: Upgrade old privacy lists to new storage format, so they don't get lost
Matthew Wild <mwild1@gmail.com>
parents: 2590
diff changeset
260 if privacy_lists.lists[1] then -- Code to migrate from old privacy lists format, remove in 0.8
7a589e9e2372 mod_privacy: Upgrade old privacy lists to new storage format, so they don't get lost
Matthew Wild <mwild1@gmail.com>
parents: 2590
diff changeset
261 module:log("info", "Upgrading format of stored privacy lists for %s@%s", origin.username, origin.host);
7a589e9e2372 mod_privacy: Upgrade old privacy lists to new storage format, so they don't get lost
Matthew Wild <mwild1@gmail.com>
parents: 2590
diff changeset
262 local lists = privacy_lists.lists;
7a589e9e2372 mod_privacy: Upgrade old privacy lists to new storage format, so they don't get lost
Matthew Wild <mwild1@gmail.com>
parents: 2590
diff changeset
263 for idx, list in ipairs(lists) do
7a589e9e2372 mod_privacy: Upgrade old privacy lists to new storage format, so they don't get lost
Matthew Wild <mwild1@gmail.com>
parents: 2590
diff changeset
264 lists[list.name] = list;
7a589e9e2372 mod_privacy: Upgrade old privacy lists to new storage format, so they don't get lost
Matthew Wild <mwild1@gmail.com>
parents: 2590
diff changeset
265 lists[idx] = nil;
7a589e9e2372 mod_privacy: Upgrade old privacy lists to new storage format, so they don't get lost
Matthew Wild <mwild1@gmail.com>
parents: 2590
diff changeset
266 end
7a589e9e2372 mod_privacy: Upgrade old privacy lists to new storage format, so they don't get lost
Matthew Wild <mwild1@gmail.com>
parents: 2590
diff changeset
267 end
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
268
1293
13dde33d5b87 mod_privacy: Initial commit
Waqas Hussain <waqas20@gmail.com>
parents:
diff changeset
269 if stanza.attr.type == "set" then
2516
68a889016a46 mod_privacy: Trailing whitespace (I can't sleep)
Matthew Wild <mwild1@gmail.com>
parents: 2502
diff changeset
270 if #query.tags == 1 then -- the <query/> element MUST NOT include more than one child element
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
271 for _,tag in ipairs(query.tags) do
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
272 if tag.name == "active" or tag.name == "default" then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
273 if tag.attr.name == nil then -- Client declines the use of active / default list
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
274 valid = declineList(privacy_lists, origin, stanza, tag.name);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
275 else -- Client requests change of active / default list
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
276 valid = activateList(privacy_lists, origin, stanza, tag.name, tag.attr.name);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
277 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
278 elseif tag.name == "list" and tag.attr.name then -- Client adds / edits a privacy list
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
279 if #tag.tags == 0 then -- Client removes a privacy list
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
280 valid = deleteList(privacy_lists, origin, stanza, tag.attr.name);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
281 else -- Client edits a privacy list
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
282 valid = createOrReplaceList(privacy_lists, origin, stanza, tag.attr.name, tag.tags);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
283 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
284 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
285 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
286 end
1293
13dde33d5b87 mod_privacy: Initial commit
Waqas Hussain <waqas20@gmail.com>
parents:
diff changeset
287 elseif stanza.attr.type == "get" then
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
288 local name = nil;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
289 local listsToRetrieve = 0;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
290 if #query.tags >= 1 then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
291 for _,tag in ipairs(query.tags) do
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
292 if tag.name == "list" then -- Client requests a privacy list from server
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
293 name = tag.attr.name;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
294 listsToRetrieve = listsToRetrieve + 1;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
295 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
296 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
297 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
298 if listsToRetrieve == 0 or listsToRetrieve == 1 then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
299 valid = getList(privacy_lists, origin, stanza, name);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
300 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
301 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
302
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
303 if valid ~= true then
2589
39f5a068dc41 mod_privacy: Fix potential traceback in stanza validation, and fix some zero-based indexing :)
Matthew Wild <mwild1@gmail.com>
parents: 2588
diff changeset
304 valid = valid or { "cancel", "bad-request", "Couldn't understand request" };
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
305 if valid[1] == nil then
2589
39f5a068dc41 mod_privacy: Fix potential traceback in stanza validation, and fix some zero-based indexing :)
Matthew Wild <mwild1@gmail.com>
parents: 2588
diff changeset
306 valid[1] = "cancel";
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
307 end
2589
39f5a068dc41 mod_privacy: Fix potential traceback in stanza validation, and fix some zero-based indexing :)
Matthew Wild <mwild1@gmail.com>
parents: 2588
diff changeset
308 if valid[2] == nil then
39f5a068dc41 mod_privacy: Fix potential traceback in stanza validation, and fix some zero-based indexing :)
Matthew Wild <mwild1@gmail.com>
parents: 2588
diff changeset
309 valid[2] = "bad-request";
39f5a068dc41 mod_privacy: Fix potential traceback in stanza validation, and fix some zero-based indexing :)
Matthew Wild <mwild1@gmail.com>
parents: 2588
diff changeset
310 end
39f5a068dc41 mod_privacy: Fix potential traceback in stanza validation, and fix some zero-based indexing :)
Matthew Wild <mwild1@gmail.com>
parents: 2588
diff changeset
311 origin.send(st.error_reply(stanza, valid[1], valid[2], valid[3]));
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
312 else
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
313 datamanager.store(origin.username, origin.host, "privacy", privacy_lists);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
314 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
315 return true;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
316 end
2500
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
317 end);
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
318
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
319 function checkIfNeedToBeBlocked(e, session)
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
320 local origin, stanza = e.origin, e.stanza;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
321 local privacy_lists = datamanager.load(session.username, session.host, "privacy") or {};
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
322 local bare_jid = session.username.."@"..session.host;
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
323 local to = stanza.attr.to;
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
324 local from = stanza.attr.from;
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
325
2579
4e0caff152d6 mod_privacy: Rename from_user/to_user flags to is_from_user/is_to_user for clarity
Matthew Wild <mwild1@gmail.com>
parents: 2524
diff changeset
326 local is_to_user = bare_jid == jid_bare(to);
4e0caff152d6 mod_privacy: Rename from_user/to_user flags to is_from_user/is_to_user for clarity
Matthew Wild <mwild1@gmail.com>
parents: 2524
diff changeset
327 local is_from_user = bare_jid == jid_bare(from);
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
328
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
329 module:log("debug", "stanza: %s, to: %s, from: %s", tostring(stanza.name), tostring(to), tostring(from));
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
330
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
331 if privacy_lists.lists == nil or
2590
2d7e2a28d1d5 mod_privacy: Remove use of to identify unspecified privacy list
Matthew Wild <mwild1@gmail.com>
parents: 2589
diff changeset
332 not (session.activePrivacyList or privacy_lists.default)
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
333 then
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
334 return; -- Nothing to block, default is Allow all
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
335 end
2579
4e0caff152d6 mod_privacy: Rename from_user/to_user flags to is_from_user/is_to_user for clarity
Matthew Wild <mwild1@gmail.com>
parents: 2524
diff changeset
336 if is_from_user and is_to_user then
2524
b427f5401ce7 mod_privacy: A handful of logging fixes
Matthew Wild <mwild1@gmail.com>
parents: 2523
diff changeset
337 module:log("debug", "Not blocking communications between user's resources");
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
338 return; -- from one of a user's resource to another => HANDS OFF!
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
339 end
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
340
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
341 local item;
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
342 local listname = session.activePrivacyList;
2590
2d7e2a28d1d5 mod_privacy: Remove use of to identify unspecified privacy list
Matthew Wild <mwild1@gmail.com>
parents: 2589
diff changeset
343 if listname == nil then
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
344 listname = privacy_lists.default; -- no active list selected, use default list
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
345 end
2588
741302471a23 mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code
Matthew Wild <mwild1@gmail.com>
parents: 2579
diff changeset
346 local list = privacy_lists.lists[listname];
741302471a23 mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code
Matthew Wild <mwild1@gmail.com>
parents: 2579
diff changeset
347 if not list then
741302471a23 mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code
Matthew Wild <mwild1@gmail.com>
parents: 2579
diff changeset
348 module:log("debug", "given privacy list not found. name: %s", listname);
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
349 return;
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
350 end
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
351 for _,item in ipairs(list.items) do
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
352 local apply = false;
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
353 local block = false;
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
354 if (
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
355 (stanza.name == "message" and item.message) or
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
356 (stanza.name == "iq" and item.iq) or
2579
4e0caff152d6 mod_privacy: Rename from_user/to_user flags to is_from_user/is_to_user for clarity
Matthew Wild <mwild1@gmail.com>
parents: 2524
diff changeset
357 (stanza.name == "presence" and is_to_user and item["presence-in"]) or
4e0caff152d6 mod_privacy: Rename from_user/to_user flags to is_from_user/is_to_user for clarity
Matthew Wild <mwild1@gmail.com>
parents: 2524
diff changeset
358 (stanza.name == "presence" and is_from_user and item["presence-out"]) or
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
359 (item.message == false and item.iq == false and item["presence-in"] == false and item["presence-out"] == false)
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
360 ) then
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
361 apply = true;
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
362 end
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
363 if apply then
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
364 local evilJid = {};
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
365 apply = false;
2579
4e0caff152d6 mod_privacy: Rename from_user/to_user flags to is_from_user/is_to_user for clarity
Matthew Wild <mwild1@gmail.com>
parents: 2524
diff changeset
366 if is_to_user then
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
367 module:log("debug", "evil jid is (from): %s", from);
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
368 evilJid.node, evilJid.host, evilJid.resource = jid_split(from);
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
369 else
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
370 module:log("debug", "evil jid is (to): %s", to);
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
371 evilJid.node, evilJid.host, evilJid.resource = jid_split(to);
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
372 end
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
373 if item.type == "jid" and
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
374 (evilJid.node and evilJid.host and evilJid.resource and item.value == evilJid.node.."@"..evilJid.host.."/"..evilJid.resource) or
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
375 (evilJid.node and evilJid.host and item.value == evilJid.node.."@"..evilJid.host) or
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
376 (evilJid.host and evilJid.resource and item.value == evilJid.host.."/"..evilJid.resource) or
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
377 (evilJid.host and item.value == evilJid.host) then
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
378 apply = true;
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
379 block = (item.action == "deny");
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
380 elseif item.type == "group" then
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
381 local roster = load_roster(session.username, session.host);
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
382 local groups = roster[evilJid.node .. "@" .. evilJid.host].groups;
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
383 for group in pairs(groups) do
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
384 if group == item.value then
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
385 apply = true;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
386 block = (item.action == "deny");
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
387 break;
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
388 end
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
389 end
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
390 elseif item.type == "subscription" and evilJid.node ~= nil and evilJid.host ~= nil then -- we need a valid bare evil jid
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
391 local roster = load_roster(session.username, session.host);
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
392 if roster[evilJid.node .. "@" .. evilJid.host].subscription == item.value then
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
393 apply = true;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
394 block = (item.action == "deny");
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
395 end
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
396 elseif item.type == nil then
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
397 apply = true;
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
398 block = (item.action == "deny");
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
399 end
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
400 end
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
401 if apply then
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
402 if block then
2524
b427f5401ce7 mod_privacy: A handful of logging fixes
Matthew Wild <mwild1@gmail.com>
parents: 2523
diff changeset
403 module:log("debug", "stanza blocked: %s, to: %s, from: %s", tostring(stanza.name), tostring(to), tostring(from));
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
404 if stanza.name == "message" then
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
405 origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
406 elseif stanza.name == "iq" and (stanza.attr.type == "get" or stanza.attr.type == "set") then
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
407 origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
408 end
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
409 return true; -- stanza blocked !
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
410 else
2524
b427f5401ce7 mod_privacy: A handful of logging fixes
Matthew Wild <mwild1@gmail.com>
parents: 2523
diff changeset
411 module:log("debug", "stanza explicitly allowed!")
2523
0c816b271208 mod_privacy: Remove the giant if/end block that was really causing problems - skipping stanzas with no to/from (like presence broadcast). Also optimised the code a *lot*, these changes untested at the moment though.
Matthew Wild <mwild1@gmail.com>
parents: 2522
diff changeset
412 return;
1293
13dde33d5b87 mod_privacy: Initial commit
Waqas Hussain <waqas20@gmail.com>
parents:
diff changeset
413 end
13dde33d5b87 mod_privacy: Initial commit
Waqas Hussain <waqas20@gmail.com>
parents:
diff changeset
414 end
13dde33d5b87 mod_privacy: Initial commit
Waqas Hussain <waqas20@gmail.com>
parents:
diff changeset
415 end
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
416 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
417
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
418 function preCheckIncoming(e)
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
419 local session;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
420 if e.stanza.attr.to ~= nil then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
421 local node, host, resource = jid_split(e.stanza.attr.to);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
422 if node == nil or host == nil then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
423 return;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
424 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
425 if resource == nil then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
426 local prio = 0;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
427 local session_;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
428 if bare_sessions[node.."@"..host] ~= nil then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
429 for resource, session_ in pairs(bare_sessions[node.."@"..host].sessions) do
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
430 if session_.priority ~= nil and session_.priority > prio then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
431 session = session_;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
432 prio = session_.priority;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
433 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
434 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
435 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
436 else
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
437 session = full_sessions[node.."@"..host.."/"..resource];
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
438 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
439 if session ~= nil then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
440 return checkIfNeedToBeBlocked(e, session);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
441 else
2500
bffdaeb7ab5e mod_privacy: Cleaned up code.
Waqas Hussain <waqas20@gmail.com>
parents: 2499
diff changeset
442 module:log("debug", "preCheckIncoming: Couldn't get session for jid: %s@%s/%s", tostring(node), tostring(host), tostring(resource));
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
443 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
444 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
445 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
446
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
447 function preCheckOutgoing(e)
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
448 local session = e.origin;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
449 if e.stanza.attr.from == nil then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
450 e.stanza.attr.from = session.username .. "@" .. session.host;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
451 if session.resource ~= nil then
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
452 e.stanza.attr.from = e.stanza.attr.from .. "/" .. session.resource;
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
453 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
454 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
455 return checkIfNeedToBeBlocked(e, session);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
456 end
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
457
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
458 module:hook("pre-message/full", preCheckOutgoing, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
459 module:hook("pre-message/bare", preCheckOutgoing, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
460 module:hook("pre-message/host", preCheckOutgoing, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
461 module:hook("pre-iq/full", preCheckOutgoing, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
462 module:hook("pre-iq/bare", preCheckOutgoing, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
463 module:hook("pre-iq/host", preCheckOutgoing, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
464 module:hook("pre-presence/full", preCheckOutgoing, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
465 module:hook("pre-presence/bare", preCheckOutgoing, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
466 module:hook("pre-presence/host", preCheckOutgoing, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
467
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
468 module:hook("message/full", preCheckIncoming, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
469 module:hook("message/bare", preCheckIncoming, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
470 module:hook("message/host", preCheckIncoming, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
471 module:hook("iq/full", preCheckIncoming, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
472 module:hook("iq/bare", preCheckIncoming, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
473 module:hook("iq/host", preCheckIncoming, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
474 module:hook("presence/full", preCheckIncoming, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
475 module:hook("presence/bare", preCheckIncoming, 500);
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
476 module:hook("presence/host", preCheckIncoming, 500);