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

Fix the format of JWT secret #3716

Merged
merged 1 commit into from
Jul 26, 2022
Merged

Fix the format of JWT secret #3716

merged 1 commit into from
Jul 26, 2022

Conversation

chrzaszcz
Copy link
Member

@chrzaszcz chrzaszcz commented Jul 26, 2022

This PR addresses #3690

The secret was parsed as a string, but should be a binary instead.

Also: add file check

It was parsed as a string, but should be a binary instead.

Also: add file check
@chrzaszcz chrzaszcz force-pushed the fix-auth-jwt-secret branch from 05d916c to 7de6597 Compare July 26, 2022 08:24
@mongoose-im
Copy link
Collaborator

mongoose-im commented Jul 26, 2022

small_tests_24 / small_tests / 7de6597
Reports root / small


small_tests_25 / small_tests / 7de6597
Reports root / small


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 7de6597
Reports root/ big
OK: 3333 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / 7de6597
Reports root/ big
OK: 1895 / Failed: 0 / User-skipped: 508 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 7de6597
Reports root/ big
OK: 3333 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0


dynamic_domains_mysql_redis_25 / mysql_redis / 7de6597
Reports root/ big
OK: 3316 / Failed: 0 / User-skipped: 105 / Auto-skipped: 0


ldap_mnesia_25 / ldap_mnesia / 7de6597
Reports root/ big
OK: 1895 / Failed: 0 / User-skipped: 508 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 7de6597
Reports root/ big
OK: 3332 / Failed: 1 / User-skipped: 88 / Auto-skipped: 0

sm_SUITE:parallel_unacknowledged_message_hook:unacknowledged_message_hook_bounce
{error,
  {{assertion_failed,assert,is_chat_message,
     [<<"msg-1">>],
     {xmlel,<<"message">>,
       [{<<"from">>,
         <<"bob_unacknowledged_message_hook_bounce_2403@domain.example.com/escalus-default-resource">>},
        {<<"to">>,
         <<"alice_unacknowledged_message_hook_bounce_2409@domain.example.com">>},
        {<<"xml:lang">>,<<"en">>},
        {<<"type">>,<<"chat">>}],
       [{xmlel,<<"body">>,[],[{xmlcdata,<<"msg-3">>}]},
        {xmlel,<<"delay">>,
          [{<<"xmlns">>,<<"urn:xmpp:delay">>},
           {<<"stamp">>,<<"2022-07-26T08:42:52.564438Z">>},
           {<<"from">>,<<"domain.example.com">>}],
          [{xmlcdata,<<"SM Storage">>}]}]},
     "<message from='bob_unacknowledged_message_hook_bounce_2403@domain.example.com/escalus-default-resource' to='alice_unacknowledged_message_hook_bounce_2409@domain.example.com' xml:lang='en' type='chat'><body>msg-3</body><delay xmlns='urn:xmpp:delay' stamp='2022-07-26T08:42:52.564438Z' from='domain.example.com'>SM Storage</delay></message>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {sm_SUITE,unacknowledged_message_hook_common,2,
      [{file,"/home/circleci/project/big_tests/tests/sm_SUITE.erl"},
       {line,857}]},
    {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
    {test_server,run_test_case_eval1,6,
      [{file,"test_server.erl"},{line,1291}]},
  ...

Report log


pgsql_mnesia_24 / pgsql_mnesia / 7de6597
Reports root/ big
OK: 3707 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


internal_mnesia_25 / internal_mnesia / 7de6597
Reports root/ big
OK: 2016 / Failed: 0 / User-skipped: 387 / Auto-skipped: 0


elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 7de6597
Reports root/ big
OK: 2312 / Failed: 0 / User-skipped: 382 / Auto-skipped: 0


mysql_redis_25 / mysql_redis / 7de6597
Reports root/ big
OK: 3702 / Failed: 0 / User-skipped: 102 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 7de6597
Reports root/ big
OK: 3707 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


mssql_mnesia_25 / odbc_mssql_mnesia / 7de6597
Reports root/ big
OK: 3717 / Failed: 2 / User-skipped: 97 / Auto-skipped: 0

muc_SUITE:register:user_submits_registration_form
{error,
  {{assertion_failed,assert,is_iq_result,
     [{xmlel,<<"iq">>,
        [{<<"type">>,<<"set">>},
         {<<"id">>,<<"9649174e3a501cc69522dba6aff88c27">>},
         {<<"to">>,<<"muc.localhost">>}],
        [{xmlel,<<"query">>,
           [{<<"xmlns">>,<<"jabber:iq:register">>}],
           [{xmlel,<<"x">>,
            [{<<"xmlns">>,<<"jabber:x:data">>},
             {<<"type">>,<<"submit">>}],
            [{xmlel,<<"field">>,
               [{<<"type">>,<<"hidden">>},
                {<<"var">>,<<"FORM_TYPE">>}],
               [{xmlel,<<"value">>,[],
                  [{xmlcdata,<<"jabber:iq:register">>}]}]},
             {xmlel,<<"field">>,
               [{<<"type">>,<<"text-single">>},
                {<<"var">>,<<"nick">>}],
               [{xmlel,<<"value">>,[],
                  [{xmlcdata,
                     <<"thirdwitchroom-de278a24aa">>}]}]}]}]}]}],
     {xmlel,<<"iq">>,
       [{<<"from">>,<<"muc.localhost">>},
        {<<"to">>,
         <<"alice_user_submits_registration_form_2189@localhost/res1">>},
        {<<"type">>,<<"error">>},
        {<<"xml:lang">>,<<"en">>},
        {<<"id">>,<<"9649174e3a501cc69522dba6aff88c27">>}],
       [{xmlel,<<"query">>,
          [{<<"xmlns">>,<<"jabber:iq:register">>}],
          [{xmlel,<<"x">>,
             [{<<"xmlns">>,<<"jabber:x:data">>},
            {<<"type">>,<<"submit">>}],
             [{xmlel,<<"field">>,
              [{<<"type">>,<<"hidden">>},
               {<<"var">>,<<"FORM_TYPE">>}],
            ...

Report log

pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription
{error,{{assertion_failed,assert_many,false,[is_presence],[],[]},
    [{escalus_new_assert,assert_true,2,
               [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
                {line,84}]},
     {escalus_story,'-make_all_clients_friends/1-fun-0-',2,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,109}]},
     {escalus_utils,'-each_with_index/3-fun-0-',3,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_utils.erl"},
             {line,87}]},
     {lists,foldl_1,3,[{file,"lists.erl"},{line,1355}]},
     {escalus_utils,'-each_with_index/3-fun-0-',3,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_utils.erl"},
             {line,87}]},
     {lists,foldl,3,[{file,"lists.erl"},{line,1350}]},
     {escalus_utils,distinct_pairs,2,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_utils.erl"},
             {line,60}]},
     {escalus_story,make_all_clients_friends,1,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,106}]}]}}

Report log


riak_mnesia_24 / riak_mnesia / 7de6597
Reports root/ big
OK: 2173 / Failed: 0 / User-skipped: 375 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 7de6597
Reports root/ big
OK: 3332 / Failed: 1 / User-skipped: 88 / Auto-skipped: 0

muc_SUITE:hibernation:hibernated_room_can_be_queried_for_archive
{error,{{assertion_failed,assert,is_groupchat_message,
              [<<"Restorable message">>],
              undefined,"undefined"},
    [{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,wait_for_mam_result,3,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4394}]},
     {muc_SUITE,'-hibernated_room_can_be_queried_for_archive/1-fun-0-',3,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4130}]},
     {escalus_story,story,4,
            [{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,72}]},
     {muc_SUITE,hibernated_room_can_be_queried_for_archive,1,
          [{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
           {line,4126}]},
     {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


mssql_mnesia_25 / odbc_mssql_mnesia / 7de6597
Reports root/ big
OK: 3707 / Failed: 0 / User-skipped: 97 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 7de6597
Reports root/ big
OK: 3333 / Failed: 0 / User-skipped: 88 / Auto-skipped: 0

@codecov
Copy link

codecov bot commented Jul 26, 2022

Codecov Report

Merging #3716 (7de6597) into master (287541a) will increase coverage by 1.52%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3716      +/-   ##
==========================================
+ Coverage   80.69%   82.21%   +1.52%     
==========================================
  Files         523      523              
  Lines       33801    33801              
==========================================
+ Hits        27275    27789     +514     
+ Misses       6526     6012     -514     
Impacted Files Coverage Δ
src/auth/ejabberd_auth_jwt.erl 79.48% <ø> (ø)
src/elasticsearch/mongoose_elasticsearch.erl 76.92% <0.00%> (-7.70%) ⬇️
src/ejabberd.erl 55.00% <0.00%> (-5.00%) ⬇️
src/pubsub/nodetree_tree.erl 87.87% <0.00%> (-3.04%) ⬇️
...bal_distrib/mod_global_distrib_hosts_refresher.erl 66.66% <0.00%> (-2.23%) ⬇️
src/mam/mod_mam_elasticsearch_arch.erl 86.60% <0.00%> (-1.79%) ⬇️
src/pubsub/node_flat.erl 74.30% <0.00%> (-0.40%) ⬇️
src/pubsub/mod_pubsub_db_rdbms.erl 95.34% <0.00%> (-0.26%) ⬇️
src/mam/mod_mam_utils.erl 86.73% <0.00%> (+0.97%) ⬆️
src/global_distrib/mod_global_distrib_receiver.erl 80.72% <0.00%> (+1.20%) ⬆️
... and 12 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 287541a...7de6597. Read the comment docs.

@chrzaszcz chrzaszcz marked this pull request as ready for review July 26, 2022 12:20
Copy link
Contributor

@JanuszJakubiec JanuszJakubiec 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

@JanuszJakubiec JanuszJakubiec merged commit b47f787 into master Jul 26, 2022
@JanuszJakubiec JanuszJakubiec deleted the fix-auth-jwt-secret branch July 26, 2022 12:32
@chrzaszcz chrzaszcz added this to the 6.0.0 milestone Dec 12, 2022
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.

3 participants