Mercurial > prosody-modules
view mod_clean_roster/mod_clean_roster.lua @ 6029:cc665f343690
mod_firewall: SUBSCRIBED: Flip subscription check to match documentation
The documentation claims that this condition checks whether the recipient is
subscribed to the sender.
However, it was using the wrong method, and actually checking whether the
sender was subscribed to the recipient.
A quick poll of folk suggested that the documentation's approach is the right
one, so this should fix the code to match the documentation.
This should also fix the bundled anti-spam rules from blocking presence from
JIDs that you subscribe do (but don't have a mutual subscription with).
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 22 Nov 2024 13:50:48 +0000 |
| parents | e384b91d0aa7 |
| children | c901d57c439c |
line wrap: on
line source
local s_find = string.find; local pctl = require "util.prosodyctl"; local rostermanager = require "core.rostermanager"; local storagemanager = require "core.storagemanager"; local usermanager = require "core.usermanager"; -- copypaste from util.stanza local function valid_xml_cdata(str, attr) return not s_find(str, attr and "[^\1\9\10\13\20-~\128-\247]" or "[^\9\10\13\20-~\128-\247]"); end function module.command(_arg) if select(2, pctl.isrunning()) then pctl.show_warning("Stop Prosody before running this command"); return 1; end for hostname, host in pairs(prosody.hosts) do if hostname ~= "*" then if host.users.name == "null" then storagemanager.initialize_host(hostname); usermanager.initialize_host(hostname); end local fixes = 0; for username in host.users.users() do local roster = rostermanager.load_roster(username, hostname); local changed = false; for contact, item in pairs(roster) do if contact ~= false then if item.name and not valid_xml_cdata(item.name, false) then item.name = item.name:gsub("[^\9\10\13\20-~\128-\247]", "�"); fixes = fixes + 1; changed = true; end local clean_groups = {}; for group in pairs(item.groups) do if valid_xml_cdata(group, false) then clean_groups[group] = true; else clean_groups[group:gsub("[^\9\10\13\20-~\128-\247]", "�")] = true; fixes = fixes + 1; changed = true; end end item.groups = clean_groups; else -- pending entries etc end end if changed then assert(rostermanager.save_roster(username, hostname, roster)); end end pctl.show_message("Fixed %d items on host %s", fixes, hostname); end end return 0; end
