anlicheng/iot_cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ssl protol

Browse Source
This commit is contained in:
anlicheng 2026-04-27 11:14:58 +08:00
parent f0facb3691
commit bc0f906f66
3 changed files with 77 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/host/iot_host.erl
View File

@ -125,17 +125,17 @@ remove_container(Pid, ContainerName) when is_pid(Pid), is_binary(ContainerName)
container_call(Pid, docker_container_builder:remove_request(ContainerName)). container_call(Pid, docker_container_builder:remove_request(ContainerName)).
-spec await_reply(Pid :: pid(), Ref :: reference(), Timeout :: integer()) -> -spec await_reply(Pid :: pid(), Ref :: reference(), Timeout :: integer()) ->
{ok, Result :: term()} | {error, Code :: integer(), Reason :: binary()}. {ok, Result :: term()} | {error, Reason :: term()}.
await_reply(Pid, Ref, Timeout) when is_pid(Pid), is_reference(Ref), is_integer(Timeout) -> await_reply(Pid, Ref, Timeout) when is_pid(Pid), is_reference(Ref), is_integer(Timeout) ->
receive receive
{request_reply, Ref, {ok, Result}} -> {request_reply, Ref, {ok, Result}} ->
{ok, Result}; {ok, Result};
{request_reply, Ref, {error, Code, Reason}} when is_integer(Code), is_binary(Reason) -> {request_reply, Ref, {error, Reason}} ->
{error, Code, Reason} {error, Reason}
after Timeout -> after Timeout ->
ok = gen_statem:call(Pid, {cancel_request_call, Ref}), ok = gen_statem:call(Pid, {cancel_request_call, Ref}),
flush_reply(Ref), flush_reply(Ref),
{error, -1, <<"timeout">>} {error, timeout}
end. end.
-spec pub(Pid :: pid(), Topic :: binary(), Qos :: integer(), Content :: binary()) -> ok | {error, Reason :: any()}. -spec pub(Pid :: pid(), Topic :: binary(), Qos :: integer(), Content :: binary()) -> ok | {error, Reason :: any()}.

53
src/transport/http/container_handler.erl
View File

@ -26,8 +26,8 @@ handle_request("GET", "/container/get_all", #{<<"uuid">> := UUID}, _) when is_bi
case iot_host:await_reply(Pid, Ref, ?REQ_TIMEOUT) of case iot_host:await_reply(Pid, Ref, ?REQ_TIMEOUT) of
{ok, Result} -> {ok, Result} ->
{ok, 200, request_success_response(Result)}; {ok, 200, request_success_response(Result)};
{error, Code, Reason} -> {error, Reason} ->
request_error_http_response(Code, Reason) request_error_http_response(Reason)
end; end;
{error, Reason} when is_binary(Reason) -> {error, Reason} when is_binary(Reason) ->
{ok, 200, iot_util:json_error(-1, Reason)} {ok, 200, iot_util:json_error(-1, Reason)}
@ -51,8 +51,8 @@ handle_request("POST", "/container/push_config", _,
case iot_host:await_reply(Pid, Ref, Timeout) of case iot_host:await_reply(Pid, Ref, Timeout) of
{ok, Result} -> {ok, Result} ->
{ok, 200, request_success_response(Result)}; {ok, 200, request_success_response(Result)};
{error, Code, Reason} -> {error, Reason} ->
request_error_http_response(Code, Reason) request_error_http_response(Reason)
end; end;
{error, Reason} when is_binary(Reason) -> {error, Reason} when is_binary(Reason) ->
{ok, 200, iot_util:json_error(-1, Reason)} {ok, 200, iot_util:json_error(-1, Reason)}
@ -71,8 +71,8 @@ handle_request("POST", "/container/deploy", _, #{<<"uuid">> := UUID, <<"task_id"
case iot_host:await_reply(Pid, Ref, ?REQ_TIMEOUT) of case iot_host:await_reply(Pid, Ref, ?REQ_TIMEOUT) of
{ok, Result} -> {ok, Result} ->
{ok, 200, request_success_response(Result)}; {ok, 200, request_success_response(Result)};
{error, Code, Reason} -> {error, Reason} ->
request_error_http_response(Code, Reason) request_error_http_response(Reason)
end; end;
{error, Reason} when is_binary(Reason) -> {error, Reason} when is_binary(Reason) ->
{ok, 200, iot_util:json_error(400, Reason)} {ok, 200, iot_util:json_error(400, Reason)}
@ -90,8 +90,8 @@ handle_request("POST", "/container/start", _, #{<<"uuid">> := UUID, <<"container
case iot_host:await_reply(Pid, Ref, ?REQ_TIMEOUT) of case iot_host:await_reply(Pid, Ref, ?REQ_TIMEOUT) of
{ok, Result} -> {ok, Result} ->
{ok, 200, request_success_response(Result)}; {ok, 200, request_success_response(Result)};
{error, Code, Reason} -> {error, Reason} ->
request_error_http_response(Code, Reason) request_error_http_response(Reason)
end; end;
{error, Reason} when is_binary(Reason) -> {error, Reason} when is_binary(Reason) ->
{ok, 200, iot_util:json_error(400, Reason)} {ok, 200, iot_util:json_error(400, Reason)}
@ -109,8 +109,8 @@ handle_request("POST", "/container/stop", _, #{<<"uuid">> := UUID, <<"container_
case iot_host:await_reply(Pid, Ref, ?REQ_TIMEOUT) of case iot_host:await_reply(Pid, Ref, ?REQ_TIMEOUT) of
{ok, Result} -> {ok, Result} ->
{ok, 200, request_success_response(Result)}; {ok, 200, request_success_response(Result)};
{error, Code, Reason} -> {error, Reason} ->
request_error_http_response(Code, Reason) request_error_http_response(Reason)
end; end;
{error, Reason} when is_binary(Reason) -> {error, Reason} when is_binary(Reason) ->
{ok, 200, iot_util:json_error(400, Reason)} {ok, 200, iot_util:json_error(400, Reason)}
@ -127,8 +127,8 @@ handle_request("POST", "/container/kill", _, #{<<"uuid">> := UUID, <<"container_
case iot_host:await_reply(Pid, Ref, ?REQ_TIMEOUT) of case iot_host:await_reply(Pid, Ref, ?REQ_TIMEOUT) of
{ok, Result} -> {ok, Result} ->
{ok, 200, request_success_response(Result)}; {ok, 200, request_success_response(Result)};
{error, Code, Reason} -> {error, Reason} ->
request_error_http_response(Code, Reason) request_error_http_response(Reason)
end; end;
{error, Reason} when is_binary(Reason) -> {error, Reason} when is_binary(Reason) ->
{ok, 200, iot_util:json_error(400, Reason)} {ok, 200, iot_util:json_error(400, Reason)}
@ -146,8 +146,8 @@ handle_request("POST", "/container/remove", _, #{<<"uuid">> := UUID, <<"containe
case iot_host:await_reply(Pid, Ref, ?REQ_TIMEOUT) of case iot_host:await_reply(Pid, Ref, ?REQ_TIMEOUT) of
{ok, Result} -> {ok, Result} ->
{ok, 200, request_success_response(Result)}; {ok, 200, request_success_response(Result)};
{error, Code, Reason} -> {error, Reason} ->
request_error_http_response(Code, Reason) request_error_http_response(Reason)
end; end;
{error, Reason} when is_binary(Reason) -> {error, Reason} when is_binary(Reason) ->
{ok, 200, iot_util:json_error(400, Reason)} {ok, 200, iot_util:json_error(400, Reason)}
@ -178,19 +178,30 @@ request_error_response(Code, Reason) when is_integer(Code), is_binary(Reason) ->
iot_util:json_error(Code, Reason) iot_util:json_error(Code, Reason)
end. end.
-spec request_error_http_response(Code :: integer(), Reason :: binary()) -> -spec request_error_http_response(Reason :: term()) ->
{ok, HttpStatus :: integer(), Body :: iolist()}. {ok, HttpStatus :: integer(), Body :: iolist()}.
request_error_http_response(Code, Reason) when is_integer(Code), is_binary(Reason) -> request_error_http_response(Reason) ->
{ok, request_error_status(Code), request_error_response(Code, Reason)}. HttpStatus = request_error_status(Reason),
{ok, HttpStatus, request_error_response(HttpStatus, reason_to_binary(Reason))}.
-spec request_error_status(Code :: integer()) -> integer(). -spec request_error_status(Reason :: term()) -> integer().
request_error_status(Code) when is_integer(Code), Code >= 400, Code < 600 -> request_error_status(timeout) ->
Code; 504;
request_error_status(-1) -> request_error_status(<<"timeout">>) ->
504; 504;
request_error_status(_) -> request_error_status(_) ->
400. 400.
-spec reason_to_binary(term()) -> binary().
reason_to_binary(Reason) when is_binary(Reason) ->
Reason;
reason_to_binary(timeout) ->
<<"timeout">>;
reason_to_binary(invalid_response) ->
<<"invalid response">>;
reason_to_binary(Reason) ->
unicode:characters_to_binary(io_lib:format("~p", [Reason])).
decode_json_bytes(Data) when is_binary(Data) -> decode_json_bytes(Data) when is_binary(Data) ->
case catch json:decode(Data) of case catch json:decode(Data) of
{'EXIT', _} -> {'EXIT', _} ->

109
src/transport/tcp/ssl_channel.erl
View File

@ -10,7 +10,6 @@
-author("licheng5"). -author("licheng5").
-behaviour(ranch_protocol). -behaviour(ranch_protocol).
-define(MAX_PACKET_ID, 16#FFFFFFFF).
-define(INFLIGHT_TIMEOUT, 60000). -define(INFLIGHT_TIMEOUT, 60000).
%% API %% API
@ -27,8 +26,6 @@
uuid :: undefined | binary(), uuid :: undefined | binary(),
%% 用户进程id %% 用户进程id
host_pid = undefined, host_pid = undefined,
%% 发送消息对应的id
packet_id = 1 :: integer(),
%% 请求响应的对应关系 %% 请求响应的对应关系
inflight = #{} inflight = #{}
@ -36,7 +33,6 @@
-record(inflight_request, { -record(inflight_request, {
receiver_pid :: pid(), receiver_pid :: pid(),
ref :: reference(),
timer_ref :: reference() timer_ref :: reference()
}). }).
@ -88,8 +84,8 @@ init(Ref, Transport, _Opts = []) ->
gen_server:enter_loop(?MODULE, [], #state{transport = Transport, socket = Socket}). gen_server:enter_loop(?MODULE, [], #state{transport = Transport, socket = Socket}).
handle_call({cancel_request_call, Ref}, _From, State = #state{inflight = Inflight}) -> handle_call({cancel_request_call, Ref}, _From, State = #state{inflight = Inflight}) ->
case take_inflight_by_ref(Ref, Inflight) of case maps:take(Ref, Inflight) of
{ok, #inflight_request{timer_ref = TimerRef}, NInflight} -> {#inflight_request{timer_ref = TimerRef}, NInflight} ->
erlang:cancel_timer(TimerRef), erlang:cancel_timer(TimerRef),
{reply, ok, State#state{inflight = NInflight}}; {reply, ok, State#state{inflight = NInflight}};
error -> error ->
@ -111,22 +107,19 @@ handle_cast({command, Command}, State = #state{transport = Transport, socket = S
{noreply, State}; {noreply, State};
%% 推送需要响应的请求 %% 推送需要响应的请求
handle_cast({request_call, ReceiverPid, Ref, Body}, State = #state{transport = Transport, socket = Socket, packet_id = PacketId, inflight = Inflight}) -> handle_cast({request_call, ReceiverPid, Ref, Body}, State = #state{transport = Transport, socket = Socket, inflight = Inflight}) ->
Packet = term_to_binary({request, PacketId, Body}), Packet = term_to_binary({request, Ref, Body}),
TimerRef = erlang:start_timer(?INFLIGHT_TIMEOUT, self(), {request_timeout, PacketId}), TimerRef = erlang:start_timer(?INFLIGHT_TIMEOUT, self(), {request_timeout, Ref}),
Transport:send(Socket, Packet), Transport:send(Socket, Packet),
RequestInfo = #inflight_request{receiver_pid = ReceiverPid, ref = Ref, timer_ref = TimerRef}, RequestInfo = #inflight_request{receiver_pid = ReceiverPid, timer_ref = TimerRef},
{noreply, State#state{ {noreply, State#state{inflight = maps:put(Ref, RequestInfo, Inflight)}}.
packet_id = inc_packet_id(PacketId),
inflight = maps:put(PacketId, RequestInfo, Inflight)
}}.
handle_info({timeout, TimerRef, {request_timeout, PacketId}}, State = #state{inflight = Inflight}) -> handle_info({timeout, TimerRef, {request_timeout, Ref}}, State = #state{inflight = Inflight}) ->
case maps:get(PacketId, Inflight, undefined) of case maps:get(Ref, Inflight, undefined) of
#inflight_request{ref = Ref, timer_ref = TimerRef} -> #inflight_request{timer_ref = TimerRef} ->
logger:warning("[ws_channel] request timeout, packet_id: ~p, ref: ~p", [PacketId, Ref]), logger:warning("[ws_channel] request timeout, ref: ~p", [Ref]),
{noreply, State#state{inflight = maps:remove(PacketId, Inflight)}}; {noreply, State#state{inflight = maps:remove(Ref, Inflight)}};
_ -> _ ->
{noreply, State} {noreply, State}
end; end;
@ -143,12 +136,12 @@ handle_info({'DOWN', _, process, HostPid, Reason}, State = #state{uuid = UUID, h
handle_info({ssl, Socket, PacketBin}, State = #state{transport = Transport, socket = Socket, host_pid = HostPid, inflight = Inflight}) handle_info({ssl, Socket, PacketBin}, State = #state{transport = Transport, socket = Socket, host_pid = HostPid, inflight = Inflight})
when is_binary(PacketBin) -> when is_binary(PacketBin) ->
case catch binary_to_term(PacketBin, [safe]) of case catch binary_to_term(PacketBin, [safe]) of
{request, PacketId, Body} -> {request, Ref, Body} ->
handle_request_frame(PacketId, Body, Transport, Socket, State); handle_request_frame(Ref, Body, Transport, Socket, State);
{message, Body} -> {message, Body} ->
handle_message_frame(Body, HostPid, State); handle_message_frame(Body, HostPid, State);
{response, PacketId, Response} -> {response, Ref, Response} ->
handle_response_frame(PacketId, Response, Inflight, State); handle_response_frame(Ref, Response, Inflight, State);
{'EXIT', Reason} -> {'EXIT', Reason} ->
logger:warning("[ssl_channel] invalid packet: ~p", [Reason]), logger:warning("[ssl_channel] invalid packet: ~p", [Reason]),
{stop, bad_packet, State}; {stop, bad_packet, State};
@ -185,26 +178,8 @@ code_change(_OldVsn, State, _Extra) ->
%%%% helper methods %%%% helper methods
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-spec take_inflight_by_ref(reference(), map()) -> -spec handle_request_frame(reference(), tuple(), module(), any(), #state{}) -> {noreply, #state{}} | {stop, term(), #state{}}.
error | {ok, #inflight_request{}, map()}. handle_request_frame(Ref,
take_inflight_by_ref(Ref, Inflight) ->
maps:fold(fun(PacketId, Request = #inflight_request{ref = PacketRef}, Acc) ->
case Acc of
error when PacketRef =:= Ref ->
{ok, Request, maps:remove(PacketId, Inflight)};
_ ->
Acc
end
end, error, Inflight).
-spec inc_packet_id(integer()) -> integer().
inc_packet_id(?MAX_PACKET_ID) ->
1;
inc_packet_id(PacketId) when PacketId > 0, PacketId < ?MAX_PACKET_ID ->
PacketId + 1.
-spec handle_request_frame(non_neg_integer(), tuple(), module(), any(), #state{}) -> {noreply, #state{}} | {stop, term(), #state{}}.
handle_request_frame(PacketId,
{auth_request, #{uuid := UUID, token := Token, timestamp := Timestamp}}, {auth_request, #{uuid := UUID, token := Token, timestamp := Timestamp}},
Transport, Socket, State) -> Transport, Socket, State) ->
@ -221,29 +196,29 @@ handle_request_frame(PacketId,
case iot_host:attach_channel(HostPid, self()) of case iot_host:attach_channel(HostPid, self()) of
ok -> ok ->
erlang:monitor(process, HostPid), erlang:monitor(process, HostPid),
send_reply_frame(Transport, Socket, PacketId, {auth_response, {ok, <<"ok">>}}), send_reply_frame(Transport, Socket, Ref, {auth_response, {ok, <<"ok">>}}),
{noreply, State#state{uuid = UUID, host_pid = HostPid}}; {noreply, State#state{uuid = UUID, host_pid = HostPid}};
{denied, Reason} when is_binary(Reason) -> {denied, Reason} when is_binary(Reason) ->
erlang:monitor(process, HostPid), erlang:monitor(process, HostPid),
send_reply_frame(Transport, Socket, PacketId, {auth_response, {error, 1, Reason}}), send_reply_frame(Transport, Socket, Ref, {auth_response, {error, {denied, Reason}}}),
logger:debug("[ws_channel] uuid: ~p, attach channel get error: ~p, stop channel", [UUID, Reason]), logger:debug("[ws_channel] uuid: ~p, attach channel get error: ~p, stop channel", [UUID, Reason]),
{noreply, State#state{uuid = UUID, host_pid = HostPid}}; {noreply, State#state{uuid = UUID, host_pid = HostPid}};
{error, Reason} when is_binary(Reason) -> {error, Reason} when is_binary(Reason) ->
send_reply_frame(Transport, Socket, PacketId, {auth_response, {error, 2, Reason}}), send_reply_frame(Transport, Socket, Ref, {auth_response, {error, {failed, Reason}}}),
logger:debug("[ws_channel] uuid: ~p, attach channel get error: ~p, stop channel", [UUID, Reason]), logger:debug("[ws_channel] uuid: ~p, attach channel get error: ~p, stop channel", [UUID, Reason]),
{stop, Reason, State} {stop, Reason, State}
end end
end; end;
{error, Reason} -> {error, Reason} ->
send_reply_frame(Transport, Socket, PacketId, {auth_response, {error, 2, Reason}}), send_reply_frame(Transport, Socket, Ref, {auth_response, {error, {failed, Reason}}}),
logger:warning("[ws_channel] uuid: ~p, token: ~p, auth failed, reason: ~p", [UUID, Token, Reason]), logger:warning("[ws_channel] uuid: ~p, token: ~p, auth failed, reason: ~p", [UUID, Token, Reason]),
{stop, Reason, State} {stop, Reason, State}
end; end;
handle_request_frame(PacketId, {container_request, ContainerRequest}, _Transport, _Socket, State) -> handle_request_frame(Ref, {container_request, ContainerRequest}, _Transport, _Socket, State) ->
logger:warning("[ws_channel] unsupported request message type: container_request, packet_id: ~p, request: ~p", [PacketId, ContainerRequest]), logger:warning("[ws_channel] unsupported request message type: container_request, ref: ~p, request: ~p", [Ref, ContainerRequest]),
{stop, normal, State}; {stop, normal, State};
handle_request_frame(PacketId, Body, _Transport, _Socket, State) -> handle_request_frame(Ref, Body, _Transport, _Socket, State) ->
logger:warning("[ws_channel] unsupported request body, packet_id: ~p, body: ~p", [PacketId, Body]), logger:warning("[ws_channel] unsupported request body, ref: ~p, body: ~p", [Ref, Body]),
{stop, normal, State}. {stop, normal, State}.
-spec handle_message_frame(tuple(), undefined | pid(), #state{}) -> -spec handle_message_frame(tuple(), undefined | pid(), #state{}) ->
@ -265,41 +240,39 @@ handle_event_stream_frame(#{task_id := TaskId, type := Type, stream := Stream})
logger:debug("[ssl_channel] get task_id: ~p, type: ~ts, stream: ~ts", [TaskId, Type, Stream]), logger:debug("[ssl_channel] get task_id: ~p, type: ~ts, stream: ~ts", [TaskId, Type, Stream]),
iot_event_stream_observer:stream_data(TaskId, Type, Stream). iot_event_stream_observer:stream_data(TaskId, Type, Stream).
-spec handle_response_frame(non_neg_integer(), tuple(), map(), #state{}) -> -spec handle_response_frame(reference(), tuple(), map(), #state{}) ->
{noreply, #state{}}. {noreply, #state{}}.
handle_response_frame(PacketId, Reply, Inflight, State) when PacketId > 0 -> handle_response_frame(Ref, Reply, Inflight, State) when is_reference(Ref) ->
case maps:take(PacketId, Inflight) of case maps:take(Ref, Inflight) of
error -> error ->
{noreply, State}; {noreply, State};
{#inflight_request{receiver_pid = ReceiverPid, ref = Ref, timer_ref = TimerRef}, NInflight} -> {#inflight_request{receiver_pid = ReceiverPid, timer_ref = TimerRef}, NInflight} ->
erlang:cancel_timer(TimerRef), erlang:cancel_timer(TimerRef),
case is_pid(ReceiverPid) andalso is_process_alive(ReceiverPid) of case is_pid(ReceiverPid) andalso is_process_alive(ReceiverPid) of
true -> true ->
ReceiverPid ! {request_reply, Ref, decode_reply(Reply)}; ReceiverPid ! {request_reply, Ref, decode_reply(Reply)};
false -> false ->
logger:warning("[ws_channel] get reply message: ~p, packet_id: ~p, but receiver_pid is deaded", [Reply, PacketId]) logger:warning("[ws_channel] get reply message: ~p, ref: ~p, but receiver_pid is deaded", [Reply, Ref])
end, end,
{noreply, State#state{inflight = NInflight}} {noreply, State#state{inflight = NInflight}}
end; end;
handle_response_frame(PacketId, Reply, _Inflight, State) -> handle_response_frame(Ref, Reply, _Inflight, State) ->
logger:warning("[ws_channel] unexpected response frame, packet_id: ~p, reply: ~p", [PacketId, Reply]), logger:warning("[ws_channel] unexpected response frame, ref: ~p, reply: ~p", [Ref, Reply]),
{noreply, State}. {noreply, State}.
-spec send_reply_frame(module(), any(), non_neg_integer(), tuple()) -> any(). -spec send_reply_frame(module(), any(), reference(), tuple()) -> any().
send_reply_frame(Transport, Socket, PacketId, Reply) -> send_reply_frame(Transport, Socket, Ref, Reply) ->
Packet = term_to_binary({response, PacketId, Reply}), Packet = term_to_binary({response, Ref, Reply}),
Transport:send(Socket, Packet). Transport:send(Socket, Packet).
-spec decode_reply({container_response, {ok, term()} | {error, integer(), binary()}} | tuple()) -> -spec decode_reply({container_response, {ok, term()} | {error, term()}} | tuple()) ->
{ok, term()} | {error, integer(), binary()} | undefined. {ok, term()} | {error, term()}.
decode_reply({container_response, {ok, Result}}) -> decode_reply({container_response, {ok, Result}}) ->
{ok, Result}; {ok, Result};
decode_reply({container_response, {error, Code, Message}}) -> decode_reply({container_response, {error, Reason}}) ->
{error, Code, Message}; {error, Reason};
decode_reply(undefined) ->
undefined;
decode_reply(_Reply) -> decode_reply(_Reply) ->
undefined. {error, invalid_response}.
%% 检测token是否是合法值 %% 检测token是否是合法值
-spec auth(Token :: binary(), UUID :: binary(), Timestamp :: integer()) -> -spec auth(Token :: binary(), UUID :: binary(), Timestamp :: integer()) ->