annotate mod_http_user_count/mod_http_user_count.lua @ 6082: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
parents a45f2f79e99b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1263
fe29627a5ed8 mod_http_user_count: HTTP module to report the current number of online users or sessions
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
1 local it = require "util.iterators";
1830
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
2 local jid_split = require "util.jid".prepped_split;
1263
fe29627a5ed8 mod_http_user_count: HTTP module to report the current number of online users or sessions
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
3
fe29627a5ed8 mod_http_user_count: HTTP module to report the current number of online users or sessions
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
4 module:depends("http");
fe29627a5ed8 mod_http_user_count: HTTP module to report the current number of online users or sessions
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
5
1830
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
6 local function check_muc(jid)
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
7 local room_name, host = jid_split(jid);
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
8 if not hosts[host] then
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
9 return nil, "No such host: "..host;
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
10 elseif not hosts[host].modules.muc then
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
11 return nil, "Host '"..host.."' is not a MUC service";
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
12 end
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
13 return room_name, host;
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
14 end
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
15
1263
fe29627a5ed8 mod_http_user_count: HTTP module to report the current number of online users or sessions
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
16 module:provides("http", {
fe29627a5ed8 mod_http_user_count: HTTP module to report the current number of online users or sessions
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
17 route = {
fe29627a5ed8 mod_http_user_count: HTTP module to report the current number of online users or sessions
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
18 ["GET /sessions"] = function () return tostring(it.count(it.keys(prosody.full_sessions))); end;
fe29627a5ed8 mod_http_user_count: HTTP module to report the current number of online users or sessions
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
19 ["GET /users"] = function () return tostring(it.count(it.keys(prosody.bare_sessions))); end;
1830
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
20 ["GET /host"] = function () return tostring(it.count(it.keys(prosody.hosts[module.host].sessions))); end;
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
21 ["GET /room/*"] = function (request, room_jid)
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
22 local name, host = check_muc(room_jid);
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
23 if not name then
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
24 return "0";
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
25 end
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
26 local room = prosody.hosts[host].modules.muc.rooms[name.."@"..host];
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
27 if not room then
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
28 return "0";
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
29 end
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
30 return tostring(it.count(it.keys(room._occupants)));
a45f2f79e99b mod_http_user_count: Support for host and MUC session counts
Matthew Wild <mwild1@gmail.com>
parents: 1263
diff changeset
31 end;
1263
fe29627a5ed8 mod_http_user_count: HTTP module to report the current number of online users or sessions
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
32 };
fe29627a5ed8 mod_http_user_count: HTTP module to report the current number of online users or sessions
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
33 });