mod_s2s: Make sure host variable is reachable

[prosody.git] / plugins / mod_s2s / mod_s2s.lua

diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 15c89ceddface713754e7a0761e74301e2831b03..7401445758361ddd1160746786816dfda5b2eb0f 100644 (file)
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -136,6 +136,7 @@ end
 
 --- Helper to check that a session peer's certificate is valid
 local function check_cert_status(session)
+       local host = session.direction == "incoming" and session.from_host or session.to_host
        local conn = session.conn:socket()
        local cert
        if conn.getpeercertificate then
@@ -155,8 +156,6 @@ local function check_cert_status(session)
                        (session.log or log)("debug", "certificate chain validation result: valid");
                        session.cert_chain_status = "valid";
 
-                       local host = session.direction == "incoming" and session.from_host or session.to_host
-
                        -- We'll go ahead and verify the asserted identity if the
                        -- connecting server specified one.
                        if host then
@@ -168,6 +167,7 @@ local function check_cert_status(session)
                        end
                end
        end
+       module:fire_event("s2s-check-certificate", { host = host, session = session, cert = cert });
 end
 
 --- XMPP stream event handlers
@@ -287,7 +287,7 @@ function stream_callbacks.streamopened(session, attr)
                -- If server is pre-1.0, don't wait for features, just do dialback
                if session.version < 1.0 then
                        if not session.dialback_verifying then
-                               hosts[session.from_host].events.fire_event("s2s-authenticate-legacy", { origin = session });
+                               hosts[session.from_host].events.fire_event("s2sout-authenticate-legacy", { origin = session });
                        else
                                s2s_mark_connected(session);
                        end