Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00
Code Releases Activity

Fix regression: list SASL EXTERNAL mechanism for inbound s2s

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2018-07-10 10:14:08 +03:00
parent 3a566e3cdf
commit d03432a956
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rebar.config
View File

@ -25,7 +25,7 @@
{fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.23"}}}, {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.23"}}},
{stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.12"}}}, {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.12"}}},
{fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.32"}}}, {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"}}}, {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.15"}}},
{jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}}, {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
{p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.3"}}}, {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.3"}}},

9
src/ejabberd_s2s_in.erl
View File

@ -30,8 +30,7 @@
%% xmpp_stream_in callbacks %% xmpp_stream_in callbacks
-export([init/1, handle_call/3, handle_cast/2, -export([init/1, handle_call/3, handle_cast/2,
handle_info/2, terminate/2, code_change/3]). handle_info/2, terminate/2, code_change/3]).
-export([tls_options/1, tls_required/1, tls_enabled/1, -export([tls_options/1, tls_required/1, tls_enabled/1, compress_methods/1,
compress_methods/1, sasl_mechanisms/2,
unauthenticated_stream_features/1, authenticated_stream_features/1, unauthenticated_stream_features/1, authenticated_stream_features/1,
handle_stream_start/2, handle_stream_end/2, handle_stream_start/2, handle_stream_end/2,
handle_stream_established/1, handle_auth_success/4, handle_stream_established/1, handle_auth_success/4,
@ -147,12 +146,6 @@ tls_required(#{server_host := LServer}) ->
tls_enabled(#{server_host := LServer}) -> tls_enabled(#{server_host := LServer}) ->
ejabberd_s2s:tls_enabled(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}) -> compress_methods(#{server_host := LServer}) ->
case ejabberd_s2s:zlib_enabled(LServer) of case ejabberd_s2s:zlib_enabled(LServer) of
true -> [<<"zlib">>]; true -> [<<"zlib">>];