October 2023 - gerrit-log - lists.osmocom.org

[M] Change in ...osmo-epdg[master]: Initial GSUP Auth handler support
by pespin 12 Oct '23

12 Oct '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34728?usp=email ) Change subject: Initial GSUP Auth handler support ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34728?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: Iad42c74f1c6f35791d3e33c1082e804eb67e861c Gerrit-Change-Number: 34728 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Oct 2023 19:06:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in ...osmo-epdg[master]: Initial GSUP server support
by pespin 12 Oct '23

12 Oct '23

Attention is currently required from: lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34726?usp=email ) Change subject: Initial GSUP server support ...................................................................... Patch Set 4: Code-Review+2 (1 comment) Patchset: PS4: I'm just merging all these patches now to avoid having tons of stuff in different branches, etc. We can later improve sutff further. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34726?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: I89986ae958b40d30ec824186b79d3aa88b2af35d Gerrit-Change-Number: 34726 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 12 Oct 2023 19:06:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: cosmetic: epdg_diameter_swx.erl: Indentation fixes
by pespin 12 Oct '23

12 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34729?usp=email ) Change subject: cosmetic: epdg_diameter_swx.erl: Indentation fixes ...................................................................... cosmetic: epdg_diameter_swx.erl: Indentation fixes Change-Id: Id6a927dccb1192e2224ab3f87bc581ac3dd75618 --- M src/epdg_diameter_swx.erl 1 file changed, 25 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/epdg_diameter_swx.erl b/src/epdg_diameter_swx.erl index 54521a0..6ae0c1f 100644 --- a/src/epdg_diameter_swx.erl +++ b/src/epdg_diameter_swx.erl @@ -68,27 +68,26 @@ %% supporting multiple Diameter applications may or may not want to %% configure a common callback module on all applications. -define(SERVICE, - [{'Origin-Host', application:get_env(?SERVER, origin_host, "aaa.example.org")}, - {'Origin-Realm', application:get_env(?SERVER, origin_realm, "realm.example.org")}, - {'Vendor-Id', application:get_env(?SERVER, vendor_id, 0)}, - {'Vendor-Specific-Application-Id', - [#'diameter_base_Vendor-Specific-Application-Id'{ - 'Vendor-Id' = ?VENDOR_ID_3GPP, - 'Auth-Application-Id' = [?DIAMETER_APP_ID_SWX]}]}, - {'Product-Name', "osmo-epdg"}, - % TODO: check which we should annouce here as Supported-Vendor-Id - {'Supported-Vendor-Id', [?VENDOR_ID_3GPP, ?VENDOR_ID_ETSI, ?VENDOR_ID_3GPP2]}, - { application, - [ - {alias, ?APP_ALIAS}, - {dictionary, ?DIAMETER_DICT_SWX}, - {module, ?CALLBACK_MOD}, - {answer_errors, callback}]}]). + [{'Origin-Host', application:get_env(?SERVER, origin_host, "aaa.example.org")}, + {'Origin-Realm', application:get_env(?SERVER, origin_realm, "realm.example.org")}, + {'Vendor-Id', application:get_env(?SERVER, vendor_id, 0)}, + {'Vendor-Specific-Application-Id', + [#'diameter_base_Vendor-Specific-Application-Id'{ + 'Vendor-Id' = ?VENDOR_ID_3GPP, + 'Auth-Application-Id' = [?DIAMETER_APP_ID_SWX]}]}, + {'Product-Name', "osmo-epdg"}, + % TODO: check which we should annouce here as Supported-Vendor-Id + {'Supported-Vendor-Id', [?VENDOR_ID_3GPP, ?VENDOR_ID_ETSI, ?VENDOR_ID_3GPP2]}, + { application, + [{alias, ?APP_ALIAS}, + {dictionary, ?DIAMETER_DICT_SWX}, + {module, ?CALLBACK_MOD}, + {answer_errors, callback}]}]). -record(state, { handlers, peers = #{} - }). +}). %% @doc starts gen_server implementation process -spec start() -> ok | {error, term()}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34729?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: Id6a927dccb1192e2224ab3f87bc581ac3dd75618 Gerrit-Change-Number: 34729 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: cosmetic: epdg_diameter_swx.erl: Indentation fixes
by pespin 12 Oct '23

12 Oct '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34729?usp=email ) Change subject: cosmetic: epdg_diameter_swx.erl: Indentation fixes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34729?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: Id6a927dccb1192e2224ab3f87bc581ac3dd75618 Gerrit-Change-Number: 34729 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Oct 2023 18:41:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: epdg_diameter_swx: parse the result code of the MAA
by pespin 12 Oct '23

12 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34730?usp=email ) Change subject: epdg_diameter_swx: parse the result code of the MAA ...................................................................... epdg_diameter_swx: parse the result code of the MAA Parse error cases on both the Result-Code and the Experimental-Result-Code of an Media Authentication Answer. Change-Id: I8d2c99f12df3de1df5529d03ffccab07b14337df --- M src/epdg_diameter_swx.erl 1 file changed, 44 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/30/34730/1 diff --git a/src/epdg_diameter_swx.erl b/src/epdg_diameter_swx.erl index 6ae0c1f..9909446 100644 --- a/src/epdg_diameter_swx.erl +++ b/src/epdg_diameter_swx.erl @@ -104,6 +104,7 @@ gen_server:start_link({local, ?SERVER}, ?MODULE, [], []). peer_down(API, SvcName, {PeerRef, _} = Peer) -> + % fixme: why do we still have ets here? (catch ets:delete(?MODULE, {API, PeerRef})), gen_server:cast(?SERVER, {peer_down, SvcName, Peer}), ok. @@ -131,7 +132,32 @@ gen_server:call(?SERVER, {sar, {IMSI, Type, APN}}). +result_code_success(2001) -> ok; +result_code_success(2002) -> ok; +result_code_success(_) -> invalid_result_code. + % TODO Sync failure + +-define (MAA_Errors(), #{ + invalid_result_code => #{error => "Unknown result code"}, + invalid_exp_result => #{error => "Unknown experimental result code"}, + unknown_user => #{error => "User is not known by HSS"} +}). + +-spec parse_mar(#'MAA'{}) -> map(). +parse_mar(#'MAA'{'Result-Code' = [ResultCode]} = Maa) -> + Success = result_code_success(ResultCode), + {Success, ResultCode}; + +parse_mar(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 'ExpResultCode' := 5001}]} = Maa) -> + {unknown_user, 5001}; +parse_mar(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 'ExpResultCode' := ResultCode}]} = Maa) -> + {invalid_exp_result, ResultCode}; +parse_mar(Maa) -> + {unknown_err, []}. + +% parse_mar(#'MAA'{'Experimental-Result-Code' = [ResultCode] = MAA) -> + handle_call({mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey}}, _From, State) -> SessionId = diameter:session_id(application:get_env(?SERVER, origin_host, "aaa.example.org")), MAR = #'MAR'{'Vendor-Specific-Application-Id' = #'Vendor-Specific-Application-Id'{ @@ -168,8 +194,12 @@ }, Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, SAR, []), case Ret of - {ok, SAA} -> - {reply, {ok, SAA}, State}; + {ok, Maa} -> + SuccessCode = parse_mar(Maa), + case SuccessCode of + {ok, _} -> {reply, {ok, Maa}, State}; + {Err, Info} -> {reply, {error, {Err, Info, Maa}}, State} + end; {error, Err} -> lager:error("Error: ~w~n", [Err]), {reply, {error, Err}, State} -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34730?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: I8d2c99f12df3de1df5529d03ffccab07b14337df Gerrit-Change-Number: 34730 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: cosmetic: epdg_diameter_swx.erl: Indentation fixes
by pespin 12 Oct '23

12 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34729?usp=email ) Change subject: cosmetic: epdg_diameter_swx.erl: Indentation fixes ...................................................................... cosmetic: epdg_diameter_swx.erl: Indentation fixes Change-Id: Id6a927dccb1192e2224ab3f87bc581ac3dd75618 --- M src/epdg_diameter_swx.erl 1 file changed, 25 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/29/34729/1 diff --git a/src/epdg_diameter_swx.erl b/src/epdg_diameter_swx.erl index 54521a0..6ae0c1f 100644 --- a/src/epdg_diameter_swx.erl +++ b/src/epdg_diameter_swx.erl @@ -68,27 +68,26 @@ %% supporting multiple Diameter applications may or may not want to %% configure a common callback module on all applications. -define(SERVICE, - [{'Origin-Host', application:get_env(?SERVER, origin_host, "aaa.example.org")}, - {'Origin-Realm', application:get_env(?SERVER, origin_realm, "realm.example.org")}, - {'Vendor-Id', application:get_env(?SERVER, vendor_id, 0)}, - {'Vendor-Specific-Application-Id', - [#'diameter_base_Vendor-Specific-Application-Id'{ - 'Vendor-Id' = ?VENDOR_ID_3GPP, - 'Auth-Application-Id' = [?DIAMETER_APP_ID_SWX]}]}, - {'Product-Name', "osmo-epdg"}, - % TODO: check which we should annouce here as Supported-Vendor-Id - {'Supported-Vendor-Id', [?VENDOR_ID_3GPP, ?VENDOR_ID_ETSI, ?VENDOR_ID_3GPP2]}, - { application, - [ - {alias, ?APP_ALIAS}, - {dictionary, ?DIAMETER_DICT_SWX}, - {module, ?CALLBACK_MOD}, - {answer_errors, callback}]}]). + [{'Origin-Host', application:get_env(?SERVER, origin_host, "aaa.example.org")}, + {'Origin-Realm', application:get_env(?SERVER, origin_realm, "realm.example.org")}, + {'Vendor-Id', application:get_env(?SERVER, vendor_id, 0)}, + {'Vendor-Specific-Application-Id', + [#'diameter_base_Vendor-Specific-Application-Id'{ + 'Vendor-Id' = ?VENDOR_ID_3GPP, + 'Auth-Application-Id' = [?DIAMETER_APP_ID_SWX]}]}, + {'Product-Name', "osmo-epdg"}, + % TODO: check which we should annouce here as Supported-Vendor-Id + {'Supported-Vendor-Id', [?VENDOR_ID_3GPP, ?VENDOR_ID_ETSI, ?VENDOR_ID_3GPP2]}, + { application, + [{alias, ?APP_ALIAS}, + {dictionary, ?DIAMETER_DICT_SWX}, + {module, ?CALLBACK_MOD}, + {answer_errors, callback}]}]). -record(state, { handlers, peers = #{} - }). +}). %% @doc starts gen_server implementation process -spec start() -> ok | {error, term()}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34729?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: Id6a927dccb1192e2224ab3f87bc581ac3dd75618 Gerrit-Change-Number: 34729 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: gsup_server: call the server_assignment_request() on location update ...
by pespin 12 Oct '23

12 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34731?usp=email ) Change subject: gsup_server: call the server_assignment_request() on location update request ...................................................................... gsup_server: call the server_assignment_request() on location update request Change-Id: I3aa506a9860e503ae3e1b0542cc3a2e9cd150c6e --- M src/gsup_server.erl 1 file changed, 23 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/31/34731/1 diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 26af3b4..923d020 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -156,11 +156,21 @@ {noreply, S}; % location update request / when a UE wants to connect to a specific APN. This will trigger a AAA->HLR Request Server Assignment Request +% FIXME: add APN instead of hardcoded internet handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := location_upd_req, imsi := Imsi}}, S) -> - Resp = #{message_type => location_upd_res, - imsi => Imsi, - message_class => 5 - }, + % FIXME: use enum for Server-Assignment-Type => REGISTERING + Result = epdg_diameter_swx:server_assignment_request(Imsi, 1, "internet"), + case Result of + {ok, Sar} -> Resp = #{message_type => location_upd_res, + imsi => Imsi, + message_class => 5 + }; + {error, _} -> Resp = #{message_type => location_upd_err, + imsi => Imsi, + message_class => 5, + cause => 16#11 % FIXME: Use proper defines as cause code and use Network failure + } + end, ipa_proto:send(Socket, ?IPAC_PROTO_EXT_GSUP, Resp), {noreply, S}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34731?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: I3aa506a9860e503ae3e1b0542cc3a2e9cd150c6e Gerrit-Change-Number: 34731 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: epdg_diameter_swx: fix SAR message
by pespin 12 Oct '23

12 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34727?usp=email ) Change subject: epdg_diameter_swx: fix SAR message ...................................................................... epdg_diameter_swx: fix SAR message The Service-Selection is an optional field and for such the element must be a list. Change-Id: I4c2dc79098f801169336b02272434e4b372cda2e --- M src/epdg_diameter_swx.erl 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/epdg_diameter_swx.erl b/src/epdg_diameter_swx.erl index b4b5719..54521a0 100644 --- a/src/epdg_diameter_swx.erl +++ b/src/epdg_diameter_swx.erl @@ -165,7 +165,7 @@ 'User-Name' = IMSI, 'Auth-Session-State' = 1, 'Server-Assignment-Type' = Type, - 'Service-Selection' = APN + 'Service-Selection' = [APN] }, Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, SAR, []), case Ret of -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34727?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: I4c2dc79098f801169336b02272434e4b372cda2e Gerrit-Change-Number: 34727 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: epdg_diameter_swx: fix SAR message
by pespin 12 Oct '23

12 Oct '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34727?usp=email ) Change subject: epdg_diameter_swx: fix SAR message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34727?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: I4c2dc79098f801169336b02272434e4b372cda2e Gerrit-Change-Number: 34727 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 12 Oct 2023 17:58:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: epdg_diameter_swx: fix SAR message
by pespin 12 Oct '23

12 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34727?usp=email ) Change subject: epdg_diameter_swx: fix SAR message ...................................................................... epdg_diameter_swx: fix SAR message The Service-Selection is an optional field and for such the element must be a list. Change-Id: I4c2dc79098f801169336b02272434e4b372cda2e --- M src/epdg_diameter_swx.erl 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/27/34727/1 diff --git a/src/epdg_diameter_swx.erl b/src/epdg_diameter_swx.erl index b4b5719..54521a0 100644 --- a/src/epdg_diameter_swx.erl +++ b/src/epdg_diameter_swx.erl @@ -165,7 +165,7 @@ 'User-Name' = IMSI, 'Auth-Session-State' = 1, 'Server-Assignment-Type' = Type, - 'Service-Selection' = APN + 'Service-Selection' = [APN] }, Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, SAR, []), case Ret of -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34727?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: I4c2dc79098f801169336b02272434e4b372cda2e Gerrit-Change-Number: 34727 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

1 0