-
Notifications
You must be signed in to change notification settings - Fork 428
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
Advertise support for XEP-0249: Direct MUC Invitations #4168
Conversation
elasticsearch_and_cassandra_26 / elasticsearch_and_cassandra_mnesia / 70d1def small_tests_25 / small_tests / 70d1def small_tests_26 / small_tests / 70d1def small_tests_26_arm64 / small_tests / 70d1def ldap_mnesia_25 / ldap_mnesia / 70d1def metrics_c2s_SUITE:single:presence_one{error,
{{xmppPresenceReceived,
{value,96},
[{times,25,
{error,
{badmatch,{value,97}},
[{metrics_helper,assert_counter,3,
[{file,
"/home/circleci/project/big_tests/tests/metrics_helper.erl"},
{line,36}]},
{mongoose_helper,do_wait_until,2,
[{file,
"/home/circleci/project/big_tests/tests/mongoose_helper.erl"},
{line,361}]},
{metrics_c2s_SUITE,'-presence_one/1-fun-0-',1,
[{file,
"/home/circleci/project/big_tests/tests/metrics_c2s_SUITE.erl"},
{line,125}]},
{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_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}}],
ok},
[{mongoose_helper,do_wait_until,2,
[{file,"/home/circleci/project/big_tests/tests/mongoose_helper.erl"},
{line,358}]},
{metrics_c2s_SUITE,'-presence_one/1-fun-0-',1,
[{file,
"/home/circleci/project/big_tests/tests/metrics_c2s_SUITE.erl"},
{line,125}]},
{escalus_story,story,4,
[{file,
"/home/circleci/project/big_tests/... dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 70d1def graphql_last_SUITE:admin_cli:admin_last_configured:admin_last:admin_count_active_users{error,{{assertEqual,[{module,graphql_last_SUITE},
{line,312},
{expression,"get_ok_value ( p ( countActiveUsers ) , Res1 )"},
{expected,2},
{value,1}]},
[{graphql_last_SUITE,admin_count_active_users_story,3,
[{file,"/home/circleci/project/big_tests/tests/graphql_last_SUITE.erl"},
{line,312}]},
{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_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}} ldap_mnesia_26 / ldap_mnesia / 70d1def dynamic_domains_mysql_redis_26 / mysql_redis / 70d1def dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / 70d1def internal_mnesia_26 / internal_mnesia / 70d1def pgsql_cets_26 / pgsql_cets / 70d1def dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / 70d1def mysql_redis_26 / mysql_redis / 70d1def pgsql_mnesia_26 / pgsql_mnesia / 70d1def mssql_mnesia_26 / odbc_mssql_mnesia / 70d1def pgsql_mnesia_25 / pgsql_mnesia / 70d1def |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #4168 +/- ##
==========================================
- Coverage 84.10% 84.08% -0.02%
==========================================
Files 564 564
Lines 34064 34064
==========================================
- Hits 28648 28642 -6
- Misses 5416 5422 +6 ☔ View full report in Codecov by Sentry. |
70d1def
to
48126f7
Compare
elasticsearch_and_cassandra_26 / elasticsearch_and_cassandra_mnesia / 48126f7 small_tests_25 / small_tests / 48126f7 small_tests_26 / small_tests / 48126f7 small_tests_26_arm64 / small_tests / 48126f7 ldap_mnesia_25 / ldap_mnesia / 48126f7 sm_SUITE:ping_timeout{error,{{badmatch,false},
[{escalus_session,stream_resumption,2,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_session.erl"},
{line,259}]},
{escalus_connection,connection_step,2,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_connection.erl"},
{line,161}]},
{lists,foldl_1,3,[{file,"lists.erl"},{line,1355}]},
{escalus_connection,start,2,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_connection.erl"},
{line,145}]},
{sm_helper,connect_spec,3,
[{file,"/home/circleci/project/big_tests/tests/sm_helper.erl"},
{line,153}]},
{sm_SUITE,ping_timeout,1,
[{file,"/home/circleci/project/big_tests/tests/sm_SUITE.erl"},
{line,625}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]}]}} dynamic_domains_mysql_redis_26 / mysql_redis / 48126f7 dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 48126f7 ldap_mnesia_26 / ldap_mnesia / 48126f7 dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / 48126f7 pgsql_cets_26 / pgsql_cets / 48126f7 pgsql_mnesia_25 / pgsql_mnesia / 48126f7 dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / 48126f7 mysql_redis_26 / mysql_redis / 48126f7 internal_mnesia_26 / internal_mnesia / 48126f7 pgsql_mnesia_26 / pgsql_mnesia / 48126f7 mssql_mnesia_26 / odbc_mssql_mnesia / 48126f7 graphql_roster_SUITE:admin_roster_http:admin_invite_accept_and_cancel_subscription{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,
<<"bob_admin_invite_accept_and_cancel_subscription_1322@localhost/res1">>,
escalus_tcp,<0.26644.0>,
[{event_manager,<0.26642.0>},
{server,<<"localhost">>},
{username,
<<"bOb_admin_invite_accept_and_cancel_subscription_1322">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.26642.0>},
{server,<<"localhost">>},
{username,
<<"bOb_admin_invite_accept_and_cancel_subscription_1322">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,
<<"bob_admin_invite_accept_and_cancel_subscription_1322">>},
{server,<<"localhost">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,
<<"bOb_admin_invite_accept_and_cancel_subscription_1322">>},
{server,<<"localhost">>},
{password,<<"makrolika">>},
{stream_id,<<"03a643f644b4ed16">>}]},
1],
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{graphql_roster_SUITE,
admin_invite_accept_and_cancel_subscription_story,3,
[{file,
"/home/circleci/project/big_tests/tests/graphql_r... ldap_mnesia_25 / ldap_mnesia / 48126f7 mssql_mnesia_26 / odbc_mssql_mnesia / 48126f7 muc_SUITE:admin:admin_moderator_with_reason{error,
{{assertion_failed,assert_many,false,
[is_iq_result,is_presence],
[{xmlel,<<"presence">>,
[{<<"from">>,
<<"room-alice_admin_moderator_with_reason_2609@muc.localhost/bob">>},
{<<"to">>,
<<"alice_admin_moderator_with_reason_2609@localhost/res1">>}],
[{xmlel,<<"x">>,
[{<<"xmlns">>,<<"http://jabber.org/protocol/muc">>}],
[{xmlel,<<"item">>,
[{<<"jid">>,
<<"bob_admin_moderator_with_reason_2609@localhost/res1">>},
{<<"affiliation">>,<<"none">>},
{<<"role">>,<<"moderator">>}],
[{xmlel,<<"reason">>,[],
[{xmlcdata,<<"He should be fair">>}]}]}]}]}],
" <presence from='room-alice_admin_moderator_with_reason_2609@muc.localhost/bob' to='alice_admin_moderator_with_reason_2609@localhost/res1'><x xmlns='http://jabber.org/protocol/muc'><item jid='bob_admin_moderator_with_reason_2609@localhost/res1' affiliation='none' role='moderator'><reason>He should be fair</reason></item></x></presence>"},
[{escalus_new_assert,assert_true,2,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
{line,84}]},
{muc_SUITE,'-admin_moderator_with_reason/1-fun-1-',4,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,1683}]},
{escalus_story,story,4,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/esca... muc_SUITE:admin:admin_moderator_list{error,
{{assertion_failed,assert_many,false,
[is_iq_result,#Fun<muc_SUITE.181.6602701>,
#Fun<muc_SUITE.182.6602701>],
[{xmlel,<<"presence">>,
[{<<"from">>,
<<"room-alice_admin_moderator_list_2614@muc.localhost/kate">>},
{<<"to">>,
<<"alice_admin_moderator_list_2614@localhost/res1">>}],
[{xmlel,<<"x">>,
[{<<"xmlns">>,<<"http://jabber.org/protocol/muc">>}],
[{xmlel,<<"item">>,
[{<<"jid">>,
<<"kate_admin_moderator_list_2614@localhost/res1">>},
{<<"affiliation">>,<<"none">>},
{<<"role">>,<<"moderator">>}],
[]}]}]},
{xmlel,<<"presence">>,
[{<<"from">>,
<<"room-alice_admin_moderator_list_2614@muc.localhost/bob">>},
{<<"to">>,
<<"alice_admin_moderator_list_2614@localhost/res1">>}],
[{xmlel,<<"x">>,
[{<<"xmlns">>,<<"http://jabber.org/protocol/muc">>}],
[{xmlel,<<"item">>,
[{<<"jid">>,
<<"bob_admin_moderator_list_2614@localhost/res1">>},
{<<"affiliation">>,<<"none">>},
{<<"role">>,<<"moderator">>}],
[]}]}]}],
" <presence from='room-alice_admin_moderator_list_2614@muc.localhost/kate' to='alice_admin_moderator_list_2614@localhost/res1'><x xmlns='http://jabber.org/protocol/muc'><item jid='kate_admin_moderator_list_2614@localhost/res1' affiliation='none' role='moderator'/></x></presence> <presence from='ro... muc_SUITE:admin:admin_member_list_allowed{error,
{{assertion_failed,assert,is_iq_result,
[{xmlel,<<"iq">>,
[{<<"type">>,<<"set">>},
{<<"id">>,<<"603f004d4b14223b11d8a48593577af7">>},
{<<"to">>,
<<"room-alice_admin_member_list_allowed_2607@muc.localhost">>}],
[{xmlel,<<"query">>,
[{<<"xmlns">>,<<"http://jabber.org/protocol/muc#owner">>}],
[{xmlel,<<"x">>,
[{<<"xmlns">>,<<"jabber:x:data">>},
{<<"type">>,<<"submit">>}],
[{xmlel,<<"field">>,
[{<<"type">>,<<"hidden">>},
{<<"var">>,<<"FORM_TYPE">>}],
[{xmlel,<<"value">>,[],
[{xmlcdata,
<<"http://jabber.org/protocol/muc#roomconfig">>}]}]},
{xmlel,<<"field">>,
[{<<"type">>,<<"list-multi">>},
{<<"var">>,<<"muc#roomconfig_getmemberlist">>}],
[{xmlel,<<"value">>,[],
[{xmlcdata,<<"moderator">>}]}]}]}]}]}],
{xmlel,<<"iq">>,
[{<<"from">>,
<<"room-alice_admin_member_list_allowed_2607@muc.localhost">>},
{<<"to">>,
<<"alice_admin_member_list_allowed_2607@localhost/res1">>},
{<<"id">>,<<"4703df1b91874c42786897e551b65e56">>},
{<<"type">>,<<"result">>}],
[{xmlel,<<"query">>,
[{<<"xmlns">>,<<"http://jabber.org/protocol/muc#admin">>}],
[{xmlel,<<"item">>,
[{<<"role">>,<<"moderator">>},
{<<"affiliation">>,<<"owner">>},
... mssql_mnesia_26 / odbc_mssql_mnesia / 48126f7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks good in general. Actually there is no special implementation required on the server side for this XEP, as it is client-only, so we support it. I am not sure if we should advertise the support on the server side, but I guess it doesn't do any harm. There is no extra XMPP handling code needed by this XEP (we have a GraphQL query handler, but it just fabricates a message).
elasticsearch_and_cassandra_26 / elasticsearch_and_cassandra_mnesia / 2811862 small_tests_25 / small_tests / 2811862 small_tests_26 / small_tests / 2811862 small_tests_26_arm64 / small_tests / 2811862 ldap_mnesia_25 / ldap_mnesia / 2811862 ldap_mnesia_26 / ldap_mnesia / 2811862 dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 2811862 dynamic_domains_mysql_redis_26 / mysql_redis / 2811862 dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / 2811862 dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / 2811862 pgsql_mnesia_25 / pgsql_mnesia / 2811862 pgsql_cets_26 / pgsql_cets / 2811862 mysql_redis_26 / mysql_redis / 2811862 pgsql_mnesia_26 / pgsql_mnesia / 2811862 mssql_mnesia_26 / odbc_mssql_mnesia / 2811862 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good!
This PR adds info about supported XEP-0249 which already worked. This XEP is required for basic IM compliance at xmpp.org