Merge pull request #262 from esl/update_deps

Update deps and test in OTP26

.github/workflows/ci.yml

@@ -11,21 +11,22 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   test:
-    name: OTP ${{matrix.otp}}
+    name: OTP ${{matrix.otp_vsn}}
     strategy:
       matrix:
-        otp: ['25.0', '24.3', '23.3', '22.3', '21.3']
-    runs-on: 'ubuntu-20.04'
+        otp_vsn: ['26.2', '25.3', '24.3']
+        rebar_vsn: ['3.22.0']
+    runs-on: 'ubuntu-22.04'
     env:
-      OTPVER: ${{ matrix.otp }}
+      OTPVER: ${{ matrix.otp_vsn }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: ${{ matrix.otp }}
-      - run: make rebar3
+          otp-version: ${{ matrix.otp_vsn }}
+          rebar3-version: ${{ matrix.rebar_vsn }}
       - run: make mongooseim-start
       - run: make test
       - run: make ct
       - run: make dialyzer
-        if: ${{ matrix.otp == '25.0' }}
+        if: ${{ matrix.otp == '26.2' }}

Makefile

@@ -1,39 +1,25 @@
 .PHONY: all compile test clean
 
-REBARVER = 3.15.2
-ifeq ($(OTPVER),24.3)
-	REBARVER = 3.17.0
-endif
-ifeq ($(OTPVER),25.0)
-	REBARVER = 3.18.0
-endif
-
-REBAR = ./rebar3
-
 all: compile
 
-compile: rebar3
-	$(REBAR) compile
+compile:
+	rebar3 compile
 
-test: rebar3
-	$(REBAR) eunit
+test:
+	rebar3 eunit
 
-clean: rebar3
-	$(REBAR) clean
+clean:
+	rebar3 clean
 
-ct: rebar3
-	$(REBAR) ct
+ct:
+	rebar3 ct
 
-dialyzer: rebar3
-	$(REBAR) dialyzer
+dialyzer:
+	rebar3 dialyzer
 
 mongooseim-start:
 	docker run --rm -d -t -h mongooseim-escalus-test-1 --name mongooseim-escalus-test-1 \
 		-p 5222:5222 -p 8888:8888  -v `pwd`/mongooseim-escalus-test-1:/member mongooseim/mongooseim:2.1.0beta2
 
 mongooseim-stop:
 	docker stop mongooseim-escalus-test-1
-
-rebar3:
-	wget https://github.com/erlang/rebar3/releases/download/${REBARVER}/rebar3 &&\
-	chmod u+x rebar3

rebar.config

@@ -6,20 +6,20 @@
 {require_min_otp_vsn, "21"}.
 
 {deps, [
-        {exml, "3.2.2", {pkg, hexml}},
+        {exml, "3.4.0", {pkg, hexml}},
         {base16, "2.0.1"},
         {meck, "0.9.2"},
         {bbmustache, "1.12.2"},
-        {uuid, "2.0.5", {pkg, uuid_erl}},
-        {gun, "2.0.0-rc.2"},
-        {worker_pool, "6.0.1"},
+        {uuid, "2.0.7", {pkg, uuid_erl}},
+        {gun, "2.0.1"},
+        {worker_pool, "6.2.0"},
         {fast_tls, "1.1.16"},
-        {fast_scram, "0.4.4"}
+        {fast_scram, "0.5.0"}
 ]}.
 
 %% To override the plugin as installed by worker_pool
 {project_plugins,
- [{rebar3_codecov, "0.6.0"}]}.
+ [rebar3_hex, {rebar3_codecov, "0.6.0"}]}.
 
 {relx, [{release, {escalus, "0.0.1"},
          [escalus]},

rebar.lock

@@ -1,44 +1,44 @@
 {"1.2.0",
 [{<<"base16">>,{pkg,<<"base16">>,<<"2.0.1">>},0},
  {<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.12.2">>},0},
- {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},1},
- {<<"exml">>,{pkg,<<"hexml">>,<<"3.2.2">>},0},
+ {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.12.1">>},1},
+ {<<"exml">>,{pkg,<<"hexml">>,<<"3.4.0">>},0},
  {<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"1.0.3">>},1},
- {<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.4.4">>},0},
+ {<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.5.0">>},0},
  {<<"fast_tls">>,{pkg,<<"fast_tls">>,<<"1.1.16">>},0},
- {<<"gun">>,{pkg,<<"gun">>,<<"2.0.0-rc.2">>},0},
+ {<<"gun">>,{pkg,<<"gun">>,<<"2.0.1">>},0},
  {<<"meck">>,{pkg,<<"meck">>,<<"0.9.2">>},0},
  {<<"p1_utils">>,{pkg,<<"p1_utils">>,<<"1.0.25">>},1},
- {<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.5">>},1},
- {<<"uuid">>,{pkg,<<"uuid_erl">>,<<"2.0.5">>},0},
- {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"6.0.1">>},0}]}.
+ {<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.7">>},1},
+ {<<"uuid">>,{pkg,<<"uuid_erl">>,<<"2.0.7">>},0},
+ {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"6.2.0">>},0}]}.
 [
 {pkg_hash,[
  {<<"base16">>, <<"F0549F732E03BE8124ED0D19FD5EE52146CC8BE24C48CBC3F23AB44B157F11A2">>},
  {<<"bbmustache">>, <<"0CABDCE0DB9FE6D3318131174B9F2B351328A4C0AFBEB3E6E99BB0E02E9B621D">>},
- {<<"cowlib">>, <<"0B9FF9C346629256C42EBE1EEB769A83C6CB771A6EE5960BD110AB0B9B872063">>},
- {<<"exml">>, <<"64D99A630DC0161645DFF0D28B1C089A90827B7849232616636BC32AEBA76723">>},
+ {<<"cowlib">>, <<"A9FA9A625F1D2025FE6B462CB865881329B5CAFF8F1854D1CBC9F9533F00E1E1">>},
+ {<<"exml">>, <<"18F9B02107E14F6CCDEFBDB7FEB0706C56AD3AFD0DD524BDD1F0ECD98746B9BC">>},
  {<<"fast_pbkdf2">>, <<"4F09D6C6C20DBEE1970E0A6AE91432E1B7731F88426C671D083BAC31FFA1FDAD">>},
- {<<"fast_scram">>, <<"299A2D430955A62A94CB43B1A727C5D21A5C4BD11AEBA476AE2F3A24CFBE89C3">>},
+ {<<"fast_scram">>, <<"BD0B946911B07D36EC22AD950FF22F77F27B94E4E24452AF966597C6D8CB5E7F">>},
  {<<"fast_tls">>, <<"85FA7F3112EA4FF5CCB4F3ABADC130A8C855AD74EB00869487399CB0C322D208">>},
- {<<"gun">>, <<"7C489A32DEDCCB77B6E82D1F3C5A7DADFBFA004EC14E322CDB5E579C438632D2">>},
+ {<<"gun">>, <<"160A9A5394800FCBA41BC7E6D421295CF9A7894C2252C0678244948E3336AD73">>},
  {<<"meck">>, <<"85CCBAB053F1DB86C7CA240E9FC718170EE5BDA03810A6292B5306BF31BAE5F5">>},
  {<<"p1_utils">>, <<"2D39B5015A567BBD2CC7033EEB93A7C60D8C84EFE1EF69A3473FAA07FA268187">>},
- {<<"quickrand">>, <<"06FCAD85CB47D5C85C51D6BC9C84A082501BA098A89D64AD0A2F69599E034C04">>},
- {<<"uuid">>, <<"60FAEEB7EDFD40847ED13CB0DD1044BAABE4E79A00C0CA9C4D13A073914B1016">>},
- {<<"worker_pool">>, <<"CA262C2DFB3B4AF661B206C82065D86F83922B7227508AA6E0BC34D3E5AE5135">>}]},
+ {<<"quickrand">>, <<"D2BD76676A446E6A058D678444B7FDA1387B813710D1AF6D6E29BB92186C8820">>},
+ {<<"uuid">>, <<"B2078D2CC814F53AFA52D36C91E08962C7E7373585C623F4C0EA6DFB04B2AF94">>},
+ {<<"worker_pool">>, <<"506DE38C528A81ED2C6A80A419B83DDE6DA5E295BD320BDF4D35A69AFEB0247A">>}]},
 {pkg_hash_ext,[
  {<<"base16">>, <<"06EA2D48343282E712160BA89F692B471DB8B36ABE8394F3445FF9032251D772">>},
  {<<"bbmustache">>, <<"688B33A4D5CC2D51F575ADF0B3683FC40A38314A2F150906EDCFC77F5B577B3B">>},
- {<<"cowlib">>, <<"2B3E9DA0B21C4565751A6D4901C20D1B4CC25CBB7FD50D91D2AB6DD287BC86A9">>},
- {<<"exml">>, <<"8AF1F6BEDECFD0137DC42887BFB9A3F80BB46D390178D6FEDA6ACDCFD0E14D87">>},
+ {<<"cowlib">>, <<"163B73F6367A7341B33C794C4E88E7DBFE6498AC42DCD69EF44C5BC5507C8DB0">>},
+ {<<"exml">>, <<"5F73224B784D45C743A949FC5AF4BB441B6B546B3D9883C0441D45401505ADD2">>},
  {<<"fast_pbkdf2">>, <<"2900431E2E6402F23A92754448BBD949DA366BC9C984FDC791DDCFCC41042434">>},
- {<<"fast_scram">>, <<"4B30084E3BDB39158076381FC871035BEFD157D5EE614BDA5E19EA482855E5D5">>},
+ {<<"fast_scram">>, <<"D45B746B8D17C0F73A94CBDB526E115A4AEDFECB4D42CA935BCB1195D783B4E1">>},
  {<<"fast_tls">>, <<"AA08CCA89B4044E74F1F12E399817D8BEAEAE3EE006C98A893C0BFB1D81FBA51">>},
- {<<"gun">>, <<"6B9D1EAE146410D727140DBF8B404B9631302ECC2066D1D12F22097AD7D254FC">>},
+ {<<"gun">>, <<"A10BC8D6096B9502205022334F719CC9A08D9ADCFBFC0DBEE9EF31B56274A20B">>},
  {<<"meck">>, <<"81344F561357DC40A8344AFA53767C32669153355B626EA9FCBC8DA6B3045826">>},
  {<<"p1_utils">>, <<"9219214428F2C6E5D3187FF8EB9A8783695C2427420BE9A259840E07ADA32847">>},
- {<<"quickrand">>, <<"252CF0493570EBF1A58985CB71990982CDDCD4396B6427F1E10CF58924C1C052">>},
- {<<"uuid">>, <<"E54373262CA88401689277947C54B95E9ECBC977BD5C57C9DD44AD9DA278E360">>},
- {<<"worker_pool">>, <<"772E12CCB26909EA7F804B52E86E733DF66BB8150F683B591B0A762196494C74">>}]}
+ {<<"quickrand">>, <<"B8ACBF89A224BC217C3070CA8BEBC6EB236DBE7F9767993B274084EA044D35F0">>},
+ {<<"uuid">>, <<"4E4C5CA3461DC47C5E157ED42AA3981A053B7A186792AF972A27B14A9489324E">>},
+ {<<"worker_pool">>, <<"E1DED160797FBE656AD683109DBD741B520097DF17BDF7B51E3E4697073A6E62">>}]}
 ].

src/escalus_connection.erl

@@ -422,7 +422,7 @@ use_zlib(#client{module = Mod, rcv_pid = Pid}) ->
 
 -spec upgrade_to_tls(client()) -> ok.
 upgrade_to_tls(#client{module = Mod, rcv_pid = Pid, props = Props}) ->
-    SSLOpts = proplists:get_value(ssl_opts, Props, []),
+    SSLOpts = proplists:get_value(ssl_opts, Props, [[{verify, verify_none}]]),
     Mod:upgrade_to_tls(Pid, SSLOpts).
 
 wait_for_close(Client) ->

src/escalus_tcp.erl

@@ -337,7 +337,7 @@ default_options() ->
       on_connect        => fun(_) -> ok end,
       event_client      => undefined,
       socket_opts       => default_socket_options(),
-      ssl_opts          => [],
+      ssl_opts          => [{verify, verify_none}],
       parser_opts       => []}.
 
 -spec default_socket_options() -> [gen_tcp:connect_option()].