Xeps/extensible sasl #4102

NelsonVides · 2023-08-15T18:17:46Z

This PR introduces mod_sasl2, which of all points stated in the XEP-0388, for now only provides with improvements over the number of round-trips and the removal of the redundant stream restart. It also introduces stream-management session resumption within the inline features of SASL2. So it at least already introduces a faster session establishment, that is, 6 round-trips in the usual way vs only 2 round-trips now.

Uses #4101, so it merges on top of it.

codecov · 2023-08-15T20:19:22Z

Codecov Report

Patch coverage: 95.63% and project coverage change: +0.09% 🎉

Comparison is base (abb89da) 83.91% compared to head (b45636c) 84.01%.
Report is 1 commits behind head on feature/sasl2.

Additional details and impacted files

@@                Coverage Diff                @@
##           feature/sasl2    #4102      +/-   ##
=================================================
+ Coverage          83.91%   84.01%   +0.09%     
=================================================
  Files                552      553       +1     
  Lines              33642    33818     +176     
=================================================
+ Hits               28232    28411     +179     
+ Misses              5410     5407       -3

Files Changed	Coverage Δ
src/c2s/mongoose_c2s_acc.erl	`83.33% <50.00%> (-1.45%)`	⬇️
src/stream_management/mod_stream_management.erl	`91.06% <94.87%> (+1.36%)`	⬆️
src/mod_sasl2.erl	`96.05% <96.05%> (ø)`
src/c2s/mongoose_c2s.erl	`87.63% <100.00%> (+0.48%)`	⬆️
src/c2s/mongoose_c2s_stanzas.erl	`100.00% <100.00%> (+3.63%)`	⬆️
src/hooks/mongoose_hooks.erl	`95.03% <100.00%> (+0.11%)`	⬆️

... and 8 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Note that 'handle_resume' now returns the values that has changed in a map on its own, instead of actually modifying the data or the accumulator, because it will be called from two places which have slightly different semantics, so we let the caller prepare the final return value instead.

mongoose-im · 2023-08-30T10:48:21Z

elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 2ec78f1
Reports root/ big
OK: 369 / Failed: 0 / User-skipped: 38 / Auto-skipped: 0

small_tests_24 / small_tests / 2ec78f1
Reports root / small

small_tests_25 / small_tests / 2ec78f1
Reports root / small

small_tests_25_arm64 / small_tests / 2ec78f1
Reports root / small

ldap_mnesia_25 / ldap_mnesia / 2ec78f1
Reports root/ big
OK: 2287 / Failed: 0 / User-skipped: 835 / Auto-skipped: 0

dynamic_domains_mysql_redis_25 / mysql_redis / 2ec78f1
Reports root/ big
OK: 4218 / Failed: 0 / User-skipped: 116 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 2ec78f1
Reports root/ big
OK: 4250 / Failed: 0 / User-skipped: 84 / Auto-skipped: 0

ldap_mnesia_24 / ldap_mnesia / 2ec78f1
Reports root/ big
OK: 2287 / Failed: 0 / User-skipped: 835 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 2ec78f1
Reports root/ big
OK: 4250 / Failed: 0 / User-skipped: 84 / Auto-skipped: 0

internal_mnesia_25 / internal_mnesia / 2ec78f1
Reports root/ big
OK: 2437 / Failed: 0 / User-skipped: 685 / Auto-skipped: 0

mysql_redis_25 / mysql_redis / 2ec78f1
Reports root/ big
OK: 4618 / Failed: 1 / User-skipped: 111 / Auto-skipped: 0

carboncopy_SUITE:one2one:dropped_client_doesnt_create_duplicate_carbons

{error,
  {{badmatch,
     [{xmlel,<<"message">>,
        [{<<"from">>,
        <<"alice_dropped_client_doesnt_create_duplicate_carbons_564@localhost">>},
         {<<"to">>,
        <<"alice_dropped_client_doesnt_create_duplicate_carbons_564@localhost/res2">>},
         {<<"xmlns">>,<<"jabber:client">>},
         {<<"type">>,<<"chat">>}],
        [{xmlel,<<"sent">>,
           [{<<"xmlns">>,<<"urn:xmpp:carbons:2">>}],
           [{xmlel,<<"forwarded">>,
            [{<<"xmlns">>,<<"urn:xmpp:forward:0">>}],
            [{xmlel,<<"message">>,
               [{<<"from">>,
                 <<"alice_dropped_client_doesnt_create_duplicate_carbons_564@localhost/res1">>},
                {<<"to">>,
                 <<"bob_dropped_client_doesnt_create_duplicate_carbons_564@localhost/res1">>},
                {<<"type">>,<<"chat">>},
                {<<"xmlns">>,<<"jabber:client">>}],
               [{xmlel,<<"body">>,[],
                  [{xmlcdata,
                     <<"And pious action">>}]}]}]}]}]}]},
   [{carboncopy_SUITE,
      '-dropped_client_doesnt_create_duplicate_carbons/1-fun-0-',4,
      [{file,
         "/home/circleci/project/big_tests/tests/carboncopy_SUITE.erl"},
       {line,189}]},
    {escalus_story,story,4,
      [{file,
         "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,72}]},
    {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
    {test_server,run_test_case_eval1,6,
      [{file,"test_serv...

Report log

pgsql_cets_25 / pgsql_cets / 2ec78f1
Reports root/ big
OK: 4609 / Failed: 0 / User-skipped: 121 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 2ec78f1
Reports root/ big
OK: 4639 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 2ec78f1
Reports root/ big
OK: 4246 / Failed: 1 / User-skipped: 87 / Auto-skipped: 0

connect_SUITE:fast_tls:feature_order:cannot_connect_with_proxy_header

{error,
  {thrown,
    {{timeout,stream_end},
     [{escalus_connection,get_stream_end,2,
        [{file,
           "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_connection.erl"},
         {line,370}]},
      {escalus_connection,end_stream,1,
        [{file,
           "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_connection.erl"},
         {line,508}]},
      {escalus_connection,stop,1,
        [{file,
           "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_connection.erl"},
         {line,408}]},
      {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
      {test_server,run_test_case_eval1,6,
        [{file,"test_server.erl"},{line,1291}]},
      {test_server,run_test_case_eval,9,
        [{file,"test_server.erl"},{line,1223}]}]}}}

Report log

pgsql_mnesia_25 / pgsql_mnesia / 2ec78f1
Reports root/ big
OK: 4639 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0

mssql_mnesia_25 / odbc_mssql_mnesia / 2ec78f1
Reports root/ big
OK: 4636 / Failed: 0 / User-skipped: 94 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 2ec78f1
Reports root/ big
OK: 4247 / Failed: 0 / User-skipped: 87 / Auto-skipped: 0

mysql_redis_25 / mysql_redis / 2ec78f1
Reports root/ big
OK: 4619 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0

chrzaszcz

It looks good in general, I like the usage of hooks. I added some minor comments.

big_tests/tests/sasl2_helper.erl

doc/modules/mod_sasl2.md

src/c2s/mongoose_c2s_acc.erl

src/mod_sasl2.erl

mongoose-im · 2023-09-01T12:03:16Z

elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / b45636c
Reports root/ big
OK: 369 / Failed: 0 / User-skipped: 38 / Auto-skipped: 0

small_tests_24 / small_tests / b45636c
Reports root / small

small_tests_25_arm64 / small_tests / b45636c
Reports root / small

small_tests_25 / small_tests / b45636c
Reports root / small

ldap_mnesia_25 / ldap_mnesia / b45636c
Reports root/ big
OK: 2287 / Failed: 0 / User-skipped: 835 / Auto-skipped: 0

dynamic_domains_mysql_redis_25 / mysql_redis / b45636c
Reports root/ big
OK: 4218 / Failed: 0 / User-skipped: 116 / Auto-skipped: 0

ldap_mnesia_24 / ldap_mnesia / b45636c
Reports root/ big
OK: 2287 / Failed: 0 / User-skipped: 835 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / b45636c
Reports root/ big
OK: 4250 / Failed: 0 / User-skipped: 84 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / b45636c
Reports root/ big
OK: 4247 / Failed: 0 / User-skipped: 87 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / b45636c
Reports root/ big
OK: 4250 / Failed: 0 / User-skipped: 84 / Auto-skipped: 0

pgsql_cets_25 / pgsql_cets / b45636c
Reports root/ big
OK: 4609 / Failed: 0 / User-skipped: 121 / Auto-skipped: 0

mysql_redis_25 / mysql_redis / b45636c
Reports root/ big
OK: 4618 / Failed: 1 / User-skipped: 111 / Auto-skipped: 0

carboncopy_SUITE:one2one:unavailable_resources_dont_get_carbons

{error,
  {{assertion_failed,assert_many,true,
     [is_presence,is_presence],
     [{xmlel,<<"message">>,
        [{<<"from">>,
        <<"alice_unavailable_resources_dont_get_carbons_566@localhost">>},
         {<<"to">>,
        <<"alice_unavailable_resources_dont_get_carbons_566@localhost/res1">>},
         {<<"xmlns">>,<<"jabber:client">>},
         {<<"type">>,<<"chat">>}],
        [{xmlel,<<"received">>,
           [{<<"xmlns">>,<<"urn:xmpp:carbons:2">>}],
           [{xmlel,<<"forwarded">>,
            [{<<"xmlns">>,<<"urn:xmpp:forward:0">>}],
            [{xmlel,<<"message">>,
               [{<<"from">>,
                 <<"bob_unavailable_resources_dont_get_carbons_566@localhost/res1">>},
                {<<"to">>,
                 <<"alice_unavailable_resources_dont_get_carbons_566@localhost/res2">>},
                {<<"type">>,<<"chat">>},
                {<<"xmlns">>,<<"jabber:client">>}],
               [{xmlel,<<"body">>,[],
                  [{xmlcdata,<<"And pious action">>}]}]}]}]}]},
      {xmlel,<<"presence">>,
        [{<<"from">>,
        <<"alice_unavailable_resources_dont_get_carbons_566@localhost/res1">>},
         {<<"to">>,
        <<"alice_unavailable_resources_dont_get_carbons_566@localhost/res1">>}],
        []}],
     "   <message from='alice_unavailable_resources_dont_get_carbons_566@localhost' to='alice_unavailable_resources_dont_get_carbons_566@localhost/res1' xmlns='jabber:client' type='chat'><received xmlns='urn:xmpp:carbons:2'><forwarded...

Report log

internal_mnesia_25 / internal_mnesia / b45636c
Reports root/ big
OK: 2437 / Failed: 0 / User-skipped: 685 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / b45636c
Reports root/ big
OK: 4639 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0

pgsql_mnesia_25 / pgsql_mnesia / b45636c
Reports root/ big
OK: 4639 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0

mssql_mnesia_25 / odbc_mssql_mnesia / b45636c
Reports root/ big
OK: 4636 / Failed: 0 / User-skipped: 94 / Auto-skipped: 0

mysql_redis_25 / mysql_redis / b45636c
Reports root/ big
OK: 4619 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0

chrzaszcz

Looks good 👌
Thanks for the work, and for the corrections!

Neustradamus · 2023-09-22T22:05:10Z

@NelsonVides: Good job!

NelsonVides force-pushed the xeps/extensible_sasl branch 5 times, most recently from 3961800 to 213c87f Compare August 15, 2023 19:23

This comment was marked as outdated.

Sign in to view

NelsonVides force-pushed the xeps/extensible_sasl branch from 213c87f to a07be8f Compare August 17, 2023 08:25

This comment was marked as outdated.

Sign in to view

NelsonVides force-pushed the xeps/extensible_sasl branch from aa95cc8 to 2a9b0ec Compare August 17, 2023 20:41

This comment was marked as outdated.

Sign in to view

NelsonVides force-pushed the c2s/sasl branch from cf71561 to 7299e6d Compare August 21, 2023 07:20

NelsonVides force-pushed the xeps/extensible_sasl branch from 2a9b0ec to 73ee398 Compare August 21, 2023 07:20

This comment was marked as outdated.

Sign in to view

NelsonVides marked this pull request as ready for review August 21, 2023 07:57

NelsonVides force-pushed the c2s/sasl branch from 7299e6d to 421457f Compare August 23, 2023 17:54

NelsonVides force-pushed the xeps/extensible_sasl branch from 73ee398 to aadb65c Compare August 23, 2023 17:54

NelsonVides marked this pull request as draft August 23, 2023 19:50

NelsonVides force-pushed the xeps/extensible_sasl branch from aadb65c to 20c7b1d Compare August 23, 2023 19:56

This comment was marked as outdated.

Sign in to view

NelsonVides force-pushed the c2s/sasl branch from 421457f to abb89da Compare August 24, 2023 10:19

Simplify stream_header stanza builder

6107c08

NelsonVides force-pushed the xeps/extensible_sasl branch from 20c7b1d to 427909a Compare August 24, 2023 10:22

This comment was marked as outdated.

Sign in to view

Base automatically changed from c2s/sasl to feature/sasl2 August 24, 2023 11:40

NelsonVides force-pushed the xeps/extensible_sasl branch from 427909a to 73194c3 Compare August 25, 2023 09:43

This comment was marked as outdated.

Sign in to view

NelsonVides force-pushed the xeps/extensible_sasl branch 2 times, most recently from a43a4b1 to f79924f Compare August 25, 2023 10:03

NelsonVides force-pushed the xeps/extensible_sasl branch from 6392e9b to 6647141 Compare August 25, 2023 15:20

This comment was marked as outdated.

Sign in to view

NelsonVides force-pushed the xeps/extensible_sasl branch from 6647141 to 5f9c4a2 Compare August 25, 2023 16:28

This comment was marked as outdated.

Sign in to view

NelsonVides force-pushed the xeps/extensible_sasl branch from 5f9c4a2 to 14bde2d Compare August 26, 2023 15:40

This comment was marked as outdated.

Sign in to view

NelsonVides force-pushed the xeps/extensible_sasl branch from 14bde2d to 898cc16 Compare August 26, 2023 18:09

This comment was marked as outdated.

Sign in to view

NelsonVides force-pushed the xeps/extensible_sasl branch 2 times, most recently from c9e30d8 to f4eeb60 Compare August 27, 2023 10:51

This comment was marked as outdated.

Sign in to view

NelsonVides added 5 commits August 30, 2023 12:40

Add initial module, test suite, and document

1949050

Check if actually auth mechanims are supported for a given preset

f71f710

Check message routing after sm resumption

d863014

Simplify test helpers

2ec78f1

NelsonVides force-pushed the xeps/extensible_sasl branch from f4eeb60 to 2ec78f1 Compare August 30, 2023 10:40

chrzaszcz reviewed Sep 1, 2023

View reviewed changes

NelsonVides requested a review from chrzaszcz September 1, 2023 11:29

This comment was marked as outdated.

Sign in to view

Apply review

b45636c

NelsonVides force-pushed the xeps/extensible_sasl branch from b9b3314 to b45636c Compare September 1, 2023 11:55

chrzaszcz approved these changes Sep 4, 2023

View reviewed changes

chrzaszcz merged commit 9e92f64 into feature/sasl2 Sep 4, 2023
4 checks passed

chrzaszcz deleted the xeps/extensible_sasl branch September 4, 2023 13:36

chrzaszcz added this to the 6.2.0 milestone Dec 11, 2023

chrzaszcz mentioned this pull request Dec 11, 2023

Release MongooseIM 6.2.0 #4188

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Xeps/extensible sasl #4102

Xeps/extensible sasl #4102

NelsonVides commented Aug 15, 2023 •

edited

This comment was marked as outdated.

codecov bot commented Aug 15, 2023 •

edited

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

mongoose-im commented Aug 30, 2023 •

edited

chrzaszcz left a comment

This comment was marked as outdated.

mongoose-im commented Sep 1, 2023 •

edited

chrzaszcz left a comment

Neustradamus commented Sep 22, 2023

Xeps/extensible sasl #4102

Xeps/extensible sasl #4102

Conversation

NelsonVides commented Aug 15, 2023 • edited

This comment was marked as outdated.

codecov bot commented Aug 15, 2023 • edited

Codecov Report

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

mongoose-im commented Aug 30, 2023 • edited

chrzaszcz left a comment

Choose a reason for hiding this comment

This comment was marked as outdated.

mongoose-im commented Sep 1, 2023 • edited

chrzaszcz left a comment

Choose a reason for hiding this comment

Neustradamus commented Sep 22, 2023

NelsonVides commented Aug 15, 2023 •

edited

codecov bot commented Aug 15, 2023 •

edited

mongoose-im commented Aug 30, 2023 •

edited

mongoose-im commented Sep 1, 2023 •

edited