Merge pull request #28 from erlcloud/rebar3

Use rebar3 for building/tests on repo

.gitignore

@@ -1,4 +1,6 @@
 ebin/*
+_build
+rebar.lock
 
 doc/edoc-info
 doc/*.html
@@ -8,6 +10,7 @@ util/*.beam
 cover_report/
 test/*.beam
 test/*.log
+TEST-*
 
 .eunit
 

Makefile

@@ -1,9 +1,8 @@
-.PHONY: all release compile test clean rel doc build-plt dialyzer
+.PHONY: all release compile test clean doc dialyzer
 
 PROJECT = lhttpc
 
-REBAR := ./rebar
-DIALYZER = dialyzer
+REBAR := ./rebar3
 
 APPS = kernel stdlib sasl inets ssl public_key crypto compiler
 
@@ -13,7 +12,7 @@ compile:
 	$(REBAR) compile
 
 doc:
-	$(REBAR) doc
+	$(REBAR) edoc
 
 test:	compile
 	$(REBAR) eunit
@@ -24,11 +23,5 @@ release: all dialyze test
 clean:
 	$(REBAR) clean
 
-build-plt: compile
-	@$(DIALYZER) --build_plt --output_plt .$(PROJECT).plt \
-		--apps $(APPS)
-
 dialyzer:
-	@$(DIALYZER) --fullpath  --src ./src \
-		--plt .$(PROJECT).plt --no_native \
-		-Werror_handling  #-Wrace_conditions
+	@$(REBAR) dialyzer

test/crt.pem

@@ -1,17 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIICqzCCAhQCCQCDYWGxYNaErjANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC
-VUsxDzANBgNVBAgTBkVybGFuZzEPMA0GA1UEBxMGTG9uZG9uMSwwKgYDVQQKEyNF
-cmxhbmcgVHJhaW5pbmcgYW5kIENvbnN1bHRpbmcgTHRkLjEPMA0GA1UEAxMGbGh0
-dHBjMSkwJwYJKoZIhvcNAQkBFhpjb2RlQGVybGFuZy1jb25zdWx0aW5nLmNvbTAe
-Fw0wOTA2MDYxNjA2MThaFw0xMDA2MDYxNjA2MThaMIGZMQswCQYDVQQGEwJVSzEP
-MA0GA1UECBMGRXJsYW5nMQ8wDQYDVQQHEwZMb25kb24xLDAqBgNVBAoTI0VybGFu
-ZyBUcmFpbmluZyBhbmQgQ29uc3VsdGluZyBMdGQuMQ8wDQYDVQQDEwZsaHR0cGMx
-KTAnBgkqhkiG9w0BCQEWGmNvZGVAZXJsYW5nLWNvbnN1bHRpbmcuY29tMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6YrA5HIBj817qplKlRaU3dkCnnZtKS666
-lRbqsdj3Fug7ezANmUrUZIGMTDOAwYg3E2JPAL1VOiPmi/ENlanLTyOp2SkqYLfR
-59Z5wr1nE/iAC+es7WT2OPjXG7MIBvnM7FNpHY17F4MM0FWWm+LJyJRucUZHL964
-nw0c2xZ3fwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAHRPJK72okG7u//YgJ1zIHzi
-P8xtoUqwRikNNK1Zf1//xrgMFdsX4M7ZrX+SJ5ArXXpvy8iUbx81m9w+tuEyqdnl
-VbBherAqLi2XmwJFu2n6TIfJB2eUjZg95lUbIJsNuiqL05/LNthFdkVAvyi8nTC4
-KAqPDQhDdvpmaBZDKE1L
+MIIDqTCCApGgAwIBAgIUXe7MeBW4fy+lR+RXSNj4DrQesH0wDQYJKoZIhvcNAQEL
+BQAwYzELMAkGA1UEBhMCWFgxDTALBgNVBAgMBEJFQU0xDzANBgNVBAcMBkVybGFu
+ZzEOMAwGA1UECgwFTEhUVFAxETAPBgNVBAsMCFVuaXRUZXN0MREwDwYDVQQDDAhU
+ZXN0Q2VydDAgFw0yNDA2MDQwNTM5NDNaGA8yMTI0MDUxMTA1Mzk0M1owYzELMAkG
+A1UEBhMCWFgxDTALBgNVBAgMBEJFQU0xDzANBgNVBAcMBkVybGFuZzEOMAwGA1UE
+CgwFTEhUVFAxETAPBgNVBAsMCFVuaXRUZXN0MREwDwYDVQQDDAhUZXN0Q2VydDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKxLlqXggR5+JIzF3/a4G8al
+BKm1cX299p1N8JmRpPajipKok2xpuZxX1sxVNgQ4rBk6Vufo1CGKCaZbvnpqP8Rp
+YSzJljAMH7ndZK2dZlQjN0hdsR9zanb3ir6P8J2K3wttwbWWkE2SpgzOtLsaLW/N
+4swOgg3E7JbTIy4H73nacxqmLN89Cnfor+DUTvEMqs1CictGz2zPNEhbTF6jATZX
+Ewvqsll4Xp0TdQGBeQZrUeOwO9rGeM7XtPJZaQ6IWaL3Np32R+sBK7O6MmUe+FE3
+/IsuTUV6xjvSmQGBCO8lEG7PNcxSiGH8KHRsByewMeFXlh5QkWycPPOQzrlQRpUC
+AwEAAaNTMFEwHQYDVR0OBBYEFMFvhToOjxW52FzjrfuAt/bDJBnTMB8GA1UdIwQY
+MBaAFMFvhToOjxW52FzjrfuAt/bDJBnTMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAG5b+SCpfARbaRL2Ek99IgcExFGruka/rOEuQ8nquMujPt40
++Fs807qcU9pRxFxpIa9Gor8K6phK5uWL9owExPUG81D2y/cNCpC2/RU9d2wiFAWd
+cWzhI5WoEL6JC1XltgyK/U5IE5shs87SKNgxQYx+Lg7XJRBjLfbc3rH+rM3wXgBt
+eWOiApQBTslad+M4kX0Ga42m+fYZs/AnFylpCu2MNLYyXxbl2ipBWfFuXadXgEMB
+goazxiXjsamk5dbLq7lYO0NTU4MiZbI8S9SPoXPybxM8Kd7yiTpFlbNC0OeBihpV
+NX6NKcN1HYOzzVothXBwzUpK+zimqgrJXFUc3pU=
 -----END CERTIFICATE-----

test/key.pem

@@ -1,15 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC6YrA5HIBj817qplKlRaU3dkCnnZtKS666lRbqsdj3Fug7ezAN
-mUrUZIGMTDOAwYg3E2JPAL1VOiPmi/ENlanLTyOp2SkqYLfR59Z5wr1nE/iAC+es
-7WT2OPjXG7MIBvnM7FNpHY17F4MM0FWWm+LJyJRucUZHL964nw0c2xZ3fwIDAQAB
-AoGAWpvnd5w3fl+t4P0CaH43F4NRYyrnd3LberFH9siG5XgpZeE5NyMykZZatE3H
-K+zpv3yY6jc909Tz5vxZL3V2mR5r5O8PulteyZ8gHKVMD3c//xhPjcVMOg2j/wB1
-QLDvL8qL7tDv53uYKyy3fVud9ao8xbNtoL+pzpMGE3CdlqECQQDxTyrQ0OE9+/1Q
-xM0Oa7b48R3ncL/zv5sXB7Melr2j27CIxm04DXi9CnWVYMvlgWYZ5nBBMOZixTZA
-YSq7tkmFAkEAxbuHNGeCSffccv5LsVMIHLRYZr/WBRqkbim8K76XaSD/ao9BR/T/
-ZobOiYTD36eKw4TzKXfKkMiHcPyRGb4qMwJBAIXFmHu4QBWnmy9qWi7TYdSxfh1u
-cMsEfkqPFyou8KRkxoGcVrHLLhLGOJb92Sq6yEo1aCeLnzxEDaY094amMC0CQQCo
-JlVQJ0YRCQsbb02HOokHgAY9Op4SMRnr5On0eVvhNwJ9590oCBy5X6J8J786jwve
-QU1X0lsczKsBVoc+UQ0pAkBO/+utKl2jt0LYHi+ZOsvLgLoYKy7y+304MsId3Hfi
-oZpxA0a5ctG1tHpBAjJJfO1at4Dpy67nkQNc3CAhrsSn
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCsS5al4IEefiSM
+xd/2uBvGpQSptXF9vfadTfCZkaT2o4qSqJNsabmcV9bMVTYEOKwZOlbn6NQhigmm
+W756aj/EaWEsyZYwDB+53WStnWZUIzdIXbEfc2p294q+j/Cdit8LbcG1lpBNkqYM
+zrS7Gi1vzeLMDoINxOyW0yMuB+952nMapizfPQp36K/g1E7xDKrNQonLRs9szzRI
+W0xeowE2VxML6rJZeF6dE3UBgXkGa1HjsDvaxnjO17TyWWkOiFmi9zad9kfrASuz
+ujJlHvhRN/yLLk1FesY70pkBgQjvJRBuzzXMUohh/Ch0bAcnsDHhV5YeUJFsnDzz
+kM65UEaVAgMBAAECggEACF43d+D6hG+d+NRXd1UjzDcRjeiJFZFXW/aAHAVN3Mi+
+nzbeyiIsaKJ/hTcSQ4w5F5SUyfit7N8WbuT/0FQ+upxfotw7liPQmqddD22YnbeE
+JNigFKX3YsXNEEpPZmdrQ9PV16rzYUEhHXggoQG5eTenrz95I5AP6Zdhmwe5otJb
+4Z4fuwJtrwgpX4CMmG+Xyn7lfGICUxgvhgifMXMb2izyPNsy7sIwUMofLKEhR+TP
+WSIjmZWBPK5QukFyCCMtyBKsEM7lfjGTQChN4QymU64nPRZ3l+eau2C+7AghSe5i
+wy6ihcszHbRpdUtbTr5d8xVny2H6GTHzrmjO9ODKYQKBgQDYx6BHKZuFeC9CXSLP
+FKuQtuLTIieO9UoW2Alk9wA8O1tOzp0i0sDCFCW2KX4P6OCpCb0ghzoHgaKWQ7No
+lenGD8CsnQAOiQeRDxWoqGuCiC5//bDKc37Bu0Y391DrHviz2IVZx8MVV8TyXfJl
+sL3zdCZYFbiUPUvnlNsJDNTh2QKBgQDLd531D3SV2gQxTSt/8UZ2VJG9oqXpHVHp
+3gLTX2hvdp3LVTw0kQCNk8BOllw1o9kOhBg0hboPKlaLdFMjfZbIEuUisk6W6ZHl
+yKEoOxcUR+mk086wEiZFaIroQYSKEDg1iL6p4I0fziyphkiuuiETw4rttCnYamx+
+Mq1MQPiZHQKBgHDLTgY5DAbihhSNyXLeWnat8k/RUav8zVQdjKXQL3snl1bmArT/
+2/Qf749c/47fqSXLP3ERa4xEU4jEKTGd70lzINmvxzvI6Pr9UlOzbl045pkKM1bj
+yWycOOkd8iiksNtDKf+RBVyxknRZlap70BpAsULb6nKXgks5FM8cshfhAoGBAJKJ
+s9mrJ+xE+IAJdCrROk4+2jgZzCP4WeZ1XtOdAzpD06F94b56MEvG/dmbsQ1w1AMA
+X+5z4WzKsUn+nWISMWYnNZ+ni7Jkxg8YT/kJlbWllUCAy3tDlwymHmTnyu0kgVcN
+BUST1Q/zDXeKnw44P1pcmtJXz0tuWnUJSoaAxIqBAoGAXTsaZUyQD0iVJyWj4+XL
+w2FAtySizO7Zzs9vsuzWA9FYqgXQzxPps3BoanJULCcuCKMfvX7gV5iPImweuNQH
+CawuLM8xBeClEl8KvYeNnKD01TMHBqDO/IMhQwOR9bKhiKkbAmSc24GgZc3ceVN4
+XTEwkKV0OmaRHr05PmNMp40=
+-----END PRIVATE KEY-----

test/lhttpc_tests.erl

@@ -729,7 +729,7 @@ close_connection() ->
 ssl_get() ->
     Port = start(ssl, [fun simple_response/5]),
     URL = ssl_url(Port, "/simple"),
-    {ok, Response} = lhttpc:request(URL, "GET", [], 1000),
+    {ok, Response} = lhttpc:request(URL, "GET", [], [], 1000, [{connect_options, [{verify, verify_none}]}]),
     ?assertEqual({200, "OK"}, status(Response)),
     ?assertEqual(<<?DEFAULT_STRING>>, body(Response)).
 
@@ -740,7 +740,7 @@ ssl_get_ipv6() ->
             ?debugMsg("WARNING: impossible to test IPv6 support~n");
         Port when is_number(Port) ->
             URL = ssl_url(inet6, Port, "/simple"),
-            {ok, Response} = lhttpc:request(URL, "GET", [], 1000),
+            {ok, Response} = lhttpc:request(URL, "GET", [], [], 1000, [{connect_options, [{verify, verify_none}]}]),
             ?assertEqual({200, "OK"}, status(Response)),
             ?assertEqual(<<?DEFAULT_STRING>>, body(Response))
     end.
@@ -750,21 +750,21 @@ ssl_post() ->
     URL = ssl_url(Port, "/simple"),
     Body = "SSL Test <o/",
     BinaryBody = list_to_binary(Body),
-    {ok, Response} = lhttpc:request(URL, "POST", [], Body, 1000),
+    {ok, Response} = lhttpc:request(URL, "POST", [], Body, 1000, [{connect_options, [{verify, verify_none}]}]),
     ?assertEqual({200, "OK"}, status(Response)),
     ?assertEqual(BinaryBody, body(Response)).
 
 ssl_chunked() ->
     Port = start(ssl, [fun chunked_response/5, fun chunked_response_t/5]),
     URL = ssl_url(Port, "/ssl_chunked"),
-    FirstResult = lhttpc:request(URL, get, [], 100),
+    FirstResult = lhttpc:request(URL, get, [], [], 100, [{connect_options, [{verify, verify_none}]}]),
     ?assertMatch({ok, _}, FirstResult),
     {ok, FirstResponse} = FirstResult,
     ?assertEqual({200, "OK"}, status(FirstResponse)),
     ?assertEqual(<<?DEFAULT_STRING>>, body(FirstResponse)),
     ?assertEqual("chunked", lhttpc_lib:header_value("transfer-encoding",
             headers(FirstResponse))),
-    SecondResult = lhttpc:request(URL, get, [], 100),
+    SecondResult = lhttpc:request(URL, get, [], [], 100, [{connect_options, [{verify, verify_none}]}]),
     {ok, SecondResponse} = SecondResult,
     ?assertEqual({200, "OK"}, status(SecondResponse)),
     ?assertEqual(<<"Again, great success!">>, body(SecondResponse)),

test/webserver.erl

@@ -121,9 +121,9 @@ listen(ssl, Addr, Family) ->
         binary,
         {active, false},
         {ip, Addr},
-        {verify,0},
-        {keyfile, "../test/key.pem"},
-        {certfile, "../test/crt.pem"}
+        {verify, verify_none},
+        {keyfile, "test/key.pem"},
+        {certfile, "test/crt.pem"}
     ],
     {ok, LS} = ssl:listen(0, Opts),
     LS;
@@ -145,9 +145,18 @@ get_addr(Host, Family) ->
             {error, family_not_supported}
     end.
 
+% ssl:ssl_accept was deprecated in OTP 21
+-define(SSL_HANDSHAKE(SslSocket), {ssl:ssl_accept(SslSocket), SslSocket}).
+-ifdef(OTP_RELEASE).
+    -if(?OTP_RELEASE >= 21).
+        -undef(SSL_HANDSHAKE).
+        -define(SSL_HANDSHAKE(SslSocket), ssl:handshake(SslSocket)).
+    -endif.
+-endif.
+
 accept(ssl, ListenSocket) ->
-    {ok, Socket} = ssl:transport_accept(ListenSocket, 10000),
-    ok = ssl:ssl_accept(Socket),
+    {ok, SslSocket} = ssl:transport_accept(ListenSocket, 10000),
+    {ok, Socket} = ?SSL_HANDSHAKE(SslSocket),
     Socket;
 accept(Module, ListenSocket) ->
     {ok, Socket} = Module:accept(ListenSocket, 1000),