Annotate

misc/lnav/prosody.json @ 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 5994:1bb8b559f441
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4880
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
1 {
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
2 "$schema" : "https://lnav.org/schemas/format-v1.schema.json",
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
3 "prosody_log" : {
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
4 "body-field" : "message",
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
5 "description" : "The Prosody IM server log format",
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
6 "level" : {
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
7 "debug" : "^debug$",
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
8 "error" : "^error$",
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
9 "info" : "^info$",
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
10 "warning" : "^warn$"
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
11 },
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
12 "level-field" : "loglevel",
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
13 "multiline" : false,
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
14 "ordered-by-time" : true,
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
15 "regex" : {
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
16 "standard" : {
5497
1be6e375a7c2 misc/lnav: Fix delimiting of timestamp in pattern
Kim Alvefur <zash@zash.se>
parents: 5496
diff changeset
17 "pattern" : "^(?<timestamp>\\w{3} \\d{2} \\d{2}:\\d{2}:\\d{2}\\s+)(?<loggername>\\S+)\\s+(?<loglevel>debug|info|warn|error)\\s+(?<message>.+)$"
4880
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
18 }
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
19 },
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
20 "sample" : [
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
21 {
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
22 "line" : "Jan 31 11:07:34 c2s565063fff480\tinfo\tClient connected"
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
23 }
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
24 ],
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
25 "timestamp-field" : "timestamp",
5496
3e6d1e248dc1 misc/lnav: Fix timestamp-format to be an array as per schema
Kim Alvefur <zash@zash.se>
parents: 4880
diff changeset
26 "timestamp-format" : [
3e6d1e248dc1 misc/lnav: Fix timestamp-format to be an array as per schema
Kim Alvefur <zash@zash.se>
parents: 4880
diff changeset
27 "%b %d %H:%M:%S "
3e6d1e248dc1 misc/lnav: Fix timestamp-format to be an array as per schema
Kim Alvefur <zash@zash.se>
parents: 4880
diff changeset
28 ],
4880
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
29 "title" : "Prosody log",
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
30 "url" : "https://prosody.im/doc/logging",
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
31 "value" : {
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
32 "loggername" : {
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
33 "identifier" : true,
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
34 "kind" : "string"
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
35 },
5994
1bb8b559f441 misc/lnav: Fix invalid value warning
Kim Alvefur <zash@zash.se>
parents: 5497
diff changeset
36 "message" : {
4880
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
37 "kind" : "xml"
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
38 }
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
39 }
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
40 }
f64d13d9b76b misc/lnav: Attempt at log format description for lnav
Kim Alvefur <zash@zash.se>
parents:
diff changeset
41 }