diff --git a/apps/epp_proxy/src/epp_tcp_acceptor.erl b/apps/epp_proxy/src/epp_tcp_acceptor.erl index 35a0ee1..5f01482 100644 --- a/apps/epp_proxy/src/epp_tcp_acceptor.erl +++ b/apps/epp_proxy/src/epp_tcp_acceptor.erl @@ -24,7 +24,8 @@ init(Port) -> {ok, #state{socket=ListenSocket, port=Port, options=Options}}. -handle_cast(accept, State = #state{socket=ListenSocket, port=Port, options=Options}) -> +handle_cast(accept, + State = #state{socket=ListenSocket, port=Port, options=Options}) -> {ok, AcceptSocket} = gen_tcp:accept(ListenSocket), {ok, NewOwner} = create_worker(AcceptSocket), ok = gen_tcp:controlling_process(AcceptSocket, NewOwner), diff --git a/apps/epp_proxy/src/epp_tcp_worker.erl b/apps/epp_proxy/src/epp_tcp_worker.erl index a9fa545..6302461 100644 --- a/apps/epp_proxy/src/epp_tcp_worker.erl +++ b/apps/epp_proxy/src/epp_tcp_worker.erl @@ -7,8 +7,6 @@ -export([init/1, handle_cast/2, handle_call/3, start_link/1]). -export([code_change/3]). --export([request/3]). - -record(state,{socket, length, session_id}). -record(request,{method, url, body, cookies, headers}). diff --git a/apps/epp_proxy/src/epp_util.erl b/apps/epp_proxy/src/epp_util.erl index 73666a2..a3e954a 100644 --- a/apps/epp_proxy/src/epp_util.erl +++ b/apps/epp_proxy/src/epp_util.erl @@ -1,11 +1,19 @@ -module(epp_util). -export([create_map/1, create_session_id/1, frame_length/1, - frame_length_to_receive/1, frame_length_to_send/1]). + frame_length_to_receive/1, frame_length_to_send/1, + session_id/1]). -define(OFFSET, 4). -% Give me a process id, I'll create a random map for you. +%% Given a pid, return a sha512 hash of unique attributes. +-spec session_id(pid()) -> list(char()). +session_id(Pid) -> + UniqueMap = create_map(Pid), + BinaryHash = create_session_id(UniqueMap), + BinaryHash. + +%% Give me a process id, I'll create a random map for you. -spec create_map(pid()) -> #{string() => pid(), string() => float(), string() => string()}. create_map(Pid) when is_pid(Pid) -> diff --git a/apps/epp_proxy/test/epp_util_tests.erl b/apps/epp_proxy/test/epp_util_tests.erl index d4ea680..913466b 100644 --- a/apps/epp_proxy/test/epp_util_tests.erl +++ b/apps/epp_proxy/test/epp_util_tests.erl @@ -2,6 +2,12 @@ -include_lib("eunit/include/eunit.hrl"). +session_id_test() -> + Pid = spawn(fun () -> ok end), + SessionId = epp_util:session_id(Pid), + ?assert(is_list(SessionId)), + ?assert(length(SessionId) > 0). + create_map_test() -> Pid = spawn(fun () -> ok end), Map = epp_util:create_map(Pid), diff --git a/config/test.config b/config/test.config index 06b167d..90e781d 100644 --- a/config/test.config +++ b/config/test.config @@ -1,6 +1,9 @@ [ - {epp_proxy, [{tcp_port, 1133}, - {tls_port, 4444}, + {epp_proxy, [{tcp_port, 17001, + {tls_port, 17002}, {epp_session_url, "https://registry.test/epp/session/"}, - {epp_command_url, "https://registry.test/epp/command/"}]} + {epp_command_url, "https://registry.test/epp/command/"}, + {cacertfile_path, "/opt/shared/ca/certs/ca.crt.pem"}, + {certfile_path, "/opt/shared/ca/certs/ca.crt.pem"}, + {keyfile_path, "/opt/shared/ca/certs/ca.crt.pem"}]} ]. diff --git a/rebar.config b/rebar.config index 50522dc..fefe538 100644 --- a/rebar.config +++ b/rebar.config @@ -5,7 +5,6 @@ [epp_proxy, hackney, sasl, - ssl, xmerl]}, {sys_config, "./config/sys.config"},