Annotate

mod_discodot/mod_discodot.lua @ 6110:1a6cd0bbb7ab

mod_compliance_2023: Add 2023 Version of the compliance module, basis is the 2021 Version. diff --git a/mod_compliance_2023/README.md b/mod_compliance_2023/README.md new file mode 100644 --- /dev/null +++ b/mod_compliance_2023/README.md @@ -0,0 +1,22 @@ +--- +summary: XMPP Compliance Suites 2023 self-test +labels: +- Stage-Beta +rockspec: + dependencies: + - mod_cloud_notify + +... + +Compare the list of enabled modules with +[XEP-0479: XMPP Compliance Suites 2023] and produce basic report to the +Prosody log file. + +If installed with the Prosody plugin installer then all modules needed for a green checkmark should be included. (With prosody 0.12 only [mod_cloud_notify] is not included with prosody and we need the community module) + +# Compatibility + + Prosody-Version Status + --------------- ---------------------- + trunk Works as of 2024-12-21 + 0.12 Works diff --git a/mod_compliance_2023/mod_compliance_2023.lua b/mod_compliance_2023/mod_compliance_2023.lua new file mode 100644 --- /dev/null +++ b/mod_compliance_2023/mod_compliance_2023.lua @@ -0,0 +1,79 @@ +-- Copyright (c) 2021 Kim Alvefur +-- +-- This module is MIT licensed. + +local hostmanager = require "core.hostmanager"; + +local array = require "util.array"; +local set = require "util.set"; + +local modules_enabled = module:get_option_inherited_set("modules_enabled"); + +for host in pairs(hostmanager.get_children(module.host)) do + local component = module:context(host):get_option_string("component_module"); + if component then + modules_enabled:add(component); + modules_enabled:include(module:context(host):get_option_set("modules_enabled", {})); + end +end + +local function check(suggested, alternate, ...) + if set.intersection(modules_enabled, set.new({suggested; alternate; ...})):empty() then return suggested; end + return false; +end + +local compliance = { + array {"Server"; check("tls"); check("disco")}; + + array {"Advanced Server"; check("pep", "pep_simple")}; + + array {"Web"; check("bosh"); check("websocket")}; + + -- No Server requirements for Advanced Web + + array {"IM"; check("vcard_legacy", "vcard"); check("carbons"); check("http_file_share", "http_upload")}; + + array { + "Advanced IM"; + check("vcard_legacy", "vcard"); + check("blocklist"); + check("muc"); + check("private"); + check("smacks"); + check("mam"); + check("bookmarks"); + }; + + array {"Mobile"; check("smacks"); check("csi_simple", "csi_battery_saver")}; + + array {"Advanced Mobile"; check("cloud_notify")}; + + array {"A/V Calling"; check("turn_external", "external_services", "turncredentials", "extdisco")}; + +}; + +function check_compliance() + local compliant = true; + for _, suite in ipairs(compliance) do + local section = suite:pop(1); + if module:get_option_boolean("compliance_" .. section:lower():gsub("%A", "_"), true) then + local missing = set.new(suite:filter(function(m) return type(m) == "string" end):map(function(m) return "mod_" .. m end)); + if suite[1] then + if compliant then + compliant = false; + module:log("warn", "Missing some modules for XMPP Compliance 2023"); + end + module:log("info", "%s Compliance: %s", section, missing); + end + end + end + + if compliant then module:log("info", "XMPP Compliance 2023: Compliant ✔️"); end +end + +if prosody.start_time then + check_compliance() +else + module:hook_global("server-started", check_compliance); +end +
author Menel <menel@snikket.de>
date Sun, 22 Dec 2024 16:06:28 +0100
parent 4577:253df0798996
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4577
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
1 local cm = require("core.configmanager");
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
2
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
3 local function format_host(host, conf)
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
4 if host == "*" then
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
5 return "Global"
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
6 end
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
7 local component_module = conf["component_module"];
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
8 if type(component_module) == "string" then
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
9 if component_module == "component" then
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
10 return string.format("Component %q", host)
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
11 else
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
12 return string.format("Component %q %q", host, component_module)
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
13 end
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
14 else
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
15 return string.format("VirtualHost %q", host)
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
16 end
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
17 end
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
18
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
19 function module.command(arg)
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
20
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
21 local config = cm.getconfig();
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
22
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
23 print("digraph \"prosody\" {")
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
24 for host, conf in pairs(config) do
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
25 print(string.format("%q [label=%q]", host, format_host(host, conf)));
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
26 local parent = host:match("%.(.*)");
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
27 if parent and rawget(config, parent) then
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
28 print(string.format("%q -> %q", parent, host));
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
29 end
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
30 local disco_items = conf["disco_items"]
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
31 if type(disco_items) == "table" then
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
32 for _, pair in ipairs(disco_items) do
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
33 print(string.format("%q -> %q", host, pair[1]));
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
34 end
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
35 end
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
36
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
37 end
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
38
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
39 print("}")
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
40
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
41 return 0
253df0798996 mod_discodot: Print a graph of service discovery
Kim Alvefur <zash@zash.se>
parents:
diff changeset
42 end