Xeps/bind2 inlines

big_tests/tests/sasl2_SUITE.erl

@@ -28,7 +28,7 @@ groups() ->
      {basic, [parallel],
       [
        server_does_not_announce_if_not_tls,
-       server_announces_sasl2_with_some_mechanism,
+       server_announces_sasl2_with_some_mechanism_and_inline_sm,
        authenticate_stanza_has_invalid_mechanism,
        user_agent_is_invalid,
        user_agent_is_invalid_uuid_but_not_v4,
@@ -101,13 +101,16 @@ server_does_not_announce_if_not_tls(Config) ->
     Sasl2 = exml_query:path(Features, [{element_with_ns, <<"authentication">>, ?NS_SASL_2}]),
     ?assertEqual(undefined, Sasl2).
 
-server_announces_sasl2_with_some_mechanism(Config) ->
+server_announces_sasl2_with_some_mechanism_and_inline_sm(Config) ->
     Steps = [create_connect_tls, start_stream_get_features],
     #{features := Features} = sasl2_helper:apply_steps(Steps, Config),
     Sasl2 = exml_query:path(Features, [{element_with_ns, <<"authentication">>, ?NS_SASL_2}]),
     ?assertNotEqual(undefined, Sasl2),
     Mechs = exml_query:paths(Sasl2, [{element, <<"mechanism">>}]),
-    ?assertNotEqual([], Mechs).
+    ?assertNotEqual([], Mechs),
+    Sm = exml_query:path(Sasl2, [{element, <<"inline">>},
+                                 {element_with_ns, <<"sm">>, ?NS_STREAM_MGNT_3}]),
+    ?assertNotEqual(undefined, Sm).
 
 authenticate_stanza_has_invalid_mechanism(Config) ->
     Steps = [start_new_user, send_invalid_mech_auth_stanza],

src/stream_management/mod_stream_management_sasl2.erl

@@ -28,7 +28,7 @@
 -spec sasl2_stream_features(Acc, #{c2s_data := mongoose_c2s:data()}, gen_hook:extra()) ->
     {ok, Acc} when Acc :: [exml:element()].
 sasl2_stream_features(Acc, _, _) ->
-    Resume = #xmlel{name = <<"resume">>, attrs = [{<<"xmlns">>, ?NS_STREAM_MGNT_3}]},
+    Resume = #xmlel{name = <<"sm">>, attrs = [{<<"xmlns">>, ?NS_STREAM_MGNT_3}]},
     {ok, [Resume | Acc]}.
 
 -spec sasl2_start(SaslAcc, #{stanza := exml:element()}, gen_hook:extra()) ->
@@ -98,7 +98,7 @@
 handle_bind_enable(SaslAcc, #{c2s_data := C2SData}, Inline, El) ->
     case mod_stream_management:if_not_already_enabled_create_sm_state(C2SData) of
         error ->
             mod_stream_management:stream_error(SaslAcc, C2SData);
         SmState ->
             do_handle_bind_enable(SaslAcc, C2SData, SmState, Inline, El)
     end.
@@ -118,5 +118,5 @@
             SaslAcc2 = mod_bind2:append_inline_bound_answer(SaslAcc1, Inline, Stanza),
             {ok, SaslAcc2};
         _ ->
             mod_stream_management:stream_error(SaslAcc, C2SData)
     end.