From 424e28b7cd1bcae9033c84c818ffcb3dfb90e1c3 Mon Sep 17 00:00:00 2001 From: vkatsuba Date: Tue, 21 Sep 2021 15:22:50 +0300 Subject: [PATCH 01/13] Stop support OTP 22 for service_domain_db --- src/domain/service_domain_db.erl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/domain/service_domain_db.erl b/src/domain/service_domain_db.erl index ea70e8788b5..57bb9febe70 100644 --- a/src/domain/service_domain_db.erl +++ b/src/domain/service_domain_db.erl @@ -4,7 +4,6 @@ -include("mongoose_config_spec.hrl"). -include("mongoose_logger.hrl"). --include("backward_compatible.hrl"). -define(GROUP, service_domain_db_group). -define(LAST_EVENT_ID_KEY, {?MODULE, last_event_id}). @@ -70,7 +69,7 @@ enabled() -> force_check_for_updates() -> %% Send a broadcast message. - case ?PG_GET_MEMBERS(?GROUP) of + case pg:get_members(?GROUP) of [_|_] = Pids -> [Pid ! check_for_updates || Pid <- Pids], ok; @@ -86,7 +85,7 @@ sync_local() -> init([]) -> mongoose_domain_gaps:init(), - ?PG_JOIN(?GROUP, self()), + pg:join(?GROUP, self()), gen_server:cast(self(), initial_loading), %% initial state will be set on initial_loading processing {ok, #{}}. From 07dbb68dd35aa7b87650ed2161730594583b0c98 Mon Sep 17 00:00:00 2001 From: vkatsuba Date: Tue, 21 Sep 2021 15:24:05 +0300 Subject: [PATCH 02/13] Stop support OTP 22 for mod_mam_cache_user --- src/mam/mod_mam_cache_user.erl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mam/mod_mam_cache_user.erl b/src/mam/mod_mam_cache_user.erl index b2c7c01ee8f..1739e5ada56 100644 --- a/src/mam/mod_mam_cache_user.erl +++ b/src/mam/mod_mam_cache_user.erl @@ -40,7 +40,6 @@ -include("mongoose.hrl"). -include("jlib.hrl"). --include("backward_compatible.hrl"). -record(state, {}). @@ -165,7 +164,7 @@ lookup_archive_id(ArcJID) -> -spec clean_cache(jid:jid()) -> ok. clean_cache(ArcJID) -> %% Send a broadcast message. - case ?PG_GET_MEMBERS(group_name()) of + case pg:get_members(group_name()) of [_|_] = Pids -> [gen_server:cast(Pid, {remove_user, ArcJID}) || Pid <- Pids], @@ -179,7 +178,7 @@ clean_cache(ArcJID) -> %%==================================================================== init([]) -> - ?PG_JOIN(group_name(), self()), + pg:join(group_name(), self()), TOpts = [named_table, protected, {write_concurrency, false}, {read_concurrency, true}], From 7ad2a19f617d02bb16fa4afe1d930c8e203cc537 Mon Sep 17 00:00:00 2001 From: vkatsuba Date: Tue, 21 Sep 2021 15:24:51 +0300 Subject: [PATCH 03/13] Remove include/backward_compatible.hrl for stop support OTP 22 --- include/backward_compatible.hrl | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 include/backward_compatible.hrl diff --git a/include/backward_compatible.hrl b/include/backward_compatible.hrl deleted file mode 100644 index 6bd326f45ae..00000000000 --- a/include/backward_compatible.hrl +++ /dev/null @@ -1,12 +0,0 @@ --ifdef(OTP_RELEASE). --if(?OTP_RELEASE >= 23). --define(PG_JOIN(Group, PID), pg:join(Group, PID)). --define(PG_GET_MEMBERS(Group), pg:get_members(Group)). --else. --define(PG_JOIN(Group, PID), pg2:create(Group), pg2:join(Group, PID)). --define(PG_GET_MEMBERS(Group), pg2:get_members(Group)). --endif. --else. --define(PG_JOIN(Group, PID), pg2:create(Group), pg2:join(Group, PID)). --define(PG_GET_MEMBERS(Group), pg2:get_members(Group)). --endif. From 97f0232f1074793820cca026a319dc65cb77ef8b Mon Sep 17 00:00:00 2001 From: vkatsuba Date: Tue, 21 Sep 2021 15:39:10 +0300 Subject: [PATCH 04/13] Update info about support OTP 23 in Bootstrap-Scripts.md --- doc/developers-guide/Bootstrap-Scripts.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/developers-guide/Bootstrap-Scripts.md b/doc/developers-guide/Bootstrap-Scripts.md index b501bbc9cfc..ef333e5cc54 100644 --- a/doc/developers-guide/Bootstrap-Scripts.md +++ b/doc/developers-guide/Bootstrap-Scripts.md @@ -66,5 +66,5 @@ tools/pkg/scripts/smoke_templates.escript Testing command: ```bash -PRESET=pkg pkg_PLATFORM=centos_7 ESL_ERLANG_PKG_VER=22.1.8-2 ./tools/test.sh +PRESET=pkg pkg_PLATFORM=centos_7 ESL_ERLANG_PKG_VER=23.3.1-2 ./tools/test.sh ``` From c4b80809fd8db786e7f6b97d368f4fa8cda2cd56 Mon Sep 17 00:00:00 2001 From: vkatsuba Date: Tue, 21 Sep 2021 15:44:27 +0300 Subject: [PATCH 05/13] Remove OTP 22 from circleci --- .circleci/config.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a35b937616..2fb31c52638 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -632,37 +632,6 @@ workflows: filters: *all_tags # ============================================ # ============= IN VM EXECUTORS ============== - # ============= TESTS OTP 22 ============= - - build: - name: otp_22 - otp_package: 22.3.4.9-1 - context: mongooseim-org - filters: *all_tags - - small_tests: - name: small_tests_22 - otp_package: 22.3.4.9-1 - context: mongooseim-org - requires: - - otp_22 - filters: *all_tags - - big_tests: - name: ldap_mnesia_22 - otp_package: 22.3.4.9-1 - preset: ldap_mnesia - db: mnesia - context: mongooseim-org - requires: - - otp_22 - filters: *all_tags - - big_tests: - name: pgsql_mnesia_22 - otp_package: 22.3.4.9-1 - preset: pgsql_mnesia - db: pgsql - context: mongooseim-org - requires: - - otp_22 - filters: *all_tags # ============= TESTS OTP 23 ============= - build: name: otp_23 @@ -780,10 +749,6 @@ workflows: executor: otp_24 context: mongooseim-org requires: - - small_tests_22 - - ldap_mnesia_22 - - pgsql_mnesia_22 - - small_tests_23 - ldap_mnesia_23 - pgsql_mnesia_23 From 3e100bbdea6d230c9bb5984b9314d9a2afea3f57 Mon Sep 17 00:00:00 2001 From: vkatsuba Date: Tue, 21 Sep 2021 15:46:00 +0300 Subject: [PATCH 06/13] Remove OTP 22 from GHA --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a254e1a150..6d988779591 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: name: small_tests on OTP ${{matrix.otp}} strategy: matrix: - otp: ['23.0.3', '22.3', '24.0.2'] + otp: ['23.0.3', '24.0.2'] runs-on: ubuntu-20.04 env: PRESET: 'small_tests' @@ -49,7 +49,7 @@ jobs: matrix: preset: [internal_mnesia, pgsql_mnesia, mysql_redis, odbc_mssql_mnesia, ldap_mnesia, riak_mnesia, elasticsearch_and_cassandra_mnesia] - otp: ['22.3', '23.0.3', '24.0.2'] + otp: ['23.0.3', '24.0.2'] runs-on: ubuntu-20.04 env: PRESET: ${{matrix.preset}} @@ -129,7 +129,7 @@ jobs: pkg: [centos_7, debian_stretch] runs-on: ubuntu-20.04 env: - ESL_ERLANG_PKG_VER: "22.3.4.9-1" + ESL_ERLANG_PKG_VER: "23.3.1-1" pkg_PLATFORM: ${{matrix.pkg}} steps: - uses: actions/checkout@v2 From 9685b94f712f351b0250c52a175e68cd2986a014 Mon Sep 17 00:00:00 2001 From: vkatsuba Date: Tue, 21 Sep 2021 15:51:27 +0300 Subject: [PATCH 07/13] Update info for stop support OTP 22 in tools/pkg/README.md --- tools/pkg/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/pkg/README.md b/tools/pkg/README.md index 97b68ce9322..1a5652f0b48 100644 --- a/tools/pkg/README.md +++ b/tools/pkg/README.md @@ -48,7 +48,7 @@ file will be suitable), is built for the same source code but with the usage of changed build scripts), * `$ERLANG_VERSION` - a version of the esl-erlang package which should be used while compiling MongooseIM (please remember about concerning minimal erlang version -specified in the `rebar.config` file and the esl-erlang package revision - e.g. 22.2.5-2), +specified in the `rebar.config` file and the esl-erlang package revision - e.g. 23.3.1-1), * `DOCKERFILE_PATH` - a dockerfile path which should be used to build a package for given platform (e.g. path of `Dockerfile_rpm` for `centos_7`), * `CONTEXT_PATH` - a root directory of the MongooseIM project (during building @@ -76,7 +76,7 @@ PROJECT_ROOT=$(git rev-parse --show-toplevel) PLATFORM="debian_stretch" VERSION=$(cat "${PROJECT_ROOT}/VERSION") REVISION="1" -ERLANG_VERSION="22.2.5-1" +ERLANG_VERSION="23.3.1-1" DOCKERFILE_PATH="$PROJECT_ROOT/tools/pkg/Dockerfile_deb" CONTEXT_PATH=$PROJECT_ROOT BUILT_PACKAGES_DIRECTORY="$PROJECT_ROOT/tools/pkg/packages" @@ -84,7 +84,7 @@ BUILT_PACKAGES_DIRECTORY="$PROJECT_ROOT/tools/pkg/packages" ## Setting package version and revision -A package version consists of a MongooseIM `version` and a `revision` of a package. +A package version consists of a MongooseIM `version` and a `revision` of a package. Their default and recommended values were showed above. It is possible though that a package will be built for non tagged version of the source code. @@ -94,7 +94,7 @@ recommended: * always set: `VERSION=$(cat "${PROJECT_ROOT}/VERSION")`, * while building a package for tagged source code use: `REVISION="1"`, * while building a package for non tagged source code try to indicate what source -code was used (e.g. by adding a commit hash to the revision: +code was used (e.g. by adding a commit hash to the revision: `REVISION="1.$(git rev-parse --short HEAD)"`). Make sure to keep the `"${PROJECT_ROOT}/VERSION"` and passed `$VERSION` From d3685d8e12fd70bd43ceeed7bf9b87d9dced4362 Mon Sep 17 00:00:00 2001 From: vkatsuba Date: Tue, 21 Sep 2021 15:52:04 +0300 Subject: [PATCH 08/13] Update info for stop support OTP 22 in doc/configuration/TLS-hardening.md --- doc/configuration/TLS-hardening.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/configuration/TLS-hardening.md b/doc/configuration/TLS-hardening.md index 00f1e9d69e7..8a1046ab813 100644 --- a/doc/configuration/TLS-hardening.md +++ b/doc/configuration/TLS-hardening.md @@ -44,8 +44,8 @@ In order to change the list, please find the following lines: ]} ``` -By default only TLS 1.2 is enabled, as 1.3 is not supported by OTPs older than 22.0. -If you are using OTP 22.0 or newer, you may remove leading `%` before `'tlsv1.3'`. +By default only TLS 1.2 is enabled, as 1.3 is not supported by OTPs older than 23.0. +If you are using OTP 23.0 or newer, you may remove leading `%` before `'tlsv1.3'`. The remaining valid values are: `'tlsv1.1'`, `tlsv1`, `sslv3`. This setting affects the following MongooseIM components: From 2cb4d04895a6d086c416e2a67d005c7026582a62 Mon Sep 17 00:00:00 2001 From: vkatsuba Date: Tue, 21 Sep 2021 15:54:58 +0300 Subject: [PATCH 09/13] Update info for stop support OTP 22 in doc/developers-guide/OpenSSL-and-FIPS.md --- doc/developers-guide/OpenSSL-and-FIPS.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/developers-guide/OpenSSL-and-FIPS.md b/doc/developers-guide/OpenSSL-and-FIPS.md index d082e40ea11..54e389e7a44 100644 --- a/doc/developers-guide/OpenSSL-and-FIPS.md +++ b/doc/developers-guide/OpenSSL-and-FIPS.md @@ -17,7 +17,7 @@ If you want to use a different OpenSSL than the default one, specify the option Here's an example of a command for building Erlang/OTP with kerl: ```bash -KERL_CONFIGURE_OPTIONS="--enable-fips" ./kerl build 21.3 21.3-fips +KERL_CONFIGURE_OPTIONS="--enable-fips" ./kerl build 23.3 23.3-fips ``` ### Building MongooseIM with a custom OpenSSL @@ -34,8 +34,8 @@ export CFLAGS="-I$OPENSSL_INC" ### How to enable/disable FIPS mode -Find `etc/app.config` in the release directory. -FIPS mode is an option of the crypto application. +Find `etc/app.config` in the release directory. +FIPS mode is an option of the crypto application. In order to enable/disable it, add the following section to `app.config`: ```erlang @@ -70,7 +70,7 @@ The function returns: ### Cipher suites difference -A test using a `cipher_suites_test.sh` script (available in the tools directory) can be performed on MongooseIM with FIPS mode enabled and disabled. +A test using a `cipher_suites_test.sh` script (available in the tools directory) can be performed on MongooseIM with FIPS mode enabled and disabled. We've used `OpenSSL 1.0.1j-fips`. Here are all the cipher suites available when the **FIPS** mode is **enabled** (the list may vary for different openssl versions): From 934cfd46ecc9f04a9ced0f5f8ab8584221e2ef30 Mon Sep 17 00:00:00 2001 From: vkatsuba Date: Tue, 21 Sep 2021 15:56:00 +0300 Subject: [PATCH 10/13] Update info for stop support OTP 22 in doc/tutorials/How-to-build.md --- doc/tutorials/How-to-build.md | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/tutorials/How-to-build.md b/doc/tutorials/How-to-build.md index ef77c7eb4af..e8239264e9a 100644 --- a/doc/tutorials/How-to-build.md +++ b/doc/tutorials/How-to-build.md @@ -17,19 +17,19 @@ To compile MongooseIM you need: * Make: `make`, * C and C++ compiler: `gcc`, `gcc-c++`, - * Erlang/OTP 21.2 or higher: + * Erlang/OTP 23.3 or higher: * `erlang` package, or, * `esl-erlang` from [Erlang Solutions website](https://www.erlang-solutions.com/resources/download.html), or, * install using [kerl](https://github.com/kerl/kerl), * OpenSSL 0.9.8 or higher, for STARTTLS, SASL and SSL encryption: `openssl` and `openssl-devel`, * ODBC library: `unixODBC-devel`, * Zlib 1.2.3 or higher: `zlib-devel`. - + === "Ubuntu" * Make: `make`, * C and C++ compiler: `gcc`, `g++`, - * Erlang/OTP 21.2 or higher: + * Erlang/OTP 23.3 or higher: * `erlang` package, or, * `esl-erlang` from [Erlang Solutions website](https://www.erlang-solutions.com/resources/download.html), or, * install using [kerl](https://github.com/kerl/kerl), @@ -40,7 +40,7 @@ To compile MongooseIM you need: === "macOS" * Make, C and C++ compiler: Xcode Command Line Tools, - * Erlang/OTP 21.2 or higher: + * Erlang/OTP 23.3 or higher: * [`erlang`](https://formulae.brew.sh/formula/erlang) from Homebrew, * install using [kerl](https://github.com/kerl/kerl), * OpenSSL 0.9.8 or higher, for STARTTLS, SASL and SSL encryption: [`openssl`](https://formulae.brew.sh/formula/openssl@1.1) from Homebrew @@ -51,55 +51,55 @@ To compile MongooseIM you need: === "centOS" Please install the required dependencies: - + ```bash sudo yum install git make zlib-devel openssl openssl-devel unixODBC-devel gcc gcc-c++ erlang ``` - + Now, please proceed to the "Building" section. === "Ubuntu" Please install the required dependencies: - + ```bash sudo apt install git make zlib1g-dev libssl-dev unixodbc-dev gcc g++ erlang ``` - + Now, please proceed to the "Building" section. === "macOS" **Step 1** - + Install [Homebrew](http://brew.sh) to manage packages on your Mac. You may use a different package manager but you'll need to figure out the package names and file paths on your own. - + **Step 2** - + Install Xcode Command Line Tools. - + ```bash xcode-select --install # install compilation tools ``` - + **Step 3** - + Install dependencies with Brew. - + ```bash brew install erlang openssl unixodbc ``` - + **Step 4** - + Add OpenSSL paths to the compiler and linker environment variables: - + ```bash export LDFLAGS="-L/usr/local/opt/openssl/lib" export CFLAGS="-I/usr/local/opt/openssl/include" ``` - + Now, please proceed to the "Building" section. From 20ef1c57d7309ffe2ee93777bf2f7cc35fc919ff Mon Sep 17 00:00:00 2001 From: vkatsuba Date: Tue, 21 Sep 2021 16:26:49 +0300 Subject: [PATCH 11/13] Update amqp_client to 3.9.5 --- big_tests/rebar.config | 2 +- big_tests/rebar.lock | 12 ++++++------ rebar.config | 2 +- rebar.lock | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/big_tests/rebar.config b/big_tests/rebar.config index dee4f2217f4..d43240b20c1 100644 --- a/big_tests/rebar.config +++ b/big_tests/rebar.config @@ -18,7 +18,7 @@ {escalus, "4.2.5"}, {cowboy, "2.9.0"}, {csv, "3.0.3", {pkg, csve}}, - {amqp_client, "3.9.1"}, + {amqp_client, "3.9.5"}, {esip, "1.0.43"}, {jid, "1.0.0", {pkg, mongoose_jid}} ]}. diff --git a/big_tests/rebar.lock b/big_tests/rebar.lock index 656da65f8fa..d4c244c477c 100644 --- a/big_tests/rebar.lock +++ b/big_tests/rebar.lock @@ -1,5 +1,5 @@ {"1.2.0", -[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.9.1">>},0}, +[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.9.5">>},0}, {<<"base16">>,{pkg,<<"base16">>,<<"2.0.0">>},0}, {<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.10.0">>},0}, {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.9.0">>},0}, @@ -25,7 +25,7 @@ {<<"p1_utils">>,{pkg,<<"p1_utils">>,<<"1.0.23">>},1}, {<<"proper">>,{pkg,<<"proper">>,<<"1.4.0">>},0}, {<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.2">>},2}, - {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.9.1">>},1}, + {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.9.5">>},1}, {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1}, {<<"recon">>,{pkg,<<"recon">>,<<"2.5.1">>},2}, {<<"stringprep">>,{pkg,<<"stringprep">>,<<"1.0.25">>},1}, @@ -34,7 +34,7 @@ {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"4.0.3">>},1}]}. [ {pkg_hash,[ - {<<"amqp_client">>, <<"CD798BAC0BDAF578CDC18E0DE257927B4FCDFAAA7A976D73F62064A0613D4701">>}, + {<<"amqp_client">>, <<"BE7B022550F1C0DDFB23A3145FC3D59B5EDB9FDFCC1DD705796C97F77E9EAC98">>}, {<<"base16">>, <<"9DA694FA0778DF31522A1B9EB349BA4AC9063B497234DC49509C1F5C37F336A2">>}, {<<"bbmustache">>, <<"DDC927463F0E95D66CDAC889153AF08015D609124D6D79006C248AD2DE7F6ECD">>}, {<<"cowboy">>, <<"865DD8B6607E14CF03282E10E934023A1BD8BE6F6BACF921A7E2A96D800CD452">>}, @@ -58,7 +58,7 @@ {<<"p1_utils">>, <<"7F94466ADA69BD982EA7BB80FBCA18E7053E7D0B82C9D9E37621FA508587069B">>}, {<<"proper">>, <<"89A44B8C39D28BB9B4BE8E4D715D534905B325470F2E0EC5E004D12484A79434">>}, {<<"quickrand">>, <<"1D73FAA52E0C149FCBC72A63C26135FF68BE8FA7870675C73645896788A7540C">>}, - {<<"rabbit_common">>, <<"78B899F8C83A4F543CDD978F6B181FE335397DD166AD82E1E65E0CE0C0556DB7">>}, + {<<"rabbit_common">>, <<"4F94E901782DB08D2E944BEA8D8537010F724D1E37D7948661E48B887728C2A3">>}, {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>}, {<<"recon">>, <<"430FFA60685AC1EFDFB1FE4C97B8767C92D0D92E6E7C3E8621559BA77598678A">>}, {<<"stringprep">>, <<"15062F6020777A51A96488F29CE9A2D83E3195F92FDF27F25ACC462DFF7D8D82">>}, @@ -66,7 +66,7 @@ {<<"uuid">>, <<"0D1CA9D94CA3B058467BCE20B7706CC816A2BDBBE0574DD008936AE97EA4EBE7">>}, {<<"worker_pool">>, <<"729D98AF0EEF31D10A6027C5AF2EDD4EA7D6CF91E96B03C189BB47F6FDE9667C">>}]}, {pkg_hash_ext,[ - {<<"amqp_client">>, <<"09736C85991720FB18C527F6A31A474CCA4DE1335344CDCAA8720008E1D80EFB">>}, + {<<"amqp_client">>, <<"DC7CD4D35B4AFF28620F7CD58A9B8F394DAD93CF896704B1F770554F5FF20FDE">>}, {<<"base16">>, <<"63067A9F73D2422F15344A1EAF7033C3B339DC64DA0229DE3DF26F0F6F1E4F82">>}, {<<"bbmustache">>, <<"43EFFA3FD4BB9523157AF5A9E2276C493495B8459FC8737144AA186CB13CE2EE">>}, {<<"cowboy">>, <<"2C729F934B4E1AA149AFF882F57C6372C15399A20D54F65C8D67BEF583021BDE">>}, @@ -90,7 +90,7 @@ {<<"p1_utils">>, <<"47F21618694EEEE5006AF1C88731AD86B757161E7823C29B6F73921B571C8502">>}, {<<"proper">>, <<"18285842185BD33EFBDA97D134A5CB5A0884384DB36119FEE0E3CFA488568CBB">>}, {<<"quickrand">>, <<"E21C6C7F29CA995468662085CA54D7D09E861C180A9DFEC2CF4A2E75364A16D6">>}, - {<<"rabbit_common">>, <<"6A03CC1BF03B16134E529E434EE2B17831F6BE10176ED739B1AC55CA9F26FB2E">>}, + {<<"rabbit_common">>, <<"D4F238DF7C2DC67ECECCD1E8A70EAFCC15FDB69DB1E82820533DBE92A229655A">>}, {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>}, {<<"recon">>, <<"5721C6B6D50122D8F68CCCAC712CAA1231F97894BAB779EFF5FF0F886CB44648">>}, {<<"stringprep">>, <<"8E0807D94A6927D1C3F8E76D584A2E3CDD9B4BCB02823EAF96629EDF2A65B104">>}, diff --git a/rebar.config b/rebar.config index ed32e7f0a23..d584259ee6a 100644 --- a/rebar.config +++ b/rebar.config @@ -102,7 +102,7 @@ {gun, "1.3.3"}, {nkpacket, {git, "https://github.com/michalwski/nkpacket.git", {ref, "f7c5349"}}}, {nksip, {git, "https://github.com/NetComposer/nksip.git", {ref, "1a29ef3"}}}, - {amqp_client, "3.8.14"}, + {amqp_client, "3.9.5"}, {eredis, "1.2.0"}, {gen_fsm_compat, "0.3.0"}, {erlang_pmp, "0.1.1"}, diff --git a/rebar.lock b/rebar.lock index 6bc7ad92497..f5979d26220 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,5 +1,5 @@ {"1.2.0", -[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.8.14">>},0}, +[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.9.5">>},0}, {<<"backoff">>,{pkg,<<"backoff">>,<<"1.1.3">>},1}, {<<"base16">>,{pkg,<<"base16">>,<<"2.0.0">>},0}, {<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.10.0">>},0}, @@ -121,7 +121,7 @@ {<<"pooler">>,{pkg,<<"pooler">>,<<"1.5.3">>},1}, {<<"proper">>,{pkg,<<"proper">>,<<"1.4.0">>},0}, {<<"quickrand">>,{pkg,<<"quickrand">>,<<"1.8.0">>},1}, - {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.8.14">>},1}, + {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.9.5">>},1}, {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1}, {<<"re2">>, {git,"https://github.com/dukesoferl/re2.git", @@ -159,7 +159,7 @@ {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"4.0.3">>},0}]}. [ {pkg_hash,[ - {<<"amqp_client">>, <<"7569517AEFB47E0D1C41BCA2F4768DC8A2D88487DAF7819FECCA0D78943F293C">>}, + {<<"amqp_client">>, <<"BE7B022550F1C0DDFB23A3145FC3D59B5EDB9FDFCC1DD705796C97F77E9EAC98">>}, {<<"backoff">>, <<"DE762C05ED6DFAE862D83DC9E58AE936792B01302B3595F5CFFE86F2D8E6C1DD">>}, {<<"base16">>, <<"9DA694FA0778DF31522A1B9EB349BA4AC9063B497234DC49509C1F5C37F336A2">>}, {<<"bbmustache">>, <<"DDC927463F0E95D66CDAC889153AF08015D609124D6D79006C248AD2DE7F6ECD">>}, @@ -199,7 +199,7 @@ {<<"pooler">>, <<"898CD1FA301FC42D4A8ED598CE139B71CA85B54C16AB161152B5CC5FBDCFA1A8">>}, {<<"proper">>, <<"89A44B8C39D28BB9B4BE8E4D715D534905B325470F2E0EC5E004D12484A79434">>}, {<<"quickrand">>, <<"E47CE597FF067385FF5836C8C7706AC7F8AA7B47DD90C6417E05B64696F872FA">>}, - {<<"rabbit_common">>, <<"CC1604891295CD82F34597F1526AC611EA7B6A0E57B3DD79B41CB4224BCC6EC5">>}, + {<<"rabbit_common">>, <<"4F94E901782DB08D2E944BEA8D8537010F724D1E37D7948661E48B887728C2A3">>}, {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>}, {<<"recon">>, <<"430FFA60685AC1EFDFB1FE4C97B8767C92D0D92E6E7C3E8621559BA77598678A">>}, {<<"redbug">>, <<"9153EE50E42C39CE3F6EFA65EE746F4A52896DA66862CFB59E7C0F838B7B8414">>}, @@ -212,7 +212,7 @@ {<<"uuid">>, <<"280014F8FF57FCE36EE6E91C3ECF21CBFCE78AAE9854C09597BB4C11E27B66D6">>}, {<<"worker_pool">>, <<"729D98AF0EEF31D10A6027C5AF2EDD4EA7D6CF91E96B03C189BB47F6FDE9667C">>}]}, {pkg_hash_ext,[ - {<<"amqp_client">>, <<"E5BA3AC18ABBE34A1D990A6BCAC25633DC7061AB8F8D101C7DCFF97F49F4C523">>}, + {<<"amqp_client">>, <<"DC7CD4D35B4AFF28620F7CD58A9B8F394DAD93CF896704B1F770554F5FF20FDE">>}, {<<"backoff">>, <<"30CEAD738D20E4C8D36CD37857DD5E23AEBA57CB868BF64766D47D371422BDFF">>}, {<<"base16">>, <<"63067A9F73D2422F15344A1EAF7033C3B339DC64DA0229DE3DF26F0F6F1E4F82">>}, {<<"bbmustache">>, <<"43EFFA3FD4BB9523157AF5A9E2276C493495B8459FC8737144AA186CB13CE2EE">>}, @@ -252,7 +252,7 @@ {<<"pooler">>, <<"058D85C5081289B90E97E4DDDBC3BB5A3B4A19A728AB3BC88C689EFCC36A07C7">>}, {<<"proper">>, <<"18285842185BD33EFBDA97D134A5CB5A0884384DB36119FEE0E3CFA488568CBB">>}, {<<"quickrand">>, <<"7FFADCF851FB4D1F7BC2952E955623BE63F9C4A6B965FD207CC558D5AEDBB6F9">>}, - {<<"rabbit_common">>, <<"27409E425413CDD3FC2C077CF08226C4A307D56B1467883F26AB3789B2E106D0">>}, + {<<"rabbit_common">>, <<"D4F238DF7C2DC67ECECCD1E8A70EAFCC15FDB69DB1E82820533DBE92A229655A">>}, {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>}, {<<"recon">>, <<"5721C6B6D50122D8F68CCCAC712CAA1231F97894BAB779EFF5FF0F886CB44648">>}, {<<"redbug">>, <<"BFC7BCB8743C55DBE0134DBCB89DD6A57606288CC4E2570ECCD701061FBCBD93">>}, From bac971bd117820e75a9df7421d84faae662a0cd6 Mon Sep 17 00:00:00 2001 From: vkatsuba Date: Tue, 21 Sep 2021 16:29:32 +0300 Subject: [PATCH 12/13] Skip report coverage till time when service coveralls.io will up --- .github/workflows/ci.yml | 47 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d988779591..50ada344b97 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,14 +35,13 @@ jobs: run: tools/test.sh -p $PRESET -s true -e true - name: prepare coverage report run: ./rebar3 codecov analyze --lcov --json false - - name: report coverage - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - flag-name: small_tests on OTP ${{matrix.otp}} - path-to-lcov: ./lcov.info - parallel: true - +# - name: report coverage +# uses: coverallsapp/github-action@master +# with: +# github-token: ${{ secrets.GITHUB_TOKEN }} +# flag-name: small_tests on OTP ${{matrix.otp}} +# path-to-lcov: ./lcov.info +# big_tests: name: ${{matrix.preset}} on OTP ${{matrix.otp}} strategy: @@ -78,23 +77,23 @@ jobs: run: tools/test.sh -p $PRESET -s false -e false - name: prepare coverage report run: ./rebar3 codecov analyze --lcov --json false - - name: report coverage - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - flag-name: ${{matrix.preset}} on OTP ${{matrix.otp}} - path-to-lcov: ./lcov.info - parallel: true +# - name: report coverage +# uses: coverallsapp/github-action@master +# with: +# github-token: ${{ secrets.GITHUB_TOKEN }} +# flag-name: ${{matrix.preset}} on OTP ${{matrix.otp}} +# path-to-lcov: ./lcov.info +# parallel: true - coveralls_webhook: - needs: [big_tests, small_tests] - runs-on: ubuntu-20.04 - steps: - - name: Finish coveralls parallel build - uses: coverallsapp/github-action@v1.1.2 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - parallel-finished: true +# coveralls_webhook: +# needs: [big_tests, small_tests] +# runs-on: ubuntu-20.04 +# steps: +# - name: Finish coveralls parallel build +# uses: coverallsapp/github-action@v1.1.2 +# with: +# github-token: ${{ secrets.GITHUB_TOKEN }} +# parallel-finished: true dialyzer: name: dialyzer on OTP ${{matrix.otp}} From 76fbecee0f566642c1d28e26344137379f7d5479 Mon Sep 17 00:00:00 2001 From: vkatsuba Date: Wed, 22 Sep 2021 11:38:18 +0300 Subject: [PATCH 13/13] Update TLS-hardening.md due to stop support OTP 22 --- doc/configuration/TLS-hardening.md | 5 ++--- rel/files/app.config | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/configuration/TLS-hardening.md b/doc/configuration/TLS-hardening.md index 8a1046ab813..f4795a193e2 100644 --- a/doc/configuration/TLS-hardening.md +++ b/doc/configuration/TLS-hardening.md @@ -40,12 +40,11 @@ In order to change the list, please find the following lines: ``` {protocol_version, ['tlsv1.2' - %, 'tlsv1.3' % supported in OTP >= 22 + %, 'tlsv1.3' ]} ``` -By default only TLS 1.2 is enabled, as 1.3 is not supported by OTPs older than 23.0. -If you are using OTP 23.0 or newer, you may remove leading `%` before `'tlsv1.3'`. +By default only TLS 1.2 is enabled. To enable TLS 1.3, remove leading `%` before `'tlsv1.3'`. The remaining valid values are: `'tlsv1.1'`, `tlsv1`, `sslv3`. This setting affects the following MongooseIM components: diff --git a/rel/files/app.config b/rel/files/app.config index da8bfad8cd3..79970575e82 100644 --- a/rel/files/app.config +++ b/rel/files/app.config @@ -92,7 +92,7 @@ {ssl, [ {session_lifetime, 600}, % 10 minutes {protocol_version, ['tlsv1.2' - %, 'tlsv1.3' % supported in OTP >= 22 + %, 'tlsv1.3' ]} ]}, {nkservice, [