fix
This commit is contained in:
parent
6a01bddd24
commit
010a478bdf
@ -13,7 +13,6 @@
|
||||
-record(auth_request,
|
||||
{uuid = <<>> :: unicode:chardata() | undefined, % = 1, optional
|
||||
username = <<>> :: unicode:chardata() | undefined, % = 2, optional
|
||||
password = <<>> :: unicode:chardata() | undefined, % = 3, optional
|
||||
salt = <<>> :: unicode:chardata() | undefined, % = 4, optional
|
||||
token = <<>> :: unicode:chardata() | undefined, % = 5, optional
|
||||
timestamp = 0 :: non_neg_integer() | undefined % = 6, optional, 32 bits
|
||||
@ -24,7 +23,8 @@
|
||||
-define('AUTH_REPLY_PB_H', true).
|
||||
-record(auth_reply,
|
||||
{code = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits
|
||||
message = <<>> :: unicode:chardata() | undefined % = 2, optional
|
||||
message = <<>> :: unicode:chardata() | undefined, % = 2, optional
|
||||
repository_url = <<>> :: unicode:chardata() | undefined % = 3, optional
|
||||
}).
|
||||
-endif.
|
||||
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
hackney,
|
||||
poolboy,
|
||||
mysql,
|
||||
gpb,
|
||||
esockd,
|
||||
endpoint,
|
||||
mnesia,
|
||||
|
||||
@ -127,7 +127,7 @@ encode_msg(Msg, MsgName, Opts) ->
|
||||
encode_msg_auth_request(Msg, TrUserData) -> encode_msg_auth_request(Msg, <<>>, TrUserData).
|
||||
|
||||
|
||||
encode_msg_auth_request(#auth_request{uuid = F1, username = F2, password = F3, salt = F4, token = F5, timestamp = F6}, Bin, TrUserData) ->
|
||||
encode_msg_auth_request(#auth_request{uuid = F1, username = F2, salt = F3, token = F4, timestamp = F5}, Bin, TrUserData) ->
|
||||
B1 = if F1 == undefined -> Bin;
|
||||
true ->
|
||||
begin
|
||||
@ -154,7 +154,7 @@ encode_msg_auth_request(#auth_request{uuid = F1, username = F2, password = F3, s
|
||||
TrF3 = id(F3, TrUserData),
|
||||
case is_empty_string(TrF3) of
|
||||
true -> B2;
|
||||
false -> e_type_string(TrF3, <<B2/binary, 26>>, TrUserData)
|
||||
false -> e_type_string(TrF3, <<B2/binary, 34>>, TrUserData)
|
||||
end
|
||||
end
|
||||
end,
|
||||
@ -164,26 +164,16 @@ encode_msg_auth_request(#auth_request{uuid = F1, username = F2, password = F3, s
|
||||
TrF4 = id(F4, TrUserData),
|
||||
case is_empty_string(TrF4) of
|
||||
true -> B3;
|
||||
false -> e_type_string(TrF4, <<B3/binary, 34>>, TrUserData)
|
||||
false -> e_type_string(TrF4, <<B3/binary, 42>>, TrUserData)
|
||||
end
|
||||
end
|
||||
end,
|
||||
B5 = if F5 == undefined -> B4;
|
||||
true ->
|
||||
begin
|
||||
TrF5 = id(F5, TrUserData),
|
||||
case is_empty_string(TrF5) of
|
||||
true -> B4;
|
||||
false -> e_type_string(TrF5, <<B4/binary, 42>>, TrUserData)
|
||||
end
|
||||
end
|
||||
end,
|
||||
if F6 == undefined -> B5;
|
||||
if F5 == undefined -> B4;
|
||||
true ->
|
||||
begin
|
||||
TrF6 = id(F6, TrUserData),
|
||||
if TrF6 =:= 0 -> B5;
|
||||
true -> e_varint(TrF6, <<B5/binary, 48>>, TrUserData)
|
||||
TrF5 = id(F5, TrUserData),
|
||||
if TrF5 =:= 0 -> B4;
|
||||
true -> e_varint(TrF5, <<B4/binary, 48>>, TrUserData)
|
||||
end
|
||||
end
|
||||
end.
|
||||
@ -191,7 +181,7 @@ encode_msg_auth_request(#auth_request{uuid = F1, username = F2, password = F3, s
|
||||
encode_msg_auth_reply(Msg, TrUserData) -> encode_msg_auth_reply(Msg, <<>>, TrUserData).
|
||||
|
||||
|
||||
encode_msg_auth_reply(#auth_reply{code = F1, message = F2}, Bin, TrUserData) ->
|
||||
encode_msg_auth_reply(#auth_reply{code = F1, message = F2, repository_url = F3}, Bin, TrUserData) ->
|
||||
B1 = if F1 == undefined -> Bin;
|
||||
true ->
|
||||
begin
|
||||
@ -201,13 +191,23 @@ encode_msg_auth_reply(#auth_reply{code = F1, message = F2}, Bin, TrUserData) ->
|
||||
end
|
||||
end
|
||||
end,
|
||||
if F2 == undefined -> B1;
|
||||
B2 = if F2 == undefined -> B1;
|
||||
true ->
|
||||
begin
|
||||
TrF2 = id(F2, TrUserData),
|
||||
case is_empty_string(TrF2) of
|
||||
true -> B1;
|
||||
false -> e_type_string(TrF2, <<B1/binary, 18>>, TrUserData)
|
||||
end
|
||||
end
|
||||
end,
|
||||
if F3 == undefined -> B2;
|
||||
true ->
|
||||
begin
|
||||
TrF2 = id(F2, TrUserData),
|
||||
case is_empty_string(TrF2) of
|
||||
true -> B1;
|
||||
false -> e_type_string(TrF2, <<B1/binary, 18>>, TrUserData)
|
||||
TrF3 = id(F3, TrUserData),
|
||||
case is_empty_string(TrF3) of
|
||||
true -> B2;
|
||||
false -> e_type_string(TrF3, <<B2/binary, 26>>, TrUserData)
|
||||
end
|
||||
end
|
||||
end.
|
||||
@ -850,135 +850,135 @@ decode_msg_2_doit(directive, Bin, TrUserData) -> id(decode_msg_directive(Bin, Tr
|
||||
|
||||
|
||||
|
||||
decode_msg_auth_request(Bin, TrUserData) -> dfp_read_field_def_auth_request(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), TrUserData).
|
||||
decode_msg_auth_request(Bin, TrUserData) -> dfp_read_field_def_auth_request(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), TrUserData).
|
||||
|
||||
dfp_read_field_def_auth_request(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_auth_request_uuid(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
dfp_read_field_def_auth_request(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_auth_request_username(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
dfp_read_field_def_auth_request(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_auth_request_password(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
dfp_read_field_def_auth_request(<<34, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_auth_request_salt(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
dfp_read_field_def_auth_request(<<42, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_auth_request_token(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
dfp_read_field_def_auth_request(<<48, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_auth_request_timestamp(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
dfp_read_field_def_auth_request(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, _) -> #auth_request{uuid = F@_1, username = F@_2, password = F@_3, salt = F@_4, token = F@_5, timestamp = F@_6};
|
||||
dfp_read_field_def_auth_request(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> dg_read_field_def_auth_request(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
|
||||
dfp_read_field_def_auth_request(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_auth_request_uuid(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
dfp_read_field_def_auth_request(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_auth_request_username(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
dfp_read_field_def_auth_request(<<34, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_auth_request_salt(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
dfp_read_field_def_auth_request(<<42, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_auth_request_token(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
dfp_read_field_def_auth_request(<<48, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_auth_request_timestamp(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
dfp_read_field_def_auth_request(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, _) -> #auth_request{uuid = F@_1, username = F@_2, salt = F@_3, token = F@_4, timestamp = F@_5};
|
||||
dfp_read_field_def_auth_request(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> dg_read_field_def_auth_request(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData).
|
||||
|
||||
dg_read_field_def_auth_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 32 - 7 -> dg_read_field_def_auth_request(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
dg_read_field_def_auth_request(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) ->
|
||||
dg_read_field_def_auth_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 32 - 7 -> dg_read_field_def_auth_request(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
dg_read_field_def_auth_request(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) ->
|
||||
Key = X bsl N + Acc,
|
||||
case Key of
|
||||
10 -> d_field_auth_request_uuid(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
18 -> d_field_auth_request_username(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
26 -> d_field_auth_request_password(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
34 -> d_field_auth_request_salt(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
42 -> d_field_auth_request_token(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
48 -> d_field_auth_request_timestamp(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
10 -> d_field_auth_request_uuid(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
18 -> d_field_auth_request_username(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
34 -> d_field_auth_request_salt(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
42 -> d_field_auth_request_token(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
48 -> d_field_auth_request_timestamp(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
_ ->
|
||||
case Key band 7 of
|
||||
0 -> skip_varint_auth_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
1 -> skip_64_auth_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
2 -> skip_length_delimited_auth_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
3 -> skip_group_auth_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
5 -> skip_32_auth_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData)
|
||||
0 -> skip_varint_auth_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
1 -> skip_64_auth_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
2 -> skip_length_delimited_auth_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
3 -> skip_group_auth_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
5 -> skip_32_auth_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData)
|
||||
end
|
||||
end;
|
||||
dg_read_field_def_auth_request(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, _) -> #auth_request{uuid = F@_1, username = F@_2, password = F@_3, salt = F@_4, token = F@_5, timestamp = F@_6}.
|
||||
dg_read_field_def_auth_request(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, _) -> #auth_request{uuid = F@_1, username = F@_2, salt = F@_3, token = F@_4, timestamp = F@_5}.
|
||||
|
||||
d_field_auth_request_uuid(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 -> d_field_auth_request_uuid(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
d_field_auth_request_uuid(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) ->
|
||||
d_field_auth_request_uuid(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_auth_request_uuid(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
d_field_auth_request_uuid(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, F@_4, F@_5, TrUserData) ->
|
||||
{NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
|
||||
dfp_read_field_def_auth_request(RestF, 0, 0, F, NewFValue, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
|
||||
dfp_read_field_def_auth_request(RestF, 0, 0, F, NewFValue, F@_2, F@_3, F@_4, F@_5, TrUserData).
|
||||
|
||||
d_field_auth_request_username(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 -> d_field_auth_request_username(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
d_field_auth_request_username(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, F@_4, F@_5, F@_6, TrUserData) ->
|
||||
d_field_auth_request_username(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_auth_request_username(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
d_field_auth_request_username(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, F@_4, F@_5, TrUserData) ->
|
||||
{NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
|
||||
dfp_read_field_def_auth_request(RestF, 0, 0, F, F@_1, NewFValue, F@_3, F@_4, F@_5, F@_6, TrUserData).
|
||||
dfp_read_field_def_auth_request(RestF, 0, 0, F, F@_1, NewFValue, F@_3, F@_4, F@_5, TrUserData).
|
||||
|
||||
d_field_auth_request_password(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 -> d_field_auth_request_password(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
d_field_auth_request_password(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, _, F@_4, F@_5, F@_6, TrUserData) ->
|
||||
d_field_auth_request_salt(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_auth_request_salt(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
d_field_auth_request_salt(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, _, F@_4, F@_5, TrUserData) ->
|
||||
{NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
|
||||
dfp_read_field_def_auth_request(RestF, 0, 0, F, F@_1, F@_2, NewFValue, F@_4, F@_5, F@_6, TrUserData).
|
||||
dfp_read_field_def_auth_request(RestF, 0, 0, F, F@_1, F@_2, NewFValue, F@_4, F@_5, TrUserData).
|
||||
|
||||
d_field_auth_request_salt(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 -> d_field_auth_request_salt(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
d_field_auth_request_salt(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, _, F@_5, F@_6, TrUserData) ->
|
||||
d_field_auth_request_token(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_auth_request_token(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
d_field_auth_request_token(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, _, F@_5, TrUserData) ->
|
||||
{NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
|
||||
dfp_read_field_def_auth_request(RestF, 0, 0, F, F@_1, F@_2, F@_3, NewFValue, F@_5, F@_6, TrUserData).
|
||||
dfp_read_field_def_auth_request(RestF, 0, 0, F, F@_1, F@_2, F@_3, NewFValue, F@_5, TrUserData).
|
||||
|
||||
d_field_auth_request_token(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 -> d_field_auth_request_token(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
d_field_auth_request_token(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, _, F@_6, TrUserData) ->
|
||||
{NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
|
||||
dfp_read_field_def_auth_request(RestF, 0, 0, F, F@_1, F@_2, F@_3, F@_4, NewFValue, F@_6, TrUserData).
|
||||
|
||||
d_field_auth_request_timestamp(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 -> d_field_auth_request_timestamp(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
d_field_auth_request_timestamp(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, _, TrUserData) ->
|
||||
d_field_auth_request_timestamp(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_auth_request_timestamp(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
d_field_auth_request_timestamp(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, _, TrUserData) ->
|
||||
{NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest},
|
||||
dfp_read_field_def_auth_request(RestF, 0, 0, F, F@_1, F@_2, F@_3, F@_4, F@_5, NewFValue, TrUserData).
|
||||
dfp_read_field_def_auth_request(RestF, 0, 0, F, F@_1, F@_2, F@_3, F@_4, NewFValue, TrUserData).
|
||||
|
||||
skip_varint_auth_request(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> skip_varint_auth_request(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
skip_varint_auth_request(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> dfp_read_field_def_auth_request(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
|
||||
skip_varint_auth_request(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> skip_varint_auth_request(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
skip_varint_auth_request(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> dfp_read_field_def_auth_request(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData).
|
||||
|
||||
skip_length_delimited_auth_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 -> skip_length_delimited_auth_request(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
|
||||
skip_length_delimited_auth_request(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) ->
|
||||
skip_length_delimited_auth_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> skip_length_delimited_auth_request(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData);
|
||||
skip_length_delimited_auth_request(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) ->
|
||||
Length = X bsl N + Acc,
|
||||
<<_:Length/binary, Rest2/binary>> = Rest,
|
||||
dfp_read_field_def_auth_request(Rest2, 0, 0, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
|
||||
dfp_read_field_def_auth_request(Rest2, 0, 0, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData).
|
||||
|
||||
skip_group_auth_request(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) ->
|
||||
skip_group_auth_request(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) ->
|
||||
{_, Rest} = read_group(Bin, FNum),
|
||||
dfp_read_field_def_auth_request(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
|
||||
dfp_read_field_def_auth_request(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData).
|
||||
|
||||
skip_32_auth_request(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> dfp_read_field_def_auth_request(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
|
||||
skip_32_auth_request(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> dfp_read_field_def_auth_request(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData).
|
||||
|
||||
skip_64_auth_request(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> dfp_read_field_def_auth_request(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
|
||||
skip_64_auth_request(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> dfp_read_field_def_auth_request(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData).
|
||||
|
||||
decode_msg_auth_reply(Bin, TrUserData) -> dfp_read_field_def_auth_reply(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), TrUserData).
|
||||
decode_msg_auth_reply(Bin, TrUserData) -> dfp_read_field_def_auth_reply(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData).
|
||||
|
||||
dfp_read_field_def_auth_reply(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_auth_reply_code(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData);
|
||||
dfp_read_field_def_auth_reply(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_auth_reply_message(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData);
|
||||
dfp_read_field_def_auth_reply(<<>>, 0, 0, _, F@_1, F@_2, _) -> #auth_reply{code = F@_1, message = F@_2};
|
||||
dfp_read_field_def_auth_reply(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_auth_reply(Other, Z1, Z2, F, F@_1, F@_2, TrUserData).
|
||||
dfp_read_field_def_auth_reply(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_auth_reply_code(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData);
|
||||
dfp_read_field_def_auth_reply(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_auth_reply_message(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData);
|
||||
dfp_read_field_def_auth_reply(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_auth_reply_repository_url(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData);
|
||||
dfp_read_field_def_auth_reply(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #auth_reply{code = F@_1, message = F@_2, repository_url = F@_3};
|
||||
dfp_read_field_def_auth_reply(Other, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dg_read_field_def_auth_reply(Other, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData).
|
||||
|
||||
dg_read_field_def_auth_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_auth_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
|
||||
dg_read_field_def_auth_reply(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) ->
|
||||
dg_read_field_def_auth_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 32 - 7 -> dg_read_field_def_auth_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData);
|
||||
dg_read_field_def_auth_reply(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, TrUserData) ->
|
||||
Key = X bsl N + Acc,
|
||||
case Key of
|
||||
8 -> d_field_auth_reply_code(Rest, 0, 0, 0, F@_1, F@_2, TrUserData);
|
||||
18 -> d_field_auth_reply_message(Rest, 0, 0, 0, F@_1, F@_2, TrUserData);
|
||||
8 -> d_field_auth_reply_code(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData);
|
||||
18 -> d_field_auth_reply_message(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData);
|
||||
26 -> d_field_auth_reply_repository_url(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData);
|
||||
_ ->
|
||||
case Key band 7 of
|
||||
0 -> skip_varint_auth_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
|
||||
1 -> skip_64_auth_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
|
||||
2 -> skip_length_delimited_auth_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
|
||||
3 -> skip_group_auth_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
|
||||
5 -> skip_32_auth_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData)
|
||||
0 -> skip_varint_auth_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData);
|
||||
1 -> skip_64_auth_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData);
|
||||
2 -> skip_length_delimited_auth_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData);
|
||||
3 -> skip_group_auth_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData);
|
||||
5 -> skip_32_auth_reply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData)
|
||||
end
|
||||
end;
|
||||
dg_read_field_def_auth_reply(<<>>, 0, 0, _, F@_1, F@_2, _) -> #auth_reply{code = F@_1, message = F@_2}.
|
||||
dg_read_field_def_auth_reply(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #auth_reply{code = F@_1, message = F@_2, repository_url = F@_3}.
|
||||
|
||||
d_field_auth_reply_code(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_auth_reply_code(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
|
||||
d_field_auth_reply_code(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) ->
|
||||
d_field_auth_reply_code(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_auth_reply_code(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData);
|
||||
d_field_auth_reply_code(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, TrUserData) ->
|
||||
{NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest},
|
||||
dfp_read_field_def_auth_reply(RestF, 0, 0, F, NewFValue, F@_2, TrUserData).
|
||||
dfp_read_field_def_auth_reply(RestF, 0, 0, F, NewFValue, F@_2, F@_3, TrUserData).
|
||||
|
||||
d_field_auth_reply_message(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_auth_reply_message(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
|
||||
d_field_auth_reply_message(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) ->
|
||||
d_field_auth_reply_message(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_auth_reply_message(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData);
|
||||
d_field_auth_reply_message(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, TrUserData) ->
|
||||
{NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
|
||||
dfp_read_field_def_auth_reply(RestF, 0, 0, F, F@_1, NewFValue, TrUserData).
|
||||
dfp_read_field_def_auth_reply(RestF, 0, 0, F, F@_1, NewFValue, F@_3, TrUserData).
|
||||
|
||||
skip_varint_auth_reply(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_auth_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData);
|
||||
skip_varint_auth_reply(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_auth_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
|
||||
d_field_auth_reply_repository_url(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_auth_reply_repository_url(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData);
|
||||
d_field_auth_reply_repository_url(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, _, TrUserData) ->
|
||||
{NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
|
||||
dfp_read_field_def_auth_reply(RestF, 0, 0, F, F@_1, F@_2, NewFValue, TrUserData).
|
||||
|
||||
skip_length_delimited_auth_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_auth_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
|
||||
skip_length_delimited_auth_reply(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) ->
|
||||
skip_varint_auth_reply(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> skip_varint_auth_reply(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData);
|
||||
skip_varint_auth_reply(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_auth_reply(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData).
|
||||
|
||||
skip_length_delimited_auth_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> skip_length_delimited_auth_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData);
|
||||
skip_length_delimited_auth_reply(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) ->
|
||||
Length = X bsl N + Acc,
|
||||
<<_:Length/binary, Rest2/binary>> = Rest,
|
||||
dfp_read_field_def_auth_reply(Rest2, 0, 0, F, F@_1, F@_2, TrUserData).
|
||||
dfp_read_field_def_auth_reply(Rest2, 0, 0, F, F@_1, F@_2, F@_3, TrUserData).
|
||||
|
||||
skip_group_auth_reply(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) ->
|
||||
skip_group_auth_reply(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, TrUserData) ->
|
||||
{_, Rest} = read_group(Bin, FNum),
|
||||
dfp_read_field_def_auth_reply(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData).
|
||||
dfp_read_field_def_auth_reply(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, TrUserData).
|
||||
|
||||
skip_32_auth_reply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_auth_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
|
||||
skip_32_auth_reply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_auth_reply(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData).
|
||||
|
||||
skip_64_auth_reply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_auth_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
|
||||
skip_64_auth_reply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_auth_reply(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData).
|
||||
|
||||
decode_msg_session_request(Bin, TrUserData) -> dfp_read_field_def_session_request(Bin, 0, 0, 0, TrUserData).
|
||||
|
||||
@ -1869,8 +1869,7 @@ merge_msgs(Prev, New, MsgName, Opts) ->
|
||||
end.
|
||||
|
||||
-compile({nowarn_unused_function,merge_msg_auth_request/3}).
|
||||
merge_msg_auth_request(#auth_request{uuid = PFuuid, username = PFusername, password = PFpassword, salt = PFsalt, token = PFtoken, timestamp = PFtimestamp},
|
||||
#auth_request{uuid = NFuuid, username = NFusername, password = NFpassword, salt = NFsalt, token = NFtoken, timestamp = NFtimestamp}, _) ->
|
||||
merge_msg_auth_request(#auth_request{uuid = PFuuid, username = PFusername, salt = PFsalt, token = PFtoken, timestamp = PFtimestamp}, #auth_request{uuid = NFuuid, username = NFusername, salt = NFsalt, token = NFtoken, timestamp = NFtimestamp}, _) ->
|
||||
#auth_request{uuid =
|
||||
if NFuuid =:= undefined -> PFuuid;
|
||||
true -> NFuuid
|
||||
@ -1879,10 +1878,6 @@ merge_msg_auth_request(#auth_request{uuid = PFuuid, username = PFusername, passw
|
||||
if NFusername =:= undefined -> PFusername;
|
||||
true -> NFusername
|
||||
end,
|
||||
password =
|
||||
if NFpassword =:= undefined -> PFpassword;
|
||||
true -> NFpassword
|
||||
end,
|
||||
salt =
|
||||
if NFsalt =:= undefined -> PFsalt;
|
||||
true -> NFsalt
|
||||
@ -1897,7 +1892,7 @@ merge_msg_auth_request(#auth_request{uuid = PFuuid, username = PFusername, passw
|
||||
end}.
|
||||
|
||||
-compile({nowarn_unused_function,merge_msg_auth_reply/3}).
|
||||
merge_msg_auth_reply(#auth_reply{code = PFcode, message = PFmessage}, #auth_reply{code = NFcode, message = NFmessage}, _) ->
|
||||
merge_msg_auth_reply(#auth_reply{code = PFcode, message = PFmessage, repository_url = PFrepository_url}, #auth_reply{code = NFcode, message = NFmessage, repository_url = NFrepository_url}, _) ->
|
||||
#auth_reply{code =
|
||||
if NFcode =:= undefined -> PFcode;
|
||||
true -> NFcode
|
||||
@ -1905,6 +1900,10 @@ merge_msg_auth_reply(#auth_reply{code = PFcode, message = PFmessage}, #auth_repl
|
||||
message =
|
||||
if NFmessage =:= undefined -> PFmessage;
|
||||
true -> NFmessage
|
||||
end,
|
||||
repository_url =
|
||||
if NFrepository_url =:= undefined -> PFrepository_url;
|
||||
true -> NFrepository_url
|
||||
end}.
|
||||
|
||||
-compile({nowarn_unused_function,merge_msg_session_request/3}).
|
||||
@ -2148,7 +2147,7 @@ verify_msg(Msg, MsgName, Opts) ->
|
||||
|
||||
-compile({nowarn_unused_function,v_msg_auth_request/3}).
|
||||
-dialyzer({nowarn_function,v_msg_auth_request/3}).
|
||||
v_msg_auth_request(#auth_request{uuid = F1, username = F2, password = F3, salt = F4, token = F5, timestamp = F6}, Path, TrUserData) ->
|
||||
v_msg_auth_request(#auth_request{uuid = F1, username = F2, salt = F3, token = F4, timestamp = F5}, Path, TrUserData) ->
|
||||
if F1 == undefined -> ok;
|
||||
true -> v_type_string(F1, [uuid | Path], TrUserData)
|
||||
end,
|
||||
@ -2156,29 +2155,29 @@ v_msg_auth_request(#auth_request{uuid = F1, username = F2, password = F3, salt =
|
||||
true -> v_type_string(F2, [username | Path], TrUserData)
|
||||
end,
|
||||
if F3 == undefined -> ok;
|
||||
true -> v_type_string(F3, [password | Path], TrUserData)
|
||||
true -> v_type_string(F3, [salt | Path], TrUserData)
|
||||
end,
|
||||
if F4 == undefined -> ok;
|
||||
true -> v_type_string(F4, [salt | Path], TrUserData)
|
||||
true -> v_type_string(F4, [token | Path], TrUserData)
|
||||
end,
|
||||
if F5 == undefined -> ok;
|
||||
true -> v_type_string(F5, [token | Path], TrUserData)
|
||||
end,
|
||||
if F6 == undefined -> ok;
|
||||
true -> v_type_uint32(F6, [timestamp | Path], TrUserData)
|
||||
true -> v_type_uint32(F5, [timestamp | Path], TrUserData)
|
||||
end,
|
||||
ok;
|
||||
v_msg_auth_request(X, Path, _TrUserData) -> mk_type_error({expected_msg, auth_request}, X, Path).
|
||||
|
||||
-compile({nowarn_unused_function,v_msg_auth_reply/3}).
|
||||
-dialyzer({nowarn_function,v_msg_auth_reply/3}).
|
||||
v_msg_auth_reply(#auth_reply{code = F1, message = F2}, Path, TrUserData) ->
|
||||
v_msg_auth_reply(#auth_reply{code = F1, message = F2, repository_url = F3}, Path, TrUserData) ->
|
||||
if F1 == undefined -> ok;
|
||||
true -> v_type_uint32(F1, [code | Path], TrUserData)
|
||||
end,
|
||||
if F2 == undefined -> ok;
|
||||
true -> v_type_string(F2, [message | Path], TrUserData)
|
||||
end,
|
||||
if F3 == undefined -> ok;
|
||||
true -> v_type_string(F3, [repository_url | Path], TrUserData)
|
||||
end,
|
||||
ok;
|
||||
v_msg_auth_reply(X, Path, _TrUserData) -> mk_type_error({expected_msg, auth_reply}, X, Path).
|
||||
|
||||
@ -2512,11 +2511,13 @@ get_msg_defs() ->
|
||||
[{{msg, auth_request},
|
||||
[#field{name = uuid, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []},
|
||||
#field{name = username, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []},
|
||||
#field{name = password, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []},
|
||||
#field{name = salt, fnum = 4, rnum = 5, type = string, occurrence = optional, opts = []},
|
||||
#field{name = token, fnum = 5, rnum = 6, type = string, occurrence = optional, opts = []},
|
||||
#field{name = timestamp, fnum = 6, rnum = 7, type = uint32, occurrence = optional, opts = []}]},
|
||||
{{msg, auth_reply}, [#field{name = code, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]},
|
||||
#field{name = salt, fnum = 4, rnum = 4, type = string, occurrence = optional, opts = []},
|
||||
#field{name = token, fnum = 5, rnum = 5, type = string, occurrence = optional, opts = []},
|
||||
#field{name = timestamp, fnum = 6, rnum = 6, type = uint32, occurrence = optional, opts = []}]},
|
||||
{{msg, auth_reply},
|
||||
[#field{name = code, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []},
|
||||
#field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []},
|
||||
#field{name = repository_url, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]},
|
||||
{{msg, session_request}, []},
|
||||
{{msg, session_reply}, [#field{name = a, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}]},
|
||||
{{msg, data},
|
||||
@ -2590,11 +2591,13 @@ fetch_enum_def(EnumName) -> erlang:error({no_such_enum, EnumName}).
|
||||
find_msg_def(auth_request) ->
|
||||
[#field{name = uuid, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []},
|
||||
#field{name = username, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []},
|
||||
#field{name = password, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []},
|
||||
#field{name = salt, fnum = 4, rnum = 5, type = string, occurrence = optional, opts = []},
|
||||
#field{name = token, fnum = 5, rnum = 6, type = string, occurrence = optional, opts = []},
|
||||
#field{name = timestamp, fnum = 6, rnum = 7, type = uint32, occurrence = optional, opts = []}];
|
||||
find_msg_def(auth_reply) -> [#field{name = code, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}];
|
||||
#field{name = salt, fnum = 4, rnum = 4, type = string, occurrence = optional, opts = []},
|
||||
#field{name = token, fnum = 5, rnum = 5, type = string, occurrence = optional, opts = []},
|
||||
#field{name = timestamp, fnum = 6, rnum = 6, type = uint32, occurrence = optional, opts = []}];
|
||||
find_msg_def(auth_reply) ->
|
||||
[#field{name = code, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []},
|
||||
#field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []},
|
||||
#field{name = repository_url, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}];
|
||||
find_msg_def(session_request) -> [];
|
||||
find_msg_def(session_reply) -> [#field{name = a, fnum = 1, rnum = 2, type = bool, occurrence = optional, opts = []}];
|
||||
find_msg_def(data) ->
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
-module(tcp_channel).
|
||||
-author("licheng5").
|
||||
-include("iot.hrl").
|
||||
-include("message_pb.hrl").
|
||||
|
||||
%% API
|
||||
-export([publish/3, stop/2, send/2]).
|
||||
@ -74,13 +75,10 @@ handle_call(_Request, _From, State) ->
|
||||
handle_cast(_Msg, State) ->
|
||||
{noreply, State}.
|
||||
|
||||
handle_info({tcp, Socket, <<?PACKET_REQUEST, PacketId:32, ?METHOD_AUTH:8, Request/binary>>}, State = #state{socket = Socket}) ->
|
||||
lager:debug("get request: ~p, packet_id: ~p", [Request, PacketId]),
|
||||
{noreply, State};
|
||||
|
||||
handle_info({binary, <<?PACKET_REQUEST, PacketId:32, ?METHOD_AUTH:8, Data/binary>>}, State) ->
|
||||
#{<<"uuid">> := UUID, <<"timestamp">> := Timestamp, <<"salt">> := Salt, <<"username">> := Username, <<"token">> := Token} = jiffy:decode(Data, [return_maps]),
|
||||
lager:debug("[ws_channel] auth uuid: ~p, request message: ~p", [UUID, Data]),
|
||||
%% auth验证
|
||||
handle_info({tcp, Socket, <<?PACKET_REQUEST, PacketId:32, ?METHOD_AUTH:8, AuthRequestBin/binary>>}, State = #state{transport = Transport, socket = Socket}) ->
|
||||
#auth_request{ uuid = UUID, username = Username, token = Token, salt = Salt, timestamp = Timestamp } = message_pb:decode_msg(AuthRequestBin, auth_request),
|
||||
lager:debug("[ws_channel] auth uuid: ~p, request message: ~p", [UUID]),
|
||||
case iot_auth:check(Username, Token, UUID, Salt, Timestamp) of
|
||||
true ->
|
||||
case host_bo:get_host_by_uuid(UUID) of
|
||||
@ -94,9 +92,14 @@ handle_info({binary, <<?PACKET_REQUEST, PacketId:32, ?METHOD_AUTH:8, Data/binary
|
||||
ok ->
|
||||
%% 建立到host的monitor
|
||||
erlang:monitor(process, HostPid),
|
||||
Reply = jiffy:encode(#{<<"code">> => 1, <<"message">> => <<"ok">>}, [force_utf8]),
|
||||
AuthReplyBin = message_pb:encode_msg(#auth_reply{
|
||||
code = 1,
|
||||
message = <<"ok">>,
|
||||
repository_url = <<"https://www.baidu.com">>
|
||||
}),
|
||||
Transport:send(Socket, <<?PACKET_RESPONSE, PacketId:32, 0:8, AuthReplyBin/binary>>),
|
||||
|
||||
{reply, {binary, <<?PACKET_RESPONSE, PacketId:32, 0:8, Reply/binary>>}, State#state{uuid = UUID, host_pid = HostPid}};
|
||||
{noreply, State#state{uuid = UUID, host_pid = HostPid}};
|
||||
{error, Reason} ->
|
||||
lager:debug("[ws_channel] uuid: ~p, attach channel get error: ~p", [UUID, Reason]),
|
||||
{stop, State}
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
{jiffy, ".*", {git, "https://github.com/davisp/jiffy.git", {tag, "1.1.1"}}},
|
||||
{mysql, ".*", {git, "https://github.com/mysql-otp/mysql-otp", {tag, "1.8.0"}}},
|
||||
{eredis, ".*", {git, "https://github.com/wooga/eredis.git", {tag, "v1.2.0"}}},
|
||||
{gpb, ".*", {git, "https://github.com/tomas-abrahamsson/gpb.git", {tag, "4.20.0"}}},
|
||||
{parse_trans, ".*", {git, "https://github.com/uwiger/parse_trans", {tag, "3.0.0"}}},
|
||||
{lager, ".*", {git,"https://github.com/erlang-lager/lager.git", {tag, "3.9.2"}}}
|
||||
]}.
|
||||
|
||||
@ -18,6 +18,10 @@
|
||||
0},
|
||||
{<<"fs">>,{pkg,<<"fs">>,<<"6.1.1">>},1},
|
||||
{<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
|
||||
{<<"gpb">>,
|
||||
{git,"https://github.com/tomas-abrahamsson/gpb.git",
|
||||
{ref,"edda1006d863a09509673778c455d33d88e6edbc"}},
|
||||
0},
|
||||
{<<"hackney">>,
|
||||
{git,"https://github.com/benoitc/hackney.git",
|
||||
{ref,"f3e9292db22c807e73f57a8422402d6b423ddf5f"}},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user