Fix regression: list SASL EXTERNAL mechanism for inbound s2s

diff --git a/rebar.config b/rebar.config
index 7c77b65616c18be32254eea678298e2fb168aefe..df49ede739b8b45184c39d72cc833404eba86444 100644 (file)
--- a/rebar.config
+++ b/rebar.config
@@ -25,7 +25,7 @@
         {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.23"}}},
         {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.12"}}},
         {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.32"}}},
-        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "64fbddd"}},
+        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "c98ee04"}},
         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.15"}}},
         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
         {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.3"}}},

diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index 20106ab6f40cb0b313a67786c90b1cd5bbd5224f..8a681bbbc979c862beb67b6277ab01fdbf06dbf1 100644 (file)
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -30,8 +30,7 @@
 %% xmpp_stream_in callbacks
 -export([init/1, handle_call/3, handle_cast/2,
         handle_info/2, terminate/2, code_change/3]).
--export([tls_options/1, tls_required/1, tls_enabled/1,
-        compress_methods/1, sasl_mechanisms/2,
+-export([tls_options/1, tls_required/1, tls_enabled/1, compress_methods/1,
         unauthenticated_stream_features/1, authenticated_stream_features/1,
         handle_stream_start/2, handle_stream_end/2,
         handle_stream_established/1, handle_auth_success/4,
@@ -147,12 +146,6 @@ tls_required(#{server_host := LServer}) ->
 tls_enabled(#{server_host := LServer}) ->
     ejabberd_s2s:tls_enabled(LServer).
 
-sasl_mechanisms(Mechs, #{server_host := LServer}) ->
-    lists:filter(
-      fun(<<"EXTERNAL">>) -> ejabberd_s2s:tls_verify(LServer);
-        (_) -> false
-      end, Mechs).
-
 compress_methods(#{server_host := LServer}) ->
     case ejabberd_s2s:zlib_enabled(LServer) of
        true -> [<<"zlib">>];