diff options
author | Rudolf J Streif <rstreif@jaguarlandrover.com> | 2016-02-25 12:47:39 -0800 |
---|---|---|
committer | Rudolf J Streif <rstreif@jaguarlandrover.com> | 2016-02-25 12:47:39 -0800 |
commit | 6120c93603d682d812660fc98fd9c87cdcd3eee0 (patch) | |
tree | a0df9858e1c9e0b3cb4a61ecd65c64b17bcdee20 | |
parent | e00143a638f46f9c6d175989c5394a6408532a60 (diff) | |
parent | 4efac88faab6de8b488869e866b37930db8468a8 (diff) | |
download | rvi_core-6120c93603d682d812660fc98fd9c87cdcd3eee0.tar.gz |
Merge pull request #90 from uwiger/uw-right_to_receive
Uw right to receive
Agreed on change from right_to_register to right_to_receive for clarity.
-rw-r--r-- | components/authorize/src/authorize_keys.erl | 17 | ||||
-rw-r--r-- | test/rvi_core_SUITE.erl | 8 |
2 files changed, 13 insertions, 12 deletions
diff --git a/components/authorize/src/authorize_keys.erl b/components/authorize/src/authorize_keys.erl index 38dae1c..c2368d5 100644 --- a/components/authorize/src/authorize_keys.erl +++ b/components/authorize/src/authorize_keys.erl @@ -49,7 +49,7 @@ %% cert}). -record(cred, {id, - right_to_register = [], + right_to_receive = [], right_to_invoke = [], validity = [], device_cert, @@ -301,12 +301,12 @@ find_cred_by_service_(Service) -> SvcParts = split_path(strip_prot(Service)), LocalCreds = ets:select(?CREDS, [{ {{local,'_'}, '$1'}, [], ['$1'] }]), ?debug("find_creds_by_service(~p~nLocalCreds = ~p~n", - [Service, [{Id,Reg,Inv} || #cred{id = Id, + [Service, [{Id,Rcv,Inv} || #cred{id = Id, right_to_invoke = Inv, - right_to_register = Reg} <- LocalCreds]]), + right_to_receive = Rcv} <- LocalCreds]]), case lists:foldl( - fun(#cred{right_to_register = Register} = C, {Max, _} = Acc) -> - case match_length(Register, SvcParts) of + fun(#cred{right_to_receive = Receive} = C, {Max, _} = Acc) -> + case match_length(Receive, SvcParts) of L when L > Max -> {L, C}; _ -> @@ -540,8 +540,9 @@ process_cred_struct(Cred, Bin, UTC, Cert) -> process_cred_struct_(Cred, Bin, UTC, DevCert) -> ID = cred_id(Cred), - {ok, Register} = rvi_common:get_json_element( - [{'OR', ["right_to_register", "sources", "register"]}], Cred), + {ok, Receive} = rvi_common:get_json_element( + [{'OR', ["right_to_receive", "right_to_register", + "sources", "register"]}], Cred), {ok, Invoke} = rvi_common:get_json_element( [{'OR', ["right_to_invoke", "destinations", "invoke"]}], Cred), {ok, Start} = rvi_common:get_json_element( @@ -561,7 +562,7 @@ process_cred_struct_(Cred, Bin, UTC, DevCert) -> case check_validity(Start, Stop, UTC) of true -> #cred{id = ID, - right_to_register = Register, + right_to_receive = Receive, right_to_invoke = Invoke, validity = Validity, jwt = Bin, diff --git a/test/rvi_core_SUITE.erl b/test/rvi_core_SUITE.erl index 63a36ca..52c262b 100644 --- a/test/rvi_core_SUITE.erl +++ b/test/rvi_core_SUITE.erl @@ -643,7 +643,7 @@ generate_cred(sample, KeyDir, CredDir, _Config) -> " --start='", Start, "'" " --stop='", Stop, "'" " --root_key=", root_keys(), "/root_key.pem" - " --register='jlr.com/vin/abc/unlock jlr.com/vin/abc/lock'" + " --receive='jlr.com/vin/abc/unlock jlr.com/vin/abc/lock'" " --invoke='jlr.com/backend/set_state'" " --jwt_out=", CredDir, "/lock_cred.jwt" " --cred_out=", KeyDir, "/lock_cred.json"]), @@ -658,7 +658,7 @@ generate_cred(backend, KeyDir, CertDir, _Config) -> " --start='", Start, "'" " --stop='", Stop, "'" " --root_key=", root_keys(), "/root_key.pem" - " --register='jlr.com'" + " --receive='jlr.com'" " --invoke='jlr.com'" " --jwt_out=", CertDir, "/backend_cred.jwt" " --cred_out=", KeyDir, "/backend_cred.json"]), @@ -676,7 +676,7 @@ generate_sota_cred(sample, KeyDir, CredDir, _Config) -> " --start='", Start, "'" " --stop='", Stop, "'" " --root_key=", root_keys(), "/root_key.pem" - " --register='jlr.com/vin/abc/store'" + " --receive='jlr.com/vin/abc/store'" " --invoke='jlr.com/backend/set_state'" " --jwt_out=", CredDir, "/sota_cred.jwt" " --cred_out=", KeyDir, "/sota_cred.json"]), @@ -691,7 +691,7 @@ generate_sota_cred(backend, KeyDir, CertDir, _Config) -> " --start='", Start, "'" " --stop='", Stop, "'" " --root_key=", root_keys(), "/root_key.pem" - " --register='jlr.com'" + " --receive='jlr.com'" " --invoke='jlr.com'" " --jwt_out=", CertDir, "/sota_backend_cred.jwt" " --cred_out=", KeyDir, "/sota_backend_cred.json"]), |