From 58275153848ac45875125fcdcad0b947c4fda576 Mon Sep 17 00:00:00 2001 From: dawnwinterLiu <1737801684@qq.com> Date: Sat, 7 May 2022 19:55:08 +0800 Subject: [PATCH] feat: check_device_acl --- .../src/proctol/dgiot_mqtt_acl.erl | 5 +- apps/dgiot_modbus/src/dgiot_modbus_tcp.erl | 19 +-- apps/dgiot_modbus/src/modbus/modbus_rtu.erl | 133 ++++++++---------- .../priv/swagger/swagger_parse.json | 4 - .../priv/swagger/swagger_user.json | 2 +- apps/dgiot_parse/src/dgiot_role.erl | 6 + apps/dgiot_task/src/dgiot_task.erl | 2 +- 7 files changed, 79 insertions(+), 92 deletions(-) diff --git a/apps/dgiot_dlink/src/proctol/dgiot_mqtt_acl.erl b/apps/dgiot_dlink/src/proctol/dgiot_mqtt_acl.erl index 71e65dd3..4e3d2c8e 100644 --- a/apps/dgiot_dlink/src/proctol/dgiot_mqtt_acl.erl +++ b/apps/dgiot_dlink/src/proctol/dgiot_mqtt_acl.erl @@ -20,6 +20,7 @@ -export([ check_acl/5 , description/0 + , check_device_acl/3 ]). check_acl(ClientInfo, PubSub, <<"$dg/", _/binary>> = Topic, _NoMatchAction, _Params) -> @@ -140,8 +141,8 @@ do_check(_ClientInfo, _PubSub, _Topic) -> check_device_acl(Token, DeviceID, UserId) -> case dgiot_auth:get_session(Token) of - #{<<"objectId">> := UserId, <<"ACL">> := Acl} -> - UserAcl = maps:keys(Acl) ++ [<<"*">>], + #{<<"objectId">> := UserId, <<"roles">> := Roles} -> + UserAcl = dgiot_role:get_aclNames(Roles), DeviceAcl = maps:keys(dgiot_device:get_acl(DeviceID)), case DeviceAcl -- UserAcl of DeviceAcl -> diff --git a/apps/dgiot_modbus/src/dgiot_modbus_tcp.erl b/apps/dgiot_modbus/src/dgiot_modbus_tcp.erl index 17044c24..1b09a92b 100644 --- a/apps/dgiot_modbus/src/dgiot_modbus_tcp.erl +++ b/apps/dgiot_modbus/src/dgiot_modbus_tcp.erl @@ -129,12 +129,10 @@ handle_info({deliver, _, Msg}, #tcp{state = #state{id = ChannelId} = State} = TC <<"slaveid">> := SlaveId, <<"address">> := Address} = DataSource } -> - Datas = modbus_rtu:to_frame(DataSource#{<<"productid">> => ProductId}), - lists:map(fun(X) -> - dgiot_bridge:send_log(ChannelId, ProductId, DevAddr, "Channel sends [~p] to [DtuAddr:~p]", [dgiot_utils:binary_to_hex(X), DevAddr]), - dgiot_tcp_server:send(TCPState, X), - timer:sleep(1000) - end, Datas), +%% io:format("~s ~p DataSource = ~p.~n", [?FILE, ?LINE, DataSource]), + Data = modbus_rtu:to_frame(DataSource), + dgiot_bridge:send_log(ChannelId, ProductId, DevAddr, "Channel sends [~p] to [DtuAddr:~p]", [dgiot_utils:binary_to_hex(Data), DevAddr]), + dgiot_tcp_server:send(TCPState, Data), {noreply, TCPState#tcp{state = State#state{env = #{product => ProductId, pn => SlaveId, di => Address}}}}; #{<<"command">> := <<"rw">>, <<"product">> := ProductId, @@ -143,12 +141,9 @@ handle_info({deliver, _, Msg}, #tcp{state = #state{id = ChannelId} = State} = TC <<"slaveid">> := SlaveId, <<"address">> := Address} = DataSource } -> - Datas = modbus_rtu:to_frame(DataSource#{<<"productid">> => ProductId}), - lists:map(fun(X) -> - dgiot_bridge:send_log(ChannelId, ProductId, DevAddr, "Channel sends [~p] to [DtuAddr:~p]", [dgiot_utils:binary_to_hex(X), DevAddr]), - dgiot_tcp_server:send(TCPState, X), - timer:sleep(1000) - end, Datas), + Data = modbus_rtu:to_frame(DataSource), + dgiot_bridge:send_log(ChannelId, ProductId, DevAddr, "Channel sends [~p] to [DtuAddr:~p]", [dgiot_utils:binary_to_hex(Data), DevAddr]), + dgiot_tcp_server:send(TCPState, Data), {noreply, TCPState#tcp{state = State#state{env = #{product => ProductId, pn => SlaveId, di => Address}}}}; _Ot -> ?LOG(error, "_Ot ~p", [_Ot]), diff --git a/apps/dgiot_modbus/src/modbus/modbus_rtu.erl b/apps/dgiot_modbus/src/modbus/modbus_rtu.erl index 8934d53f..f11336f4 100644 --- a/apps/dgiot_modbus/src/modbus/modbus_rtu.erl +++ b/apps/dgiot_modbus/src/modbus/modbus_rtu.erl @@ -127,16 +127,16 @@ zh => <<"寄存器个数(多个寄存器个数)"/utf8>> } }, - <<"data">> => #{ + <<"bytes">> => #{ order => 6, type => integer, required => true, default => <<"2"/utf8>>, title => #{ - zh => <<"数据长度(字节)"/utf8>> + zh => <<"字节个数"/utf8>> }, description => #{ - zh => <<"数据长度(字节)"/utf8>> + zh => <<"读写字节个数(字节)"/utf8>> } } }). @@ -156,54 +156,43 @@ init(State) -> %% {ok, State}. to_frame(#{ - <<"data">> := Data, + <<"registersnumber">> := Quality, <<"slaveid">> := SlaveId, - <<"productid">> := ProductId, + <<"operatetype">> := Operatetype, <<"address">> := Address }) -> - encode_data(Data, Address, SlaveId, ProductId); + encode_data(Quality, Address, SlaveId, Operatetype); %%<<"cmd">> => Cmd, %%<<"gateway">> => DtuAddr, %%<<"addr">> => SlaveId, %%<<"di">> => Address -to_frame(#{ - <<"data">> := Value, - <<"gateway">> := DtuAddr, - <<"slaveid">> := SlaveId, - <<"address">> := Address -}) -> - case dgiot_device:get_subdevice(DtuAddr, SlaveId) of - not_find -> []; - [ProductId, _DevAddr] -> - encode_data(Value, Address, SlaveId, ProductId) - end. +to_frame(_DataSource) -> + <<>>. %% Quality 读的时候代表寄存器个数，16位的寄存器，一个寄存器表示两个字节，写的时候代表实际下发值 -encode_data(Data, Address, SlaveId, ProductId) -> - lists:foldl(fun({_Cmd, Quality, OperateType}, Acc) -> - {FunCode, NewQuality} = - case OperateType of - <<"readCoils">> -> {?FC_READ_COILS, dgiot_utils:to_int(dgiot_utils:to_int(Quality) / 2)}; - <<"readInputs">> -> {?FC_READ_INPUTS, dgiot_utils:to_int(dgiot_utils:to_int(Quality) / 2)}; - <<"readHregs">> -> {?FC_READ_HREGS, dgiot_utils:to_int(dgiot_utils:to_int(Quality) / 2)}; - <<"readIregs">> -> {?FC_READ_IREGS, dgiot_utils:to_int(dgiot_utils:to_int(Quality) / 2)}; - <<"writeCoil">> -> {?FC_WRITE_COIL, dgiot_utils:to_int(Quality)}; - <<"writeHreg">> -> {?FC_WRITE_HREG, dgiot_utils:to_int(Quality)}; %%需要校验，写多个线圈是什么状态 - <<"writeCoils">> -> {?FC_WRITE_COILS, dgiot_utils:to_int(Quality)}; - <<"writeHregs">> -> {?FC_WRITE_HREGS, dgiot_utils:to_int(Quality)}; %%需要校验，写多个保持寄存器是什么状态 - _ -> {?FC_READ_HREGS, dgiot_utils:to_int(dgiot_utils:to_int(Quality) / 2)} - end, - <> = dgiot_utils:hex_to_binary(is16(Address)), - <> = dgiot_utils:hex_to_binary(is16(SlaveId)), - RtuReq = #rtu_req{ - slaveId = Sh * 256 + Sl, - funcode = dgiot_utils:to_int(FunCode), - address = H * 256 + L, - quality = NewQuality - }, - Acc ++ [build_req_message(RtuReq)] - end, [], modbus_encoder(ProductId, SlaveId, Address, Data)). +encode_data(Quality, Address, SlaveId, OperateType) -> + {FunCode, NewQuality} = + case OperateType of + <<"readCoils">> -> {?FC_READ_COILS, dgiot_utils:to_int(Quality)}; + <<"readInputs">> -> {?FC_READ_INPUTS, dgiot_utils:to_int(Quality)}; + <<"readHregs">> -> {?FC_READ_HREGS, dgiot_utils:to_int(Quality)}; + <<"readIregs">> -> {?FC_READ_IREGS, dgiot_utils:to_int(Quality)}; + <<"writeCoil">> -> {?FC_WRITE_COIL, dgiot_utils:to_int(Quality)}; + <<"writeHreg">> -> {?FC_WRITE_HREG, dgiot_utils:to_int(Quality)}; %%需要校验，写多个线圈是什么状态 + <<"writeCoils">> -> {?FC_WRITE_COILS, dgiot_utils:to_int(Quality)}; + <<"writeHregs">> -> {?FC_WRITE_HREGS, dgiot_utils:to_int(Quality)}; %%需要校验，写多个保持寄存器是什么状态 + _ -> {?FC_READ_HREGS, dgiot_utils:to_int(dgiot_utils:to_int(Quality) / 2)} + end, + <> = dgiot_utils:hex_to_binary(modbus_rtu:is16(Address)), + <> = dgiot_utils:hex_to_binary(modbus_rtu:is16(SlaveId)), + RtuReq = #rtu_req{ + slaveId = Sh * 256 + Sl, + funcode = dgiot_utils:to_int(FunCode), + address = H * 256 + L, + quality = NewQuality + }, + build_req_message(RtuReq). is16(<<"0X", Data/binary>>) when size(Data) == 4 -> Data; @@ -226,22 +215,22 @@ is16(Data) when size(Data) > 1 -> is16(Data) -> <<"000", Data/binary>>. -set_params(Payload, ProductId, DevAddr) -> +set_params(Payload, _ProductId, _DevAddr) -> Length = length(maps:keys(Payload)), Payloads = lists:foldl(fun(Index, Acc) -> case maps:find(dgiot_utils:to_binary(Index), Payload) of {ok, #{ - <<"identifier">> := Identifier, - <<"name">> := Name, - <<"productname">> := Productname, + <<"identifier">> := _Identifier, + <<"name">> := _Name, + <<"productname">> := _Productname, <<"dataForm">> := #{ <<"protocol">> := <<"MODBUSRTU">>, <<"control">> := Setting}, <<"dataSource">> := #{ <<"slaveid">> := SlaveId, <<"address">> := Address, - <<"data">> := Bytes, + <<"bytes">> := Bytes, <<"operatetype">> := OperateType} = DataSource } = Data} -> case maps:find(<<"value">>, Data) of @@ -276,21 +265,21 @@ set_params(Payload, ProductId, DevAddr) -> dataByteSize = dgiot_utils:to_int(Bytes), quality = Value1 }, - DeviceId = dgiot_parse_id:get_deviceid(ProductId, DevAddr), - Sessiontoken = maps:get(<<"sessiontoken">>, Data, <<"">>), - {Username, Acl} = - case dgiot_auth:get_session(Sessiontoken) of - #{<<"username">> := Name1, <<"ACL">> := Acl1} -> - {Name1, Acl1}; - _ -> - {<<"">>, #{}} - end, - ?MLOG(info, #{<<"clientid">> => DeviceId, <<"username">> => Username, - <<"status">> => <<"ONLINE">>, <<"ACL">> => Acl, - <<"devaddr">> => DevAddr, <<"productid">> => ProductId, - <<"productname">> => Productname, <<"thingname">> => Name, - <<"protocol">> => <<"modbus">>, <<"identifier">> => Identifier, <<"value">> => Value1}, - ['device_operationlog']), +%% DeviceId = dgiot_parse_id:get_deviceid(ProductId, DevAddr), +%% Sessiontoken = maps:get(<<"sessiontoken">>, Data, <<"">>), +%% {Username, Acl} = +%% case dgiot_auth:get_session(Sessiontoken) of +%% #{<<"username">> := Name1, <<"ACL">> := Acl1} -> +%% {Name1, Acl1}; +%% _ -> +%% {<<"">>, #{}} +%% end, +%% ?MLOG(info, #{<<"clientid">> => DeviceId, <<"username">> => Username, +%% <<"status">> => <<"ONLINE">>, <<"ACL">> => Acl, +%% <<"devaddr">> => DevAddr, <<"productid">> => ProductId, +%% <<"productname">> => Productname, <<"thingname">> => Name, +%% <<"protocol">> => <<"modbus">>, <<"identifier">> => Identifier, <<"value">> => Value1}, +%% ['device_operationlog']), Acc ++ [build_req_message(RtuReq)]; _ -> Acc @@ -638,7 +627,7 @@ format_value(Buff, #{<<"identifier">> := BitIdentifier, <<"dataSource">> := #{ <<"slaveid">> := BitIdentifier, <<"address">> := Offset, - <<"data">> := Len} + <<"bytes">> := Len} } -> IntOffset = dgiot_utils:to_int(Offset), IntLen = dgiot_utils:to_int(Len), @@ -669,7 +658,7 @@ format_value(Buff, #{<<"identifier">> := BitIdentifier, {map, Values}; format_value(Buff, #{<<"dataSource">> := #{ - <<"data">> := Len, + <<"bytes">> := Len, <<"originaltype">> := <<"short16_AB">> }}, _Props) -> IntLen = dgiot_utils:to_int(Len), @@ -678,7 +667,7 @@ format_value(Buff, #{<<"dataSource">> := #{ {Value, Rest}; format_value(Buff, #{<<"dataSource">> := #{ - <<"data">> := Len, + <<"bytes">> := Len, <<"originaltype">> := <<"short16_BA">> }}, _Props) -> IntLen = dgiot_utils:to_int(Len), @@ -687,7 +676,7 @@ format_value(Buff, #{<<"dataSource">> := #{ {Value, Rest}; format_value(Buff, #{<<"dataSource">> := #{ - <<"data">> := Len, + <<"bytes">> := Len, <<"originaltype">> := <<"ushort16_AB">> }}, _Props) -> IntLen = dgiot_utils:to_int(Len), @@ -696,7 +685,7 @@ format_value(Buff, #{<<"dataSource">> := #{ {Value, Rest}; format_value(Buff, #{<<"dataSource">> := #{ - <<"data">> := Len, + <<"bytes">> := Len, <<"originaltype">> := <<"ushort16_BA">> }}, _Props) -> IntLen = dgiot_utils:to_int(Len), @@ -705,7 +694,7 @@ format_value(Buff, #{<<"dataSource">> := #{ {Value, Rest}; format_value(Buff, #{<<"dataSource">> := #{ - <<"data">> := Len, + <<"bytes">> := Len, <<"originaltype">> := <<"long32_ABCD">> }}, _Props) -> IntLen = dgiot_utils:to_int(Len), @@ -715,7 +704,7 @@ format_value(Buff, #{<<"dataSource">> := #{ {Value, Rest}; format_value(Buff, #{<<"dataSource">> := #{ - <<"data">> := Len, + <<"bytes">> := Len, <<"originaltype">> := <<"long32_CDAB">> }}, _Props) -> IntLen = dgiot_utils:to_int(Len), @@ -725,7 +714,7 @@ format_value(Buff, #{<<"dataSource">> := #{ {Value, Rest}; format_value(Buff, #{<<"dataSource">> := #{ - <<"data">> := Len, + <<"bytes">> := Len, <<"originaltype">> := <<"ulong32_ABCD">> }}, _Props) -> IntLen = dgiot_utils:to_int(Len), @@ -735,7 +724,7 @@ format_value(Buff, #{<<"dataSource">> := #{ {Value, Rest}; format_value(Buff, #{<<"dataSource">> := #{ - <<"data">> := Len, + <<"bytes">> := Len, <<"originaltype">> := <<"ulong32_CDAB">> }}, _Props) -> IntLen = dgiot_utils:to_int(Len), @@ -745,7 +734,7 @@ format_value(Buff, #{<<"dataSource">> := #{ {Value, Rest}; format_value(Buff, #{<<"dataSource">> := #{ - <<"data">> := Len, + <<"bytes">> := Len, <<"originaltype">> := <<"float32_ABCD">> }}, _Props) -> IntLen = dgiot_utils:to_int(Len), @@ -755,7 +744,7 @@ format_value(Buff, #{<<"dataSource">> := #{ {Value, Rest}; format_value(Buff, #{<<"dataSource">> := #{ - <<"data">> := Len, + <<"bytes">> := Len, <<"originaltype">> := <<"float32_CDAB">> }}, _Props) -> IntLen = dgiot_utils:to_int(Len), diff --git a/apps/dgiot_parse/priv/swagger/swagger_parse.json b/apps/dgiot_parse/priv/swagger/swagger_parse.json index 98c98d7c..539ee5bd 100644 --- a/apps/dgiot_parse/priv/swagger/swagger_parse.json +++ b/apps/dgiot_parse/priv/swagger/swagger_parse.json @@ -7,10 +7,6 @@ { "name": "Data", "description": "数据管理" - }, - { - "name": "_User", - "description": "用户管理" } ], "definitions": { diff --git a/apps/dgiot_parse/priv/swagger/swagger_user.json b/apps/dgiot_parse/priv/swagger/swagger_user.json index 17414a29..4c5f6b2e 100644 --- a/apps/dgiot_parse/priv/swagger/swagger_user.json +++ b/apps/dgiot_parse/priv/swagger/swagger_user.json @@ -2,7 +2,7 @@ "tags": [ { "name": "_User", - "description": "用户" + "description": "用户管理" } ], "definitions": { diff --git a/apps/dgiot_parse/src/dgiot_role.erl b/apps/dgiot_parse/src/dgiot_role.erl index 0a333478..d3f03a89 100644 --- a/apps/dgiot_parse/src/dgiot_role.erl +++ b/apps/dgiot_parse/src/dgiot_role.erl @@ -44,6 +44,7 @@ get_childacl/1, get_roleids/1, get_alcname/1, + get_aclNames/1, get_acls/1 ]). @@ -146,6 +147,11 @@ get_alcname(RoleId) -> RoleName end. +get_aclNames(Roles) -> + lists:foldl(fun(RoleId, Acc) -> + Acc ++ [dgiot_utils:to_binary(dgiot_role:get_alcname(RoleId))] + end, [<<"*">>], maps:keys(Roles)). + post_role(#{<<"tempname">> := TempName, <<"parent">> := Parent, <<"depname">> := DepName, <<"name">> := Name, <<"desc">> := Desc} = Body, SessionToken) -> case dgiot_parse:query_object(<<"Dict">>, #{<<"order">> => <<"updatedAt">>, <<"limit">> => 1, <<"where">> => #{<<"key">> => TempName}}, diff --git a/apps/dgiot_task/src/dgiot_task.erl b/apps/dgiot_task/src/dgiot_task.erl index e4064da5..56c6221d 100644 --- a/apps/dgiot_task/src/dgiot_task.erl +++ b/apps/dgiot_task/src/dgiot_task.erl @@ -426,7 +426,7 @@ save_td(ProductId, DevAddr, Ack, _AppData) -> dgiot_channelx:do_message(ChannelId, {topo_thing, ProductId, DeviceId, Data}), dgiot_tdengine_adapter:save(ProductId, DevAddr, Data), dgiot_metrics:inc(dgiot_task, <<"task_save">>, 1), - NotificationTopic = <<"$dg/user/", ProductId/binary, "/", DeviceId/binary, "/properties/report">>, + NotificationTopic = <<"$dg/alarm/", ProductId/binary, "/", DeviceId/binary, "/properties/report">>, dgiot_mqtt:publish(DeviceId, NotificationTopic, jsx:encode(Data)), Data end