Mercurial > prosody-modules
annotate mod_measure_client_features/mod_measure_client_features.lua @ 6319:04c3273cb81f
mod_auth_cyrus: Add empty 'profile' table to SASL handler objects
This is for compatibility with Prosody's built-in util.sasl objects.
A SASL profile table usually includes methods supported by the backend, which
can be used by SASL mechanism handlers to perform operations (such as testing
the password). It also optionally contains a 'cb' field with channel binding
method handlers.
The Cyrus backend doesn't support channel binding, and doesn't have the same
concept of auth backend methods (it handles all that internally, and Prosody
has no insight or control over it).
Thus, we create an empty profile which informs Prosody that the SASL handler
does not support any of the auth or channel binding methods. Some features
will not work, but they didn't work anyway. This just makes it explicit.
This fixes a traceback in mod_sasl2_fast, which expected SASL handlers to
always contain a 'profile' field.
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 04 Sep 2025 10:14:46 +0100 |
| parents | 3e0bce07f66c |
| children |
| rev | line source |
|---|---|
|
3374
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
1 module:set_global(); |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
2 |
|
6160
3e0bce07f66c
mod_measure_client_features: Switch to the more modern statistics API
Link Mauve <linkmauve@linkmauve.fr>
parents:
3374
diff
changeset
|
3 local statsmanager = require "prosody.core.statsmanager"; |
|
3e0bce07f66c
mod_measure_client_features: Switch to the more modern statistics API
Link Mauve <linkmauve@linkmauve.fr>
parents:
3374
diff
changeset
|
4 |
|
3e0bce07f66c
mod_measure_client_features: Switch to the more modern statistics API
Link Mauve <linkmauve@linkmauve.fr>
parents:
3374
diff
changeset
|
5 local measure_features = module:metric("gauge", "features", "", "Features advertized by clients", {"feature"}); |
|
3374
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
6 |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
7 local disco_ns = "http://jabber.org/protocol/disco#info"; |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
8 |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
9 module:hook("stats-update", function () |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
10 local total = 0; |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
11 local buckets = {}; |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
12 for _, session in pairs(prosody.full_sessions) do |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
13 local disco_info = session.caps_cache; |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
14 if disco_info ~= nil then |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
15 for feature in disco_info:childtags("feature", disco_ns) do |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
16 local var = feature.attr.var; |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
17 if var ~= nil then |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
18 if buckets[var] == nil then |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
19 buckets[var] = 0; |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
20 end |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
21 buckets[var] = buckets[var] + 1; |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
22 end |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
23 end |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
24 total = total + 1; |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
25 end |
|
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
26 end |
|
6160
3e0bce07f66c
mod_measure_client_features: Switch to the more modern statistics API
Link Mauve <linkmauve@linkmauve.fr>
parents:
3374
diff
changeset
|
27 statsmanager.cork(); |
|
3e0bce07f66c
mod_measure_client_features: Switch to the more modern statistics API
Link Mauve <linkmauve@linkmauve.fr>
parents:
3374
diff
changeset
|
28 measure_features:clear(); |
|
3374
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
29 for bucket, count in pairs(buckets) do |
|
6160
3e0bce07f66c
mod_measure_client_features: Switch to the more modern statistics API
Link Mauve <linkmauve@linkmauve.fr>
parents:
3374
diff
changeset
|
30 measure_features:with_labels(bucket):add(count); |
|
3374
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
31 end |
|
6160
3e0bce07f66c
mod_measure_client_features: Switch to the more modern statistics API
Link Mauve <linkmauve@linkmauve.fr>
parents:
3374
diff
changeset
|
32 measure_features:with_labels("total"):add(total); |
|
3e0bce07f66c
mod_measure_client_features: Switch to the more modern statistics API
Link Mauve <linkmauve@linkmauve.fr>
parents:
3374
diff
changeset
|
33 statsmanager.uncork(); |
|
3374
5fdbf416bd40
mod_measure_client_features: Add a module to count the features of each connected client
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
diff
changeset
|
34 end) |
