aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-12-06 22:04:43 +0100
committerKim Alvefur <zash@zash.se>2020-12-06 22:04:43 +0100
commit2048a7a762e619974557c4015429626443835b4c (patch)
tree5a2d4af3562b76f93e92ecbbea1f0be8a724649d /plugins
parentb0c116f47b96bb5d9be4646d1031cc6606a81405 (diff)
downloadprosody-2048a7a762e619974557c4015429626443835b4c.tar.gz
prosody-2048a7a762e619974557c4015429626443835b4c.zip
mod_saslauth: Advertise channel bindings via XEP-0440
This is useful when there's more than one channel binding in circulation, since perhaps there will be varying support for them.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_saslauth.lua10
1 files changed, 10 insertions, 0 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 649f9ba6..0b350c74 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -258,6 +258,7 @@ module:hook("stream-features", function(event)
end
local sasl_handler = usermanager_get_sasl_handler(module.host, origin)
origin.sasl_handler = sasl_handler;
+ local channel_bindings = set.new()
if origin.encrypted then
-- check whether LuaSec has the nifty binding to the function needed for tls-unique
-- FIXME: would be nice to have this check only once and not for every socket
@@ -268,6 +269,7 @@ module:hook("stream-features", function(event)
elseif origin.conn.ssl_peerfinished and origin.conn:ssl_peerfinished() then
log("debug", "Channel binding 'tls-unique' supported");
sasl_handler:add_cb_handler("tls-unique", tls_unique);
+ channel_bindings:add("tls-unique");
else
log("debug", "Channel binding 'tls-unique' not supported (by LuaSec?)");
end
@@ -304,6 +306,14 @@ module:hook("stream-features", function(event)
for mechanism in usable_mechanisms do
mechanisms:tag("mechanism"):text(mechanism):up();
end
+ if not channel_bindings:empty() then
+ -- XXX XEP-0440 is Experimental
+ mechanisms:tag("sasl-channel-binding", {xmlns='urn:xmpp:sasl-cb:0'})
+ for channel_binding in channel_bindings do
+ mechanisms:tag("channel-binding", {type=channel_binding}):up()
+ end
+ mechanisms:up();
+ end
features:add_child(mechanisms);
return;
end