mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 14:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_saslauth: Break out tls-unique channel binding callback so it is instantiated once

Browse source
This commit is contained in:
Kim Alvefur 2014-11-19 14:44:41 +01:00
parent b47d9adc40
commit 2ab66e784a
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/mod_saslauth.lua
View file

@ -214,6 +214,10 @@ module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:abort", function(event)
return true; return true;
end); end);
local function tls_unique(self)
return self.userdata:getpeerfinished();
end
local mechanisms_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-sasl' }; local mechanisms_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-sasl' };
local bind_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-bind' }; local bind_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-bind' };
local xmpp_session_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-session' }; local xmpp_session_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-session' };
@ -228,11 +232,12 @@ module:hook("stream-features", function(event)
if origin.encrypted then if origin.encrypted then
-- check wether LuaSec has the nifty binding to the function needed for tls-unique -- check wether 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 -- FIXME: would be nice to have this check only once and not for every socket
if origin.conn:socket().getpeerfinished and sasl_handler.add_cb_handler then if sasl_handler.add_cb_handler then
sasl_handler:add_cb_handler("tls-unique", function(self) local socket = origin.conn:socket();
return self.userdata:getpeerfinished(); if socket.getpeerfinished then
end); sasl_handler:add_cb_handler("tls-unique", tls_unique);
sasl_handler["userdata"] = origin.conn:socket(); end
sasl_handler["userdata"] = socket;
end end
end end
local mechanisms = st.stanza("mechanisms", mechanisms_attr); local mechanisms = st.stanza("mechanisms", mechanisms_attr);