Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xeps/bind2 inlines #4114

Merged
merged 16 commits into from
Sep 12, 2023
Merged

Xeps/bind2 inlines #4114

merged 16 commits into from
Sep 12, 2023

Conversation

NelsonVides
Copy link
Collaborator

@NelsonVides NelsonVides commented Sep 4, 2023

This PR introduces BIND2 support for carbons, csi, and sm.

As described in

Note that the changes to SM are not accepted yet (at the moment of writing), and for a while they claimed the SM feature inlined into SASL2 should be announced as resume but then it was requested it should announce sm, as other XMPP servers and clients have already done.

@mongoose-im

This comment was marked as outdated.

@codecov
Copy link

codecov bot commented Sep 4, 2023

Codecov Report

Patch coverage: 94.94% and project coverage change: +0.01% 🎉

Comparison is base (c460ef3) 84.02% compared to head (0e92f49) 84.03%.
Report is 3 commits behind head on feature/sasl2.

Additional details and impacted files
@@                Coverage Diff                @@
##           feature/sasl2    #4114      +/-   ##
=================================================
+ Coverage          84.02%   84.03%   +0.01%     
=================================================
  Files                554      556       +2     
  Lines              33875    33941      +66     
=================================================
+ Hits               28462    28521      +59     
- Misses              5413     5420       +7     
Files Changed Coverage Δ
.../mongoose_admin_api/mongoose_admin_api_metrics.erl 98.03% <83.33%> (-1.97%) ⬇️
src/mod_bind2.erl 93.75% <88.88%> (-1.91%) ⬇️
src/stream_management/mod_stream_management.erl 90.65% <93.10%> (-0.47%) ⬇️
src/mod_sasl2.erl 96.36% <94.73%> (+0.31%) ⬆️
.../stream_management/mod_stream_management_sasl2.erl 94.73% <94.73%> (ø)
src/c2s/mongoose_c2s.erl 87.94% <100.00%> (+0.17%) ⬆️
src/mod_carboncopy.erl 91.09% <100.00%> (+0.87%) ⬆️
src/mod_csi.erl 100.00% <100.00%> (+1.66%) ⬆️
...tream_management/mod_stream_management_stanzas.erl 100.00% <100.00%> (ø)

... and 9 files with indirect coverage changes

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

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@NelsonVides NelsonVides mentioned this pull request Sep 5, 2023
Base automatically changed from xeps/bind2 to feature/sasl2 September 5, 2023 21:43
@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@NelsonVides NelsonVides marked this pull request as ready for review September 6, 2023 14:32
@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Sep 11, 2023

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


small_tests_24 / small_tests / 0e92f49
Reports root / small


small_tests_25 / small_tests / 0e92f49
Reports root / small


small_tests_25_arm64 / small_tests / 0e92f49
Reports root / small


ldap_mnesia_24 / ldap_mnesia / 0e92f49
Reports root/ big
OK: 2300 / Failed: 0 / User-skipped: 835 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 0e92f49
Reports root/ big
OK: 4263 / Failed: 0 / User-skipped: 84 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / 0e92f49
Reports root/ big
OK: 2300 / Failed: 0 / User-skipped: 835 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 0e92f49
Reports root/ big
OK: 4263 / Failed: 0 / User-skipped: 84 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 0e92f49
Reports root/ big
OK: 4260 / Failed: 0 / User-skipped: 87 / Auto-skipped: 0


pgsql_cets_25 / pgsql_cets / 0e92f49
Reports root/ big
OK: 4622 / Failed: 0 / User-skipped: 121 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / 0e92f49
Reports root/ big
OK: 2450 / Failed: 0 / User-skipped: 685 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / 0e92f49
Reports root/ big
OK: 4632 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 0e92f49
Reports root/ big
OK: 4652 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 0e92f49
Reports root/ big
OK: 4652 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / 0e92f49
Reports root/ big
OK: 4649 / Failed: 0 / User-skipped: 94 / Auto-skipped: 0

Copy link
Member

@chrzaszcz chrzaszcz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good 👍


given_client_is_inactive_and_no_messages_arrive(Alice) ->
escalus:send(Alice, csi_stanza(<<"inactive">>)),
then_client_does_not_receive_any_message(Alice).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that given/when/then prefixes in helpers are confusing, but it can be a matter of preference. For me they hinder code reuse, e.g. here we have a then in given, which already breaks the pattern. If the helper function was called assert_client_does_not_receive_any_message, it would look cleaner.

So we could get rid of the given/then prefixes, but I see how this code was moved from a suite, so it can stay as it is.

@chrzaszcz chrzaszcz merged commit 7be5143 into feature/sasl2 Sep 12, 2023
4 checks passed
@chrzaszcz chrzaszcz deleted the xeps/bind2-inlines branch September 12, 2023 14:20
@Neustradamus

This comment was marked as spam.

@chrzaszcz chrzaszcz added this to the 6.2.0 milestone Dec 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants