March 2024 - gerrit-log - lists.osmocom.org

[M] Change in ...osmo-epdg[master]: Propagate SWx PPR as S6b Re-Auth-Request

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36308?usp=email ) Change subject: Propagate SWx PPR as S6b Re-Auth-Request ...................................................................... Propagate SWx PPR as S6b Re-Auth-Request This commit implements the 3GPP TS 29.273 section 9.1.2.5 "Service Authorization Information Update Procedures". Related: OS#6400 Change-Id: I0e263dae37d5b8b3cdce2014787eb82910ed686a --- M src/aaa_diameter_s6b.erl M src/aaa_diameter_s6b_cb.erl M src/aaa_ue_fsm.erl 3 files changed, 80 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/08/36308/1 diff --git a/src/aaa_diameter_s6b.erl b/src/aaa_diameter_s6b.erl index f8f9027..1639d02 100644 --- a/src/aaa_diameter_s6b.erl +++ b/src/aaa_diameter_s6b.erl @@ -49,7 +49,7 @@ %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2, peer_down/3]). -export([code_change/3]). --export([tx_as_request/1]). +-export([tx_reauth_request/1, tx_as_request/1]). -export([tx_aa_answer/2, tx_st_answer/2]). %% Diameter Application Definitions @@ -138,9 +138,30 @@ % handle_request(STR) was spawned into its own process, and it's blocked waiting for STA: Pid ! {sta, DiaRC}. +tx_reauth_request(NAI) -> + gen_server:call(?SERVER, {rar, NAI}). + tx_as_request(NAI) -> gen_server:call(?SERVER, {asr, NAI}). +handle_call({rar, NAI}, _From, State) -> + lager:debug("S6b Tx RAR NAI=~p~n", [NAI]), + SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, dia_s6b_origin_host, ?ENV_DEFAULT_ORIG_HOST)), + RAR = #'RAR'{'Session-Id' = SessionId, + 'Auth-Application-Id' = ?DIAMETER_APP_ID_S6b, + 'Re-Auth-Request-Type' = ?'RE-AUTH-REQUEST-TYPE_AUTHORIZE_ONLY', + 'User-Name' = [NAI] + }, + lager:debug("S6b Tx RAR: ~p~n", [RAR]), + Ret = diameter_call(RAR, State), + case Ret of + ok -> + {reply, ok, State}; + {error, Err} -> + lager:error("Error: ~w~n", [Err]), + {reply, {error, Err}, State} + end; + handle_call({asr, NAI}, _From, State) -> lager:debug("S6b Tx ASR NAI=~p~n", [NAI]), SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, dia_s6b_origin_host, ?ENV_DEFAULT_ORIG_HOST)), diff --git a/src/aaa_diameter_s6b_cb.erl b/src/aaa_diameter_s6b_cb.erl index b3f8d5f..8e2bcca 100644 --- a/src/aaa_diameter_s6b_cb.erl +++ b/src/aaa_diameter_s6b_cb.erl @@ -41,6 +41,15 @@ | Avps]}; % TODO: is there a simple way to capture all the following requests? prepare_request(#diameter_packet{msg = Req}, _, {_, Caps}) + when is_record(Req, 'RAR') -> + #diameter_caps{origin_host = {OH, DH}, origin_realm = {OR, DR}} = Caps, + Msg = Req#'RAR'{'Origin-Host' = OH, + 'Origin-Realm' = OR, + 'Destination-Realm' = DR, + 'Destination-Host' = DH}, + lager:debug("S6b prepare_request: ~p~n", [Msg]), + {send, Msg}; +prepare_request(#diameter_packet{msg = Req}, _, {_, Caps}) when is_record(Req, 'ASR') -> #diameter_caps{origin_host = {OH, DH}, origin_realm = {OR, DR}} = Caps, Msg = Req#'ASR'{'Origin-Host' = OH, @@ -134,6 +143,22 @@ erlang:error({unexpected, ?MODULE, ?LINE}). %% handle_answer/4 +handle_answer(#diameter_packet{msg = Msg, errors = Errors}, Request, _SvcName, Peer) when is_record(Msg, 'RAA') -> + lager:info("S6b Rx RAA ~p: ~p/ Errors ~p ~n", [Peer, Msg, Errors]), + % Obtain Imsi from originating Request: + #'RAR'{'User-Name' = [NAI]} = Request, + Imsi = conv:nai_to_imsi(NAI), + PidRes = aaa_ue_fsm:get_pid_by_imsi(Imsi), + #'RAA'{'Result-Code' = ResultCode} = Msg, + DiaRC = #epdg_dia_rc{result_code = ResultCode}, + case conv:dia_rc_success(DiaRC) of + ok -> + aaa_ue_fsm:ev_rx_s6b_raa(PidRes, ok); + _ -> + aaa_ue_fsm:ev_rx_s6b_raa(PidRes, {error, DiaRC}) + end, + {ok, Msg}; + handle_answer(#diameter_packet{msg = Msg, errors = Errors}, Request, _SvcName, Peer) when is_record(Msg, 'ASA') -> lager:info("S6b Rx ASA ~p: ~p/ Errors ~p ~n", [Peer, Msg, Errors]), % Obtain Imsi from originating Request: diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index b32d6c0..38538b5 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -44,7 +44,7 @@ -export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). -export([ev_rx_swm_auth_req/2, ev_rx_swm_reauth_answer/2, ev_rx_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swm_asa/1, ev_rx_swx_maa/2, ev_rx_swx_saa/2, ev_rx_swx_ppr/2, ev_rx_swx_rtr/1, - ev_rx_s6b_aar/2, ev_rx_s6b_str/1, ev_rx_s6b_asa/2]). + ev_rx_s6b_aar/2, ev_rx_s6b_str/1, ev_rx_s6b_raa/2, ev_rx_s6b_asa/2]). -export([state_new/3, state_wait_swx_maa/3, state_wait_swx_saa/3, @@ -175,6 +175,15 @@ {error, Err} end. +ev_rx_s6b_raa(Pid, Result) -> + lager:info("ue_fsm ev_rx_s6b_raa: ~p~n", [Result]), + try + gen_statem:call(Pid, {rx_s6b_raa, Result}) + catch + exit:Err -> + {error, Err} + end. + ev_rx_s6b_asa(Pid, Result) -> lager:info("ue_fsm ev_rx_s6b_asa: ~p~n", [Result]), try @@ -340,16 +349,22 @@ %% After a successful user profile download, the 3GPP AAA Server shall %% initiate re-authentication procedure as described %% in clause 7.2.2.4 - case aaa_diameter_swm:tx_reauth_request(Data#ue_fsm_data.imsi) of - ok -> {keep_state, Data, [{reply,From,ok}]}; - {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} - end; + aaa_diameter_swm:tx_reauth_request(Data#ue_fsm_data.imsi), + aaa_diameter_s6b:tx_reauth_request(Data#ue_fsm_data.nai), + %% Following a successful download of subscription and equipment trace data, the 3GPP AAA Server shall forward the + %% trace data by initiating reauthorization towards all PDN GWs that have an active authorization session. + {keep_state, Data, [{reply,From,ok}]}; state_authenticated({call, From}, {rx_swm_reauth_answer, Result}, Data) -> lager:info("ue_fsm state_authenticated event=rx_swm_reauth_answer ~p, ~p~n", [Result, Data]), %% SWx PPA was already answered immediately when PPR was received, nothing to do here. {keep_state, Data, [{reply,From,ok}]}; +state_authenticated({call, From}, {rx_s6b_raa, Result}, Data) -> + lager:info("ue_fsm state_authenticated event=rx_s6b_raa ~p, ~p~n", [Result, Data]), + %% SWx PPA was already answered immediately when PPR was received, nothing to do here. + {keep_state, Data, [{reply,From,ok}]}; + state_authenticated({call, From}, rx_swx_rtr, Data) -> lager:info("ue_fsm state_authenticated event=rx_swx_rtr ~p~n", [Data]), case {Data#ue_fsm_data.pgw_sess_active, Data#ue_fsm_data.epdg_sess_active} of -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I0e263dae37d5b8b3cdce2014787eb82910ed686a Gerrit-Change-Number: 36308 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: TC_hss_initiated_update_user_profile: test SWx PPR -> S6b RAR p...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36307?usp=email ) Change subject: epdg: TC_hss_initiated_update_user_profile: test SWx PPR -> S6b RAR propagation ...................................................................... epdg: TC_hss_initiated_update_user_profile: test SWx PPR -> S6b RAR propagation Related: OS#6400 Change-Id: I064ee9e18809a507d0185f640b4a972ee5a2ce3f --- M epdg/EPDG_Tests.ttcn M library/DIAMETER_Templates.ttcn M library/DIAMETER_ts29_273_Templates.ttcn 3 files changed, 115 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/36307/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 1742fd7..e6df4fc 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -472,7 +472,8 @@ } /* Send PPR as HSS to AAA server, expect back PPA */ -private function f_DIA_SWx_PP(template (present) GenericAVP exp_result_tmpl := tr_AVP_ResultCode(DIAMETER_SUCCESS)) runs on EPDG_ConnHdlr { +private function f_DIA_SWx_PP(template (present) GenericAVP exp_result_tmpl := tr_AVP_ResultCode(DIAMETER_SUCCESS), + boolean exp_aaa_proc := true) runs on EPDG_ConnHdlr { var PDU_DIAMETER rx_dia; var UINT32 hbh_id := f_rnd_octstring(4); var UINT32 ete_id := f_rnd_octstring(4); @@ -489,6 +490,19 @@ hbh_id := hbh_id, ete_id := ete_id)); + if (exp_aaa_proc) { + /* TODO: in successful case, we want to validate how this prcoedure extends to other interfaces: + * """ 3GPP TS 29.273 8.1.2.3.3: + * After a successful user profile download, the 3GPP AAA Server shall + * initiate re-authentication procedure as described + * in clause 7.2.2.4 if the subscriber has previously been authenticated + * and authorized to untrusted non-3GPP access. + * """ + */ + /* AAA-server should do RAR+RAA towards PGW: */ + as_DIA_S6b_RA_success(); + } + alt { [] SWx.receive(tr_DIA_SWx_PPA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { @@ -587,6 +601,25 @@ } } +/* Diameter S6b RAR + RAA, TS 29.273 9.1.2.5. */ +private altstep as_DIA_S6b_RA_success() runs on EPDG_ConnHdlr { + var PDU_DIAMETER rx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + [] S6b.receive(tr_DIA_S6b_RAR(f_nai())) -> value rx_dia { + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + S6b.send(ts_DIA_S6b_RAA(DIAMETER_SUCCESS, + sess_id := sess_id, + hbh_id := rx_dia.hop_by_hop_id, + ete_id := rx_dia.end_to_end_id)); + setverdict(pass); + } + [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia)); + } +} + /* Diameter S6b ASR + ASA, TS 29.273 9.1.2.3.4. */ private altstep as_DIA_S6b_AS_success() runs on EPDG_ConnHdlr { var PDU_DIAMETER rx_dia; @@ -602,7 +635,7 @@ setverdict(pass); } [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia)); } } @@ -1188,7 +1221,8 @@ */ private function f_TC_hss_initiated_update_user_profile_unknown(charstring id) runs on EPDG_ConnHdlr { var DIAMETER_ts29_229_ExperimentalResultcode erc := DIAMETER_ERROR_USER_UNKNOWN; - f_DIA_SWx_PP(tr_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(erc), 4))); + f_DIA_SWx_PP(tr_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(erc), 4)), + exp_aaa_proc := false); } testcase TC_hss_initiated_update_user_profile_unknown() runs on MTC_CT { var EPDG_ConnHdlrPars pars := f_init_pars(); diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 933c97b..7148513 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -1144,6 +1144,23 @@ } } +/* RFC6733 8.12. Re-Auth-Request-Type AVP */ +template (value) GenericAVP ts_AVP_ReAuthRequestType(BASE_NONE_Re_Auth_Request_Type reauth_req_type) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Re_Auth_Request_Type, '00000000'B), + avp_data := { + avp_BASE_NONE_Re_Auth_Request_Type := reauth_req_type + } + } +} +template (present) GenericAVP tr_AVP_ReAuthRequestType(template (present) BASE_NONE_Re_Auth_Request_Type reauth_req_type) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Re_Auth_Request_Type), + avp_data := { + avp_BASE_NONE_Re_Auth_Request_Type := reauth_req_type + } + } +} /* 5.3.1 Capabilities Exchange Request */ template (value) PDU_DIAMETER diff --git a/library/DIAMETER_ts29_273_Templates.ttcn b/library/DIAMETER_ts29_273_Templates.ttcn index dcb5a31..6ed00ff 100644 --- a/library/DIAMETER_ts29_273_Templates.ttcn +++ b/library/DIAMETER_ts29_273_Templates.ttcn @@ -623,4 +623,55 @@ ts_AVP_OriginRealm(orig_realm) }); +/* TS 29.273 9.2.2.6.1 Re-Auth-Request (RAR) + * TS 29.273 Table 9.1.2.5.1/1: S6b Re-authorization request */ +template (present) PDU_DIAMETER +tr_DIA_S6b_RAR(template (present) charstring username_nai := ?, + template (present) octetstring sess_id := ?, + template (present) charstring orig_host := ?, + template (present) charstring orig_realm := ?, + template (present) charstring dest_realm := ?, + template (present) charstring dest_host := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?) := + tr_DIAMETER(flags := '1???????'B, + cmd_code := Re_Auth, + app_id := int2oct(c_DIAMETER_3GPP_S6b_AID, 4), + hbh_id := hbh_id, + ete_id := ete_id, + avps := superset( + tr_AVP_SessionId(sess_id), + /* Optional: DRMP, */ + tr_AVP_OriginHost(orig_host), + tr_AVP_OriginRealm(orig_realm), + tr_AVP_DestinationRealm(dest_realm), + tr_AVP_DestinationHost(dest_host), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_3GPP_S6b_AID, 4)), + tr_AVP_ReAuthRequestType(AUTHORIZE_ONLY), + tr_AVP_UserName(char2oct_tmpl_present(username_nai)) + /* Optional: RAR-Flags, */ + )); + +/* TS 29.273 9.2.2.6.2 Re-Auth-Answer (RAA) + * TS 29.273 Table 9.1.2.5.1/2: S6b Re-authorization response */ +template (value) PDU_DIAMETER +ts_DIA_S6b_RAA(template (value) DIAMETER_Resultcode res_code := DIAMETER_SUCCESS, + template (value) octetstring sess_id := c_def_sess_id, + template (value) charstring orig_host := "aaa.localdomain", + template (value) charstring orig_realm := "localdomain", + template (value) charstring dest_realm := "localdomain", + template (value) UINT32 hbh_id := '00000000'O, + template (value) UINT32 ete_id := '00000000'O) := + ts_DIAMETER(flags := '01000000'B, + cmd_code := Re_Auth, + app_id := int2oct(c_DIAMETER_3GPP_S6b_AID, 4), + hbh_id := hbh_id, ete_id := ete_id, + avps := { + ts_AVP_SessionId(sess_id), + /* Optional: DRMP, */ + ts_AVP_ResultCode(res_code), + ts_AVP_OriginHost(orig_host), + ts_AVP_OriginRealm(orig_realm) + }); + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36307?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I064ee9e18809a507d0185f640b4a972ee5a2ce3f Gerrit-Change-Number: 36307 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Propagate SWx PPR as SWm Authorization Update towards ePDG

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Propagate SWx PPR as SWm Authorization Update towards ePDG ...................................................................... Propagate SWx PPR as SWm Authorization Update towards ePDG With this commit ePDG is still not invoking the authorization procedure specified in 3GPP TS 29.273 7.1.2.2, but only ACKing the RAR message from 7.1.2.5. Related: OS#6404, OS#6400. Change-Id: I4fe309ac54c61f134dbd471486c7d1a70731c9bb --- M src/aaa_diameter_swm.erl M src/aaa_diameter_swx_cb.erl M src/aaa_ue_fsm.erl M src/epdg_diameter_swm.erl M src/epdg_ue_fsm.erl 5 files changed, 147 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/05/36305/4 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I4fe309ac54c61f134dbd471486c7d1a70731c9bb Gerrit-Change-Number: 36305 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: dia/diameter_3gpp_ts29_273_s6b.dia: Fix missing whitespace

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36306?usp=email ) Change subject: dia/diameter_3gpp_ts29_273_s6b.dia: Fix missing whitespace ...................................................................... dia/diameter_3gpp_ts29_273_s6b.dia: Fix missing whitespace Change-Id: I88a86a3c435d93e21b5ac88a55349ed65bdd2e98 --- M dia/diameter_3gpp_ts29_273_s6b.dia 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/06/36306/1 diff --git a/dia/diameter_3gpp_ts29_273_s6b.dia b/dia/diameter_3gpp_ts29_273_s6b.dia index 5468458..6b46171 100644 --- a/dia/diameter_3gpp_ts29_273_s6b.dia +++ b/dia/diameter_3gpp_ts29_273_s6b.dia @@ -154,7 +154,7 @@ { Auth-Application-Id } { Re-Auth-Request-Type } [ User-Name ] - [RAR-Flags ] + [ RAR-Flags ] *[ AVP ] ;; 9.2.2.6.2 Re-Auth-Answer (RAA) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36306?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I88a86a3c435d93e21b5ac88a55349ed65bdd2e98 Gerrit-Change-Number: 36306 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Propagate SWx PPR as SWm Authorization Update towards ePDG

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?usp=email ) Change subject: Propagate SWx PPR as SWm Authorization Update towards ePDG ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I4fe309ac54c61f134dbd471486c7d1a70731c9bb Gerrit-Change-Number: 36305 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 15 Mar 2024 16:28:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Propagate SWx PPR as SWm Authorization Update towards ePDG

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Propagate SWx PPR as SWm Authorization Update towards ePDG ...................................................................... Propagate SWx PPR as SWm Authorization Update towards ePDG With this commit ePDG is still not invoking the authorization procedure specified in 3GPP TS 29.273 7.1.2.2, but only ACKing the message. Related: OS#6404, OS#6400. Change-Id: I4fe309ac54c61f134dbd471486c7d1a70731c9bb --- M src/aaa_diameter_swm.erl M src/aaa_diameter_swx_cb.erl M src/aaa_ue_fsm.erl M src/epdg_diameter_swm.erl M src/epdg_ue_fsm.erl 5 files changed, 131 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/05/36305/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I4fe309ac54c61f134dbd471486c7d1a70731c9bb Gerrit-Change-Number: 36305 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Propagate SWx PPR as SWm Authorization Update towards ePDG

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?usp=email ) Change subject: Propagate SWx PPR as SWm Authorization Update towards ePDG ...................................................................... Patch Set 1: (1 comment) File src/aaa_ue_fsm.erl: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15152): https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305/comment/e7dc5a41_e658… PS1, Line 346: %% SWx PPA was already answered immediatelly when PPR was received, nothing to do here. 'immediatelly' may be misspelled - perhaps 'immediately'? -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I4fe309ac54c61f134dbd471486c7d1a70731c9bb Gerrit-Change-Number: 36305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 15 Mar 2024 15:28:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Propagate SWx PPR as SWm Authorization Update towards ePDG

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?usp=email ) Change subject: Propagate SWx PPR as SWm Authorization Update towards ePDG ...................................................................... Propagate SWx PPR as SWm Authorization Update towards ePDG With this commit ePDG is still not invoking the authorization procedure specified in 3GPP TS 29.273 7.1.2.2, but only ACKing the message. Related: OS#6404, OS#6400. Change-Id: I4fe309ac54c61f134dbd471486c7d1a70731c9bb --- M src/aaa_diameter_swm.erl M src/aaa_diameter_swx_cb.erl M src/aaa_ue_fsm.erl M src/epdg_diameter_swm.erl M src/epdg_ue_fsm.erl 5 files changed, 131 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/05/36305/1 diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index 9fa656e..e084cb4 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -15,10 +15,15 @@ -export([code_change/3, terminate/2]). -export([rx_auth_request/4, + rx_auth_answer/2, rx_auth_compl_request/2, rx_session_termination_request/1, rx_abort_session_answer/1]). --export([tx_auth_response/2, tx_auth_compl_response/2, tx_session_termination_answer/2, tx_as_request/1]). +-export([tx_auth_request/1, + tx_auth_response/2, + tx_auth_compl_response/2, + tx_session_termination_answer/2, + tx_as_request/1]). -define(SERVER, ?MODULE). @@ -32,6 +37,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Tx over emulated SWm wire: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +tx_auth_request(Imsi) -> + _Result = gen_server:call(?SERVER, {aar, Imsi}). + tx_auth_response(Imsi, Result) -> _Result = gen_server:call(?SERVER, {epdg_auth_resp, Imsi, Result}). @@ -50,6 +59,9 @@ rx_auth_request(Imsi, PdpTypeNr, Apn, EAP) -> gen_server:cast(?SERVER, {epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}). +rx_auth_answer(Imsi, Result) -> + gen_server:cast(?SERVER, {aaa, Imsi, Result}). + rx_auth_compl_request(Imsi, Apn) -> gen_server:cast(?SERVER, {epdg_auth_compl_req, Imsi, Apn}). @@ -59,6 +71,8 @@ rx_abort_session_answer(Imsi) -> gen_server:cast(?SERVER, {asa, Imsi}). +%% handle_cast: Rx side + handle_cast({epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}, State) -> case aaa_ue_fsm:get_pid_by_imsi(Imsi) of undefined -> {ok, Pid} = aaa_ue_fsm:start(Imsi); @@ -77,6 +91,13 @@ end, {noreply, State}; +handle_cast({aaa, Imsi, Result}, State) -> + case aaa_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> aaa_ue_fsm:ev_rx_swm_auth_answer(Pid, Result); + undefined -> ok + end, + {noreply, State}; + handle_cast({str, Imsi}, State) -> case aaa_ue_fsm:get_pid_by_imsi(Imsi) of Pid when is_pid(Pid) -> @@ -111,6 +132,7 @@ error_logger:error_report(["unknown handle_info", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. +%% handle_call: Tx side handle_call({epdg_auth_resp, Imsi, Result}, _From, State) -> epdg_diameter_swm:rx_auth_response(Imsi, Result), {reply, ok, State}; @@ -119,6 +141,10 @@ epdg_diameter_swm:rx_auth_compl_response(Imsi, Result), {reply, ok, State}; +handle_call({aar, Imsi}, _From, State) -> + epdg_diameter_swm:rx_auth_request(Imsi), + {reply, ok, State}; + handle_call({sta, Imsi, DiaRC}, _From, State) -> epdg_diameter_swm:rx_session_termination_answer(Imsi, DiaRC), {reply, ok, State}; diff --git a/src/aaa_diameter_swx_cb.erl b/src/aaa_diameter_swx_cb.erl index 93335a2..99d2ba3 100644 --- a/src/aaa_diameter_swx_cb.erl +++ b/src/aaa_diameter_swx_cb.erl @@ -81,14 +81,8 @@ 'Non-3GPP-User-Data' = N3UAopt} = Req, case aaa_ue_fsm:get_pid_by_imsi(Imsi) of Pid when is_pid(Pid) -> - _PGWAddresses = parse_pgw_addr_from_N3UA(N3UAopt), - %% TODO: in successful case, we want to validate how this prcoedure extends to other interfaces: - %% """ 3GPP TS 29.273 8.1.2.3.3: - %% After a successful user profile download, the 3GPP AAA Server shall - %% initiate re-authentication procedure as described - %% in clause 7.2.2.4 if the subscriber has previously been authenticated - %% and authorized to untrusted non-3GPP access. - %% """ + PGWAddresses = parse_pgw_addr_from_N3UA(N3UAopt), + aaa_ue_fsm:ev_rx_swx_ppr(Pid, {PGWAddresses}), Res = 2001, %% Success ERes = []; undefined -> diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index 9ec6a00..4c7e7cc 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -42,8 +42,8 @@ -export([start/1, stop/1]). -export([init/1,callback_mode/0,terminate/3]). -export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). --export([ev_rx_swm_auth_req/2, ev_rx_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swm_asa/1, - ev_rx_swx_maa/2, ev_rx_swx_saa/2, ev_rx_swx_rtr/1, +-export([ev_rx_swm_auth_req/2, ev_rx_swm_auth_answer/2, ev_rx_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swm_asa/1, + ev_rx_swx_maa/2, ev_rx_swx_saa/2, ev_rx_swx_ppr/2, ev_rx_swx_rtr/1, ev_rx_s6b_aar/2, ev_rx_s6b_str/1, ev_rx_s6b_asa/2]). -export([state_new/3, state_wait_swx_maa/3, @@ -94,6 +94,14 @@ exit:Err -> {error, Err} end. +ev_rx_swm_auth_answer(Pid, Result) -> + lager:info("ue_fsm ev_rx_swm_auth_answer~n", []), + try + gen_statem:call(Pid, {rx_swm_auth_answer, Result}) + catch + exit:Err -> + {error, Err} + end. ev_rx_swm_auth_compl(Pid, Apn) -> lager:info("ue_fsm ev_rx_swm_auth_compl~n", []), @@ -140,6 +148,15 @@ {error, Err} end. +ev_rx_swx_ppr(Pid, PGWAddresses) -> + lager:info("ue_fsm ev_rx_swx_ppr~n", []), + try + gen_statem:call(Pid, {rx_swx_ppr, PGWAddresses}) + catch + exit:Err -> + {error, Err} + end. + ev_rx_swx_rtr(Pid) -> lager:info("ue_fsm ev_rx_swx_rtr~n", []), try @@ -318,6 +335,17 @@ lager:info("ue_fsm state_authenticated event=rx_swm_auth_req {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), {next_state, state_new, Data, [postpone]}; +state_authenticated({call, From}, {rx_swx_ppr, _PGWAddresses}, Data) -> + case aaa_diameter_swm:tx_auth_request(Data#ue_fsm_data.imsi) of + ok -> {keep_state, Data, [{reply,From,ok}]}; + {error, Err} -> {keep_state, Data, [{reply,From,{error, Err}}]} + end; + +state_authenticated({call, From}, {rx_swm_auth_answer, Result}, Data) -> + lager:info("ue_fsm state_authenticated event=rx_swm_auth_answer ~p, ~p~n", [Result, Data]), + %% SWx PPA was already answered immediatelly when PPR was received, nothing to do here. + {keep_state, Data, [{reply,From,ok}]}; + state_authenticated({call, From}, rx_swx_rtr, Data) -> lager:info("ue_fsm state_authenticated event=rx_swx_rtr ~p~n", [Data]), case {Data#ue_fsm_data.pgw_sess_active, Data#ue_fsm_data.epdg_sess_active} of diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index c060d17..c85724a 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -5,6 +5,7 @@ -behaviour(gen_server). -include_lib("diameter_3gpp_ts29_273_swx.hrl"). +-include("conv.hrl"). -record(swm_state, { sessions = sets:new() @@ -20,10 +21,12 @@ -export([code_change/3, terminate/2]). -export([tx_auth_request/4, + tx_auth_answer/2, tx_auth_compl_request/2, tx_session_termination_request/1, tx_abort_session_answer/1]). --export([rx_auth_response/2, +-export([rx_auth_request/1, + rx_auth_response/2, rx_auth_compl_response/2, rx_session_termination_answer/2, rx_abort_session_request/1]). @@ -54,6 +57,11 @@ _ -> Result end. +tx_auth_answer(Imsi, DiaRC) -> + % In Diameter we use Imsi as strings, as done by diameter module. + ImsiStr = binary_to_list(Imsi), + _Result = gen_server:call(?SERVER, {aaa, ImsiStr, DiaRC}). + % Rx "GSUP CEAI LU Req" is our way of saying Rx "Swm Diameter-EAP REQ (DER) with EAP AVP containing successuful auth": tx_auth_compl_request(Imsi, Apn) -> % In Diameter we use Imsi as strings, as done by diameter module. @@ -95,6 +103,11 @@ ok = aaa_diameter_swm:rx_auth_request(Imsi, PdpTypeNr, Apn, EAP), {reply, ok, State1}; +handle_call({aaa, Imsi, DiaRC}, {Pid, _Tag} = _From, State) -> + % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: + aaa_diameter_swm:rx_auth_answer(Imsi, DiaRC#epdg_dia_rc.result_code), + {reply, ok, State}; + handle_call({epdg_auth_compl_req, Imsi, Apn}, _From, State) -> % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: Sess = find_swm_session_by_imsi(Imsi, State), @@ -128,6 +141,25 @@ end, {reply, Reply, State}. +handle_cast({aar, Imsi}, State) -> + Sess = find_swm_session_by_imsi(Imsi, State), + case Sess of + #swm_session{imsi = Imsi} -> + case epdg_ue_fsm:received_swm_auth_request(Sess#swm_session.pid) of + ok -> + DiaResultCode = 2001, %% SUCCESS + aaa_diameter_swm:rx_auth_answer(Imsi, DiaResultCode); + _ -> + DiaResultCode = 5012, %% UNABLE_TO_COMPLY + aaa_diameter_swm:rx_auth_answer(Imsi, DiaResultCode) + end; + undefined -> + lager:notice("SWm Rx AAR: unknown swm-session ~p", [Imsi]), + DiaResultCode = 5002, %% UNKNOWN_SESSION_ID + aaa_diameter_swm:rx_auth_answer(Imsi, DiaResultCode) + end, + {noreply, State}; + handle_cast({epdg_auth_resp, Imsi, Result}, State) -> Sess = find_swm_session_by_imsi(Imsi, State), case Sess of @@ -186,6 +218,10 @@ lager:info("terminating ~p with reason ~p~n", [?MODULE, Reason]). %% Emulation from the wire (DIAMETER SWm), called from internal AAA Server: +rx_auth_request(Imsi) -> + ok = gen_server:cast(?SERVER, {aar, Imsi}). + +%% Emulation from the wire (DIAMETER SWm), called from internal AAA Server: rx_auth_response(Imsi, Result) -> ok = gen_server:cast(?SERVER, {epdg_auth_resp, Imsi, Result}). diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 6b6f756..8046d1a 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -44,7 +44,7 @@ -export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). -export([auth_request/2, lu_request/1, tunnel_request/2, purge_ms_request/1, cancel_location_result/1]). --export([received_swm_auth_response/2, received_swm_auth_compl_response/2, +-export([received_swm_auth_request/1, received_swm_auth_response/2, received_swm_auth_compl_response/2, received_swm_session_termination_answer/2, received_swm_abort_session_request/1]). -export([received_gtpc_create_session_response/2, received_gtpc_delete_session_response/2, received_gtpc_delete_bearer_request/1]). -export([state_new/3, @@ -137,6 +137,15 @@ {error, Err} end. +received_swm_auth_request(Pid) -> + lager:info("ue_fsm received_swm_auth_request~n", []), + try + gen_statem:call(Pid, received_swm_auth_request) + catch + exit:Err -> + {error, Err} + end. + received_swm_auth_response(Pid, Result) -> lager:info("ue_fsm received_swm_auth_response ~p~n", [Result]), try @@ -327,6 +336,18 @@ Data#ue_fsm_data.pgw_rem_addr_list), {next_state, state_wait_create_session_resp, Data, [{reply,From,ok}]}; +state_authenticated({call, From}, received_swm_auth_request, Data) -> + lager:info("ue_fsm state_authenticated event=received_swm_auth_request, ~p~n", [Data]), + % TODO: 3GPP TS 29.273 7.1.2.5.1: + % Upon receiving the re-authorization request, the ePDG shall immediately invoke the authorization procedure + % specified in 7.1.2.2 for the session indicated in the request. This procedure is based on the Diameter + % commands AA-Request (AAR) and AA-Answer (AAA) specified in IETF RFC 4005 [4]. Information + % element contents for these messages are shown in tables 7.1.2.2.1/1 and 7.1.2.2.1/2. + % + % This is done synchrnously for now when returning from call: + %%epdg_diameter_swm:tx_auth_answer(Data#ue_fsm_data.imsi, #epdg_dia_rc{result_code = 2001}), + {keep_state, Data, [{reply,From,ok}]}; + state_authenticated({call, From}, purge_ms_request, Data) -> lager:info("ue_fsm state_authenticated event=purge_ms_request, ~p~n", [Data]), Data1 = Data#ue_fsm_data{tear_down_gsup_needed = true}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36305?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I4fe309ac54c61f134dbd471486c7d1a70731c9bb Gerrit-Change-Number: 36305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: osmo-smdpp: fix generation of transactionId

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/36295?usp=email ) Change subject: osmo-smdpp: fix generation of transactionId ...................................................................... osmo-smdpp: fix generation of transactionId The hex string of the generated transactionId contains lowercase hex digits. However SGP.22 explicitly spcifies to use uppercase hex digits when using JSON fromatted messages. See section 6.5.2.6 for example. Related: SYS#6720 Change-Id: I8439aa9d70f6fe798fa88b623bac13debdc19ca1 --- M osmo-smdpp.py 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmo-smdpp.py b/osmo-smdpp.py index 582b222..1f4311d 100755 --- a/osmo-smdpp.py +++ b/osmo-smdpp.py @@ -239,7 +239,7 @@ # Generate a TransactionID which is used to identify the ongoing RSP session. The TransactionID # SHALL be unique within the scope and lifetime of each SM-DP+. - transactionId = uuid.uuid4().hex + transactionId = uuid.uuid4().hex.upper() assert not transactionId in self.rss # Generate a serverChallenge for eUICC authentication attached to the ongoing RSP session. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8439aa9d70f6fe798fa88b623bac13debdc19ca1 Gerrit-Change-Number: 36295 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: osmo-smdpp: fix generation of transactionId

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36295?usp=email ) Change subject: osmo-smdpp: fix generation of transactionId ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8439aa9d70f6fe798fa88b623bac13debdc19ca1 Gerrit-Change-Number: 36295 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Mar 2024 15:10:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024