annotate mod_rest/example/rest.sh @ 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 a9c75430cb26
children 887ed0f6e275
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5281
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
1 #!/bin/bash -eu
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
2
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
3 # Copyright (c) Kim Alvefur
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
4 # This file is MIT/X11 licensed.
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
5
5329
107d60c70c1a mod_rest/rest.sh: List dependencies in comment
Kim Alvefur <zash@zash.se>
parents: 5281
diff changeset
6 # Dependencies:
107d60c70c1a mod_rest/rest.sh: List dependencies in comment
Kim Alvefur <zash@zash.se>
parents: 5281
diff changeset
7 # - https://httpie.io/
5636
b3484a112300 mod_rest/rest.sh: Update to use httpie-oauth2 plugin
Kim Alvefur <zash@zash.se>
parents: 5432
diff changeset
8 # - https://hg.sr.ht/~zash/httpie-oauth2
5329
107d60c70c1a mod_rest/rest.sh: List dependencies in comment
Kim Alvefur <zash@zash.se>
parents: 5281
diff changeset
9
5637
acd2f397ce6b mod_rest/rest.sh: Silence shellcheck SC1091
Kim Alvefur <zash@zash.se>
parents: 5636
diff changeset
10 # shellcheck disable=SC1091
acd2f397ce6b mod_rest/rest.sh: Silence shellcheck SC1091
Kim Alvefur <zash@zash.se>
parents: 5636
diff changeset
11
5936
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
12 SELF="${0##*/}"
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
13 function usage() {
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
14 echo "${SELF} [-h HOST] [-rw] [/path] kind=(message|presence|iq) ...."
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
15 # Last arguments are handed to HTTPie, so refer to its docs for further details
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
16 }
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
17
5281
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
18 # Settings
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
19 HOST=""
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
20 DOMAIN=""
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
21
5666
e5ad3f1f48bd mod_rest/rest.sh: Restore default read-only behavior and the -rw flag
Kim Alvefur <zash@zash.se>
parents: 5637
diff changeset
22 SESSION="session-read-only"
e5ad3f1f48bd mod_rest/rest.sh: Restore default read-only behavior and the -rw flag
Kim Alvefur <zash@zash.se>
parents: 5637
diff changeset
23
5281
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
24 if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/restrc" ]; then
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
25 # Config file can contain the above settings
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
26 source "${XDG_CONFIG_HOME:-$HOME/.config}/restrc"
5636
b3484a112300 mod_rest/rest.sh: Update to use httpie-oauth2 plugin
Kim Alvefur <zash@zash.se>
parents: 5432
diff changeset
27
b3484a112300 mod_rest/rest.sh: Update to use httpie-oauth2 plugin
Kim Alvefur <zash@zash.se>
parents: 5432
diff changeset
28 if [ -z "${SCOPE:-}" ]; then
b3484a112300 mod_rest/rest.sh: Update to use httpie-oauth2 plugin
Kim Alvefur <zash@zash.se>
parents: 5432
diff changeset
29 SCOPE="openid xmpp"
b3484a112300 mod_rest/rest.sh: Update to use httpie-oauth2 plugin
Kim Alvefur <zash@zash.se>
parents: 5432
diff changeset
30 fi
5281
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
31 fi
5432
1c52efb6fd42 mod_rest/rest.sh: Trim trailing whitespace
Kim Alvefur <zash@zash.se>
parents: 5431
diff changeset
32
5281
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
33 if [[ $# == 0 ]]; then
5936
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
34 usage
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
35 exit 1
5281
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
36 fi
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
37
5936
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
38 while getopts 'r:h:' flag; do
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
39 case "$flag" in
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
40 r)
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
41 case "$OPTARG" in
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
42 o)
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
43 # Default
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
44 SESSION="session-read-only"
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
45 ;;
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
46 w)
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
47 # To e.g. save Accept headers to the session
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
48 SESSION="session"
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
49 ;;
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
50 *)
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
51 echo "E: -ro OR -rw" >&2
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
52 exit 1
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
53 ;;
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
54 esac
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
55 ;;
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
56 h)
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
57 HOST="$OPTARG"
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
58 ;;
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
59 *)
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
60 echo "E: Unknown flag '$flag'" >&2
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
61 usage >&2
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
62 exit 1
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
63 esac
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
64 done
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
65 shift $((OPTIND-1))
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
66
a9c75430cb26 mod_rest: use bash getopts to handle cli flags in example script
Kim Alvefur <zash@zash.se>
parents: 5666
diff changeset
67 if [ -z "${HOST:-}" ]; then
5281
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
68 HOST="$(hostname)"
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
69 fi
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
70
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
71 if [[ "$HOST" != *.* ]]; then
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
72 # Assumes subdomain of your DOMAIN
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
73 if [ -z "${DOMAIN:-}" ]; then
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
74 DOMAIN="$(hostname -d)"
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
75 fi
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
76 if [[ "$HOST" == *:* ]]; then
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
77 HOST="${HOST%:*}.$DOMAIN:${HOST#*:}"
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
78 else
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
79 HOST="$HOST.$DOMAIN"
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
80 fi
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
81 fi
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
82
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
83
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
84 # For e.g /disco/example.com and such GET queries
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
85 GET_PATH=""
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
86 if [[ "$1" == /* ]]; then
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
87 GET_PATH="$1"
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
88 shift 1
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
89 fi
4ed65a6c2a6a mod_rest: Add an example bash script for using mod_rest
Kim Alvefur <zash@zash.se>
parents:
diff changeset
90
5666
e5ad3f1f48bd mod_rest/rest.sh: Restore default read-only behavior and the -rw flag
Kim Alvefur <zash@zash.se>
parents: 5637
diff changeset
91 https --check-status -p b --"$SESSION" rest -A oauth2 -a "$HOST" --oauth2-scope "$SCOPE" "$HOST/rest$GET_PATH" "$@"