1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
|
local mm = require "core.modulemanager";
if mm.get_modules_for_host(module.host):contains("bookmarks2") then
error("mod_bookmarks and mod_bookmarks2 are conflicting, please disable one of them.", 0);
end
local st = require "util.stanza";
local jid_split = require "util.jid".split;
local mod_pep = module:depends "pep";
local private_storage = module:open_store("private", "map");
local namespace = "urn:xmpp:bookmarks:1";
local namespace_private = "jabber:iq:private";
local namespace_legacy = "storage:bookmarks";
local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
local default_options = {
["persist_items"] = true;
["max_items"] = "max";
["send_last_published_item"] = "never";
["access_model"] = "whitelist";
};
module:hook("account-disco-info", function (event)
-- This Time it’s Serious!
event.reply:tag("feature", { var = namespace.."#compat" }):up();
event.reply:tag("feature", { var = namespace.."#compat-pep" }):up();
-- COMPAT XEP-0411
event.reply:tag("feature", { var = "urn:xmpp:bookmarks-conversion:0" }):up();
end);
-- This must be declared on the domain JID, not the account JID. Note that
-- this isn’t defined in the XEP.
module:add_feature(namespace_private);
local function generate_legacy_storage(items)
local storage = st.stanza("storage", { xmlns = namespace_legacy });
for _, item_id in ipairs(items) do
local item = items[item_id];
local bookmark = item:get_child("conference", namespace);
local conference = st.stanza("conference", {
jid = item.attr.id,
name = bookmark.attr.name,
autojoin = bookmark.attr.autojoin,
});
local nick = bookmark:get_child_text("nick");
if nick ~= nil then
conference:text_tag("nick", nick):up();
end
local password = bookmark:get_child_text("password");
if password ~= nil then
conference:text_tag("password", password):up();
end
storage:add_child(conference);
end
return storage;
end
local function on_retrieve_legacy_pep(event)
local stanza, session = event.stanza, event.origin;
local pubsub = stanza:get_child("pubsub", "http://jabber.org/protocol/pubsub");
if pubsub == nil then
return;
end
local items = pubsub:get_child("items");
if items == nil then
return;
end
local node = items.attr.node;
if node ~= namespace_legacy then
return;
end
local username = session.username;
local jid = username.."@"..session.host;
local service = mod_pep.get_pep_service(username);
local ok, ret = service:get_items(namespace, session.full_jid);
if not ok then
module:log("error", "Failed to retrieve PEP bookmarks of %s: %s", jid, ret);
session.send(st.error_reply(stanza, "cancel", ret, "Failed to retrive bookmarks from PEP"));
return true;
end
local storage = generate_legacy_storage(ret);
module:log("debug", "Sending back legacy PEP for %s: %s", jid, storage);
session.send(st.reply(stanza)
:tag("pubsub", {xmlns = "http://jabber.org/protocol/pubsub"})
:tag("items", {node = namespace_legacy})
:tag("item", {id = "current"})
:add_child(storage));
return true;
end
local function on_retrieve_private_xml(event)
local stanza, session = event.stanza, event.origin;
local query = stanza:get_child("query", namespace_private);
if query == nil then
return;
end
local bookmarks = query:get_child("storage", namespace_legacy);
if bookmarks == nil then
return;
end
module:log("debug", "Getting private bookmarks: %s", bookmarks);
local username = session.username;
local jid = username.."@"..session.host;
local service = mod_pep.get_pep_service(username);
local ok, ret = service:get_items(namespace, session.full_jid);
if not ok then
if ret == "item-not-found" then
module:log("debug", "Got no PEP bookmarks item for %s, returning empty private bookmarks", jid);
session.send(st.reply(stanza):add_child(query));
else
module:log("error", "Failed to retrieve PEP bookmarks of %s: %s", jid, ret);
session.send(st.error_reply(stanza, "cancel", ret, "Failed to retrive bookmarks from PEP"));
end
return true;
end
local storage = generate_legacy_storage(ret);
module:log("debug", "Sending back private for %s: %s", jid, storage);
session.send(st.reply(stanza):query(namespace_private):add_child(storage));
return true;
end
local function compare_bookmark2(a, b)
if a == nil or b == nil then
return false;
end
local a_conference = a:get_child("conference", namespace);
local b_conference = b:get_child("conference", namespace);
local a_nick = a_conference:get_child_text("nick");
local b_nick = b_conference:get_child_text("nick");
local a_password = a_conference:get_child_text("password");
local b_password = b_conference:get_child_text("password");
return (a.attr.id == b.attr.id and
a_conference.attr.name == b_conference.attr.name and
a_conference.attr.autojoin == b_conference.attr.autojoin and
a_nick == b_nick and
a_password == b_password);
end
local function publish_to_pep(jid, bookmarks, synchronise)
local service = mod_pep.get_pep_service(jid_split(jid));
if #bookmarks.tags == 0 then
if synchronise then
-- If we set zero legacy bookmarks, purge the bookmarks 2 node.
module:log("debug", "No bookmark in the set, purging instead.");
return service:purge(namespace, jid, true);
else
return true;
end
end
-- Retrieve the current bookmarks2.
module:log("debug", "Retrieving the current bookmarks 2.");
local has_bookmarks2, ret = service:get_items(namespace, jid);
local bookmarks2;
if not has_bookmarks2 and ret == "item-not-found" then
module:log("debug", "Got item-not-found, assuming it was empty until now, creating.");
local ok, err = service:create(namespace, jid, default_options);
if not ok then
module:log("error", "Creating bookmarks 2 node failed: %s", err);
return ok, err;
end
bookmarks2 = {};
elseif not has_bookmarks2 then
module:log("debug", "Got %s error, aborting.", ret);
return false, ret;
else
module:log("debug", "Got existing bookmarks2.");
bookmarks2 = ret;
local ok, err = service:get_node_config(namespace, jid);
if not ok then
module:log("error", "Retrieving bookmarks 2 node config failed: %s", err);
return ok, err;
end
local options = err;
for key, value in pairs(default_options) do
if options[key] and options[key] ~= value then
module:log("warn", "Overriding bookmarks 2 configuration for %s, from %s to %s", jid, options[key], value);
options[key] = value;
end
end
local ok, err = service:set_node_config(namespace, jid, options);
if not ok then
module:log("error", "Setting bookmarks 2 node config failed: %s", err);
return ok, err;
end
end
-- Get a list of all items we may want to remove.
local to_remove = {};
for i in ipairs(bookmarks2) do
to_remove[bookmarks2[i]] = true;
end
for bookmark in bookmarks:childtags("conference", namespace_legacy) do
-- Create the new conference element by copying everything from the legacy one.
local conference = st.stanza("conference", {
xmlns = namespace,
name = bookmark.attr.name,
autojoin = bookmark.attr.autojoin,
});
local nick = bookmark:get_child_text("nick");
if nick ~= nil then
conference:text_tag("nick", nick):up();
end
local password = bookmark:get_child_text("password");
if password ~= nil then
conference:text_tag("password", password):up();
end
-- Create its wrapper.
local item = st.stanza("item", { xmlns = "http://jabber.org/protocol/pubsub", id = bookmark.attr.jid })
:add_child(conference);
-- Then publish it only if it’s a new one or updating a previous one.
if compare_bookmark2(item, bookmarks2[bookmark.attr.jid]) then
module:log("debug", "Item %s identical to the previous one, skipping.", item.attr.id);
to_remove[bookmark.attr.jid] = nil;
else
if bookmarks2[bookmark.attr.jid] == nil then
module:log("debug", "Item %s not existing previously, publishing.", item.attr.id);
else
module:log("debug", "Item %s different from the previous one, publishing.", item.attr.id);
to_remove[bookmark.attr.jid] = nil;
end
local ok, err = service:publish(namespace, jid, bookmark.attr.jid, item, default_options);
if not ok then
module:log("error", "Publishing item %s failed: %s", item.attr.id, err);
return ok, err;
end
end
end
-- Now handle retracting items that have been removed.
if synchronise then
for id in pairs(to_remove) do
module:log("debug", "Item %s removed from bookmarks.", id);
local ok, err = service:retract(namespace, jid, id, st.stanza("retract", { id = id }));
if not ok then
module:log("error", "Retracting item %s failed: %s", id, err);
return ok, err;
end
end
end
return true;
end
-- Synchronise legacy PEP to PEP.
local function on_publish_legacy_pep(event)
local stanza, session = event.stanza, event.origin;
local pubsub = stanza:get_child("pubsub", "http://jabber.org/protocol/pubsub");
if pubsub == nil then
return;
end
local publish = pubsub:get_child("publish");
if publish == nil or publish.attr.node ~= namespace_legacy then
return;
end
local item = publish:get_child("item");
if item == nil then
return;
end
-- Here we ignore the item id, it’ll be generated as 'current' anyway.
local bookmarks = item:get_child("storage", namespace_legacy);
if bookmarks == nil then
return;
end
-- We also ignore the publish-options.
module:log("debug", "Legacy PEP bookmarks set by client, publishing to PEP.");
local ok, err = publish_to_pep(session.full_jid, bookmarks, true);
if not ok then
module:log("error", "Failed to publish to PEP bookmarks for %s@%s: %s", session.username, session.host, err);
session.send(st.error_reply(stanza, "cancel", "internal-server-error", "Failed to store bookmarks to PEP"));
return true;
end
session.send(st.reply(stanza));
return true;
end
-- Synchronise Private XML to PEP.
local function on_publish_private_xml(event)
local stanza, session = event.stanza, event.origin;
local query = stanza:get_child("query", namespace_private);
if query == nil then
return;
end
local bookmarks = query:get_child("storage", namespace_legacy);
if bookmarks == nil then
return;
end
module:log("debug", "Private bookmarks set by client, publishing to PEP.");
local ok, err = publish_to_pep(session.full_jid, bookmarks, true);
if not ok then
module:log("error", "Failed to publish to PEP bookmarks for %s@%s: %s", session.username, session.host, err);
session.send(st.error_reply(stanza, "cancel", "internal-server-error", "Failed to store bookmarks to PEP"));
return true;
end
session.send(st.reply(stanza));
return true;
end
local function migrate_legacy_bookmarks(event)
local session = event.session;
local username = session.username;
local service = mod_pep.get_pep_service(username);
local jid = username.."@"..session.host;
local ok, ret = service:get_items(namespace_legacy, session.full_jid);
if ok then
module:log("debug", "Legacy PEP bookmarks found for %s, migrating.", jid);
local failed = false;
for _, item_id in ipairs(ret) do
local item = ret[item_id];
if item.attr.id ~= "current" then
module:log("warn", "Legacy PEP bookmarks for %s isn’t using 'current' as its id: %s", jid, item.attr.id);
end
local bookmarks = item:get_child("storage", namespace_legacy);
module:log("debug", "Got legacy PEP bookmarks of %s: %s", jid, bookmarks);
local ok, err = publish_to_pep(session.full_jid, bookmarks, false);
if not ok then
module:log("error", "Failed to store legacy PEP bookmarks to bookmarks 2 for %s, aborting migration: %s", jid, err);
failed = true;
break;
end
end
if not failed then
module:log("debug", "Successfully migrated legacy PEP bookmarks of %s to bookmarks 2, clearing items.", jid);
local ok, err = service:purge(namespace_legacy, jid, false);
if not ok then
module:log("error", "Failed to delete legacy PEP bookmarks for %s: %s", jid, err);
end
end
end
local ok, current_legacy_config = service:get_node_config(namespace_legacy, jid);
if not ok or current_legacy_config["access_model"] ~= "whitelist" then
-- The legacy node must exist in order for the access model to apply to the
-- XEP-0411 COMPAT broadcasts (which bypass the pubsub service entirely),
-- so create or reconfigure it to be useless.
--
-- FIXME It would be handy to have a publish model that prevents the owner
-- from publishing, but the affiliation takes priority
local config = {
["persist_items"] = false;
["max_items"] = 1;
["send_last_published_item"] = "never";
["access_model"] = "whitelist";
};
local ok, err;
if ret == "item-not-found" then
ok, err = service:create(namespace_legacy, jid, config);
else
ok, err = service:set_node_config(namespace_legacy, jid, config);
end
if not ok then
module:log("error", "Setting legacy bookmarks node config failed: %s", err);
return ok, err;
end
end
local data, err = private_storage:get(username, "storage:storage:bookmarks");
if not data then
module:log("debug", "No existing legacy bookmarks for %s, migration already done: %s", jid, err);
local ok, ret2 = service:get_items(namespace, session.full_jid);
if not ok or not ret2 then
module:log("debug", "Additionally, no bookmarks 2 were existing for %s, assuming empty.", jid);
module:fire_event("bookmarks/empty", { session = session });
end
return;
end
local bookmarks = st.deserialize(data);
module:log("debug", "Got legacy bookmarks of %s: %s", jid, bookmarks);
module:log("debug", "Going to store legacy bookmarks to bookmarks 2 %s.", jid);
local ok, err = publish_to_pep(session.full_jid, bookmarks, false);
if not ok then
module:log("error", "Failed to store legacy bookmarks to bookmarks 2 for %s, aborting migration: %s", jid, err);
return;
end
module:log("debug", "Stored legacy bookmarks to bookmarks 2 for %s.", jid);
local ok, err = private_storage:set(username, "storage:storage:bookmarks", nil);
if not ok then
module:log("error", "Failed to remove legacy bookmarks of %s: %s", jid, err);
return;
end
module:log("debug", "Removed legacy bookmarks of %s, migration done!", jid);
end
module:hook("iq/bare/jabber:iq:private:query", function (event)
if event.stanza.attr.type == "get" then
return on_retrieve_private_xml(event);
else
return on_publish_private_xml(event);
end
end, 1);
module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function (event)
if event.stanza.attr.type == "get" then
return on_retrieve_legacy_pep(event);
else
return on_publish_legacy_pep(event);
end
end, 1);
if module:get_option_boolean("upgrade_legacy_bookmarks", true) then
module:hook("resource-bind", migrate_legacy_bookmarks);
end
-- COMPAT XEP-0411 Broadcast as per XEP-0048 + PEP
local function legacy_broadcast(event)
local service = event.service;
local ok, bookmarks = service:get_items(namespace, event.actor);
if bookmarks == "item-not-found" then ok, bookmarks = true, {} end
if not ok then return end
local legacy_bookmarks_item = st.stanza("item", { xmlns = xmlns_pubsub; id = "current" })
:add_child(generate_legacy_storage(bookmarks));
service:broadcast("items", namespace_legacy, { --[[ no subscribers ]] }, legacy_bookmarks_item, event.actor);
end
local function broadcast_legacy_removal(event)
if event.node ~= namespace then return end
return legacy_broadcast(event);
end
module:hook("presence/initial", function (event)
-- Broadcasts to all clients with legacy+notify, not just the one coming online.
-- Upgrade to XEP-0402 to avoid it
local service = mod_pep.get_pep_service(event.origin.username);
legacy_broadcast({ service = service, actor = event.origin.full_jid });
end);
module:handle_items("pep-service", function (event)
local service = event.item.service;
module:hook_object_event(service.events, "item-published/" .. namespace, legacy_broadcast);
module:hook_object_event(service.events, "item-retracted", broadcast_legacy_removal);
module:hook_object_event(service.events, "node-purged", broadcast_legacy_removal);
module:hook_object_event(service.events, "node-deleted", broadcast_legacy_removal);
end, function (event)
local service = event.item.service;
module:unhook_object_event(service.events, "item-published/" .. namespace, legacy_broadcast);
module:unhook_object_event(service.events, "item-retracted", broadcast_legacy_removal);
module:unhook_object_event(service.events, "node-purged", broadcast_legacy_removal);
module:unhook_object_event(service.events, "node-deleted", broadcast_legacy_removal);
end, true);
|