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

Implement domain removal in mod_vcard #3304

Merged
merged 3 commits into from
Sep 28, 2021
Merged

Conversation

Premwoik
Copy link
Contributor

This PR adds domain removal to the mod_vcard and implements the remove_domain callback in the RDBMS backend. It also adds a test case to the 'domain_removal_SUITE'.

@Premwoik Premwoik force-pushed the domain-removal-mod-vcard branch 2 times, most recently from 20c0bac to e0c7208 Compare September 28, 2021 07:13
@mongoose-im
Copy link
Collaborator

mongoose-im commented Sep 28, 2021

small_tests_24 / small_tests / e0c7208
Reports root / small


internal_mnesia_24 / internal_mnesia / e0c7208
Reports root/ big
OK: 1589 / Failed: 0 / User-skipped: 294 / Auto-skipped: 0

@codecov
Copy link

codecov bot commented Sep 28, 2021

Codecov Report

Merging #3304 (54f7a52) into master (ea0f08e) will increase coverage by 2.89%.
The diff coverage is 90.90%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3304      +/-   ##
==========================================
+ Coverage   77.41%   80.30%   +2.89%     
==========================================
  Files         398      398              
  Lines       32584    32595      +11     
==========================================
+ Hits        25226    26177     +951     
+ Misses       7358     6418     -940     
Impacted Files Coverage Δ
src/mod_vcard.erl 78.01% <75.00%> (-0.05%) ⬇️
src/mod_vcard_rdbms.erl 75.79% <100.00%> (+4.46%) ⬆️
src/elasticsearch/mongoose_elasticsearch.erl 76.92% <0.00%> (-7.70%) ⬇️
src/mam/mod_mam_elasticsearch_arch.erl 85.08% <0.00%> (-1.76%) ⬇️
src/ejabberd_c2s.erl 89.29% <0.00%> (+0.07%) ⬆️
src/mod_muc_room.erl 77.12% <0.00%> (+0.17%) ⬆️
src/mod_roster.erl 79.33% <0.00%> (+0.23%) ⬆️
src/pubsub/mod_pubsub_db_rdbms.erl 95.34% <0.00%> (+0.25%) ⬆️
src/pubsub/mod_pubsub.erl 73.46% <0.00%> (+0.29%) ⬆️
src/rdbms/mongoose_rdbms.erl 60.88% <0.00%> (+0.40%) ⬆️
... and 32 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ea0f08e...54f7a52. Read the comment docs.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Sep 28, 2021

small_tests_24 / small_tests / 54f7a52
Reports root / small


internal_mnesia_24 / internal_mnesia / 54f7a52
Reports root/ big
OK: 1589 / Failed: 0 / User-skipped: 295 / Auto-skipped: 0


small_tests_23 / small_tests / 54f7a52
Reports root / small


ldap_mnesia_24 / ldap_mnesia / 54f7a52
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 398 / Auto-skipped: 0


dynamic_domains_24 / pgsql_mnesia / 54f7a52
Reports root/ big
OK: 2700 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / 54f7a52
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 398 / Auto-skipped: 0


dynamic_domains_23 / pgsql_mnesia / 54f7a52
Reports root/ big
OK: 2700 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 54f7a52
Reports root/ big
OK: 1862 / Failed: 0 / User-skipped: 321 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 54f7a52
Reports root/ big
OK: 3069 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / 54f7a52
Reports root/ big
OK: 3058 / Failed: 1 / User-skipped: 228 / Auto-skipped: 0

mam_SUITE:rdbms_prefs_cases:prefs_set_cdata_request
{error,{test_case_failed,"ASSERT EQUAL\n\tExpected {prefs_result_iq,<<\"roster\">>,\n                  [<<\"montague@montague.net\">>,\n                   <<\"romeo@montague.net\">>],\n                  []}\n\tValue {prefs_result_iq,<<\"always\">>,\n                 [<<\"montague@montague.net\">>,\n                <<\"romeo@montague.net\">>],\n                 []}\n"}}

Report log


pgsql_mnesia_23 / pgsql_mnesia / 54f7a52
Reports root/ big
OK: 3069 / Failed: 1 / User-skipped: 211 / Auto-skipped: 0

s2s_SUITE:both_tls_optional:simple_message
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,<<"alice_simple_message_37.290918@fed1/res1">>,
          escalus_tcp,<0.3453.2>,
          [{event_manager,<0.3449.2>},
           {server,<<"fed1">>},
           {username,<<"alice_simple_message_37.290918">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.3449.2>},
            {server,<<"fed1">>},
            {username,<<"alice_simple_message_37.290918">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"alice_simple_message_37.290918">>},
           {server,<<"fed1">>},
           {host,<<"localhost">>},
           {port,5242},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"alice_simple_message_37.290918">>},
           {server,<<"fed1">>},
           {host,<<"localhost">>},
           {port,5242},
           {password,<<"makota2">>},
           {stream_id,<<"5f62119583efe7e3">>}]},
        10000],
       [{file,
          "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {s2s_SUITE,'-simple_message/1-fun-0-',2,
       [{file,"/home/circleci/app/big_tests/tests/s2s_SUITE.erl"},
        {line,124}]},
     {escalus_story,story,4,
       [{file,
          "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
        {line,72}]},
     {test_server,t...

Report log


mssql_mnesia_24 / odbc_mssql_mnesia / 54f7a52
Reports root/ big
OK: 3105 / Failed: 2 / User-skipped: 211 / Auto-skipped: 0

pep_SUITE:pep_tests:delayed_receive
{error,{{badmatch,[]},
    [{pep_SUITE,'-delayed_receive/1-fun-0-',3,
          [{file,"/home/circleci/app/big_tests/tests/pep_SUITE.erl"},
           {line,276}]},
     {escalus_story,story,4,
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,72}]},
     {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
     {test_server,run_test_case_eval1,6,
            [{file,"test_server.erl"},{line,1292}]},
     {test_server,run_test_case_eval,9,
            [{file,"test_server.erl"},{line,1224}]}]}}

Report log

rest_client_SUITE:muc:messages_can_be_paginated_in_room
{error,
  {{assertion_failed,assert,is_chat_message,
     [<<"0257c141">>],
     {xmlel,<<"message">>,
       [{<<"to">>,<<"1632-815447-55087@muclight.localhost">>},
        {<<"type">>,<<"chat">>}],
       [{xmlel,<<"body">>,[],[{xmlcdata,<<"9eb53043">>}]}]},
     "<message to='1632-815447-55087@muclight.localhost' type='chat'><body>9eb53043</body></message>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {rest_client_SUITE,assert_room_messages,2,
      [{file,"/home/circleci/app/big_tests/tests/rest_client_SUITE.erl"},
       {line,772}]},
    {escalus_story,story,4,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,72}]},
    {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
    {test_server,run_test_case_eval1,6,
      [{file,"test_server.erl"},{line,1292}]},
    {test_server,run_test_case_eval,9,
      [{file,"test_server.erl"},{line,1224}]}]}}

Report log


riak_mnesia_24 / riak_mnesia / 54f7a52
Reports root/ big
OK: 1727 / Failed: 1 / User-skipped: 324 / Auto-skipped: 0

jingle_SUITE:all:resp_4xx_from_sip_proxy_results_in_session_terminate
{error,
  {{assertion_failed,assert,is_iq_result,
     {xmlel,<<"iq">>,
       [{<<"from">>,<<"error.480@localhost">>},
        {<<"to">>,
         <<"alice_resp_4xx_from_sip_proxy_results_in_session_terminate_50.630505@localhost/res1">>},
        {<<"id">>,<<"7da75d77-bff1-473e-8aa5-908b20efeb06">>},
        {<<"type">>,<<"set">>}],
       [{xmlel,<<"jingle">>,
          [{<<"xmlns">>,<<"urn:xmpp:jingle:1">>},
           {<<"action">>,<<"session-terminate">>},
           {<<"sid">>,<<"d7022c55-da3e-43df-a42f-f4a958f3a441">>}],
          [{xmlel,<<"reason">>,[],
             [{xmlel,<<"general-error">>,[],[]},
            {xmlel,<<"sip-error">>,
              [{<<"code">>,<<"480">>}],
              [{xmlcdata,<<"Temporarily Unavailable">>}]}]}]}]},
     "<iq from='error.480@localhost' to='alice_resp_4xx_from_sip_proxy_results_in_session_terminate_50.630505@localhost/res1' id='7da75d77-bff1-473e-8aa5-908b20efeb06' type='set'><jingle xmlns='urn:xmpp:jingle:1' action='session-terminate' sid='d7022c55-da3e-43df-a42f-f4a958f3a441'><reason><general-error/><sip-error code='480'>Temporarily Unavailable</sip-error></reason></jingle></iq>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {jingle_SUITE,send_initiate_and_wait_for_first_iq_set,2,
      [{file,"/home/circleci/app/big_tests/tests/jingle_SUITE.erl"},
       {line,395}]},
    {jingle_SUITE,
      '-res...

Report log

@Premwoik Premwoik marked this pull request as ready for review September 28, 2021 08:03
@vkatsuba vkatsuba merged commit 35119af into master Sep 28, 2021
@vkatsuba vkatsuba deleted the domain-removal-mod-vcard branch September 28, 2021 08:43
@Premwoik Premwoik added this to the 5.0.0 milestone Oct 5, 2021
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.

None yet

3 participants