Skip to content

Commit

Permalink
mod_dialback: reflect previous changes.
Browse files Browse the repository at this point in the history
We shall not rely on cert_identity_status as it might not be set anymore now
  • Loading branch information
maranda committed Jul 2, 2018
1 parent a9a8e3e commit 5a4f819
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions plugins/mod_dialback.lua
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,7 @@ module:hook("stanza/"..xmlns_db..":result", function(event)

-- Implement Dialback without Dialback (See XEP-0344) shortcircuiting
local shortcircuit;
if origin.cert_identity_status == "valid" and from == origin.from_host then
shortcircuit = true;
elseif from ~= origin.from_host and verify_identity(origin, from) then
shortcircuit = true;
end
if verify_identity(origin, from) then shortcircuit = true; end

if shortcircuit then
origin.log("debug", "shortcircuiting %s dialback request, as it presented a valid certificate", from);
Expand Down

0 comments on commit 5a4f819

Please # to comment.