<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13564">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ggsn: Add TC_pdp4_act_deact_ipcp_pap_broken()<br><br>This test case reproduces a real-world PCO capture including a broken<br>PAP AuthenticationReq. It triggers some weird behavior in OsmoGGSN<br>1.3.0 where it would send duplicate IPCP repsonses and no PAP response.<br><br>Change-Id: Ie89d984ed9e26fbbb2e4914bdb8623446d462a4c<br>Related: OS#3914<br>---<br>M ggsn_tests/GGSN_Tests.ttcn<br>M ggsn_tests/expected-results.xml<br>M ggsn_tests/gen_links.sh<br>M library/GTP_Templates.ttcn<br>4 files changed, 50 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn</span><br><span>index dc9d07c..31c1056 100644</span><br><span>--- a/ggsn_tests/GGSN_Tests.ttcn</span><br><span>+++ b/ggsn_tests/GGSN_Tests.ttcn</span><br><span>@@ -22,6 +22,7 @@</span><br><span> import from GTPC_Types all;</span><br><span> import from GTPU_Types all;</span><br><span> import from IPCP_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from PAP_Types all;</span><br><span> import from IP_Types all;</span><br><span> import from ICMP_Types all;</span><br><span> import from ICMPv6_Types all;</span><br><span>@@ -932,6 +933,39 @@</span><br><span> f_pdp_ctx_del(ctx, '1'B);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Test PDP context activation for dynamic IPv4 EUA with IPv4 DNS in IPCP + PAP authentication (broken) */</span><br><span style="color: hsl(120, 100%, 40%);">+ testcase TC_pdp4_act_deact_ipcp_pap_broken() runs on GT_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT4 ggsn_ip4_dns1 := f_inet_addr(m_ggsn_ip4_dns1);</span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT4 ggsn_ip4_dns2 := f_inet_addr(m_ggsn_ip4_dns2);</span><br><span style="color: hsl(120, 100%, 40%);">+ var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn)));</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx.pco_req := valueof(ts_PCO_PAP_IPv4_DNS);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_pdp_ctx_act(ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_PCO_ensure_no_duplicates(ctx.pco_neg);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* verify IPCP is at all contained */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(ctx.pco_neg, tr_PCO_Contains('8021'O))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "IPCP not found in PCO");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* verify IPCP contains both primary and secondary DNS */</span><br><span style="color: hsl(120, 100%, 40%);">+ var IpcpPacket ipcp := dec_IpcpPacket(f_PCO_extract_proto(ctx.pco_neg, '8021'O));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(ipcp, tr_IPCP_Ack_DNS(0, ggsn_ip4_dns1, ggsn_ip4_dns2))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(ipcp, tr_IPCP_Ack_DNS(0))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Primary/Secondary DNS PCO IPCP option not found");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Primary/Secondary DNS PCO IPCP option found but not matching expected values");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* verify that PAP is contained */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(ctx.pco_neg, tr_PCO_Contains('C023'O))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "PAP not found in PCO");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ var PapPacket pap := dec_PapPacket(f_PCO_extract_proto(ctx.pco_neg, 'C023'O));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(pap, tr_PAP_AuthAck)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "PAP isn't an AuthenticateAck: ", pap);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_pdp_ctx_del(ctx, '1'B);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Test PDP context activation for dynamic IPv4 EUA with IPv4 DNS in PCO */</span><br><span> testcase TC_pdp4_act_deact_pcodns() runs on GT_CT {</span><br><span> f_init();</span><br><span>@@ -1277,6 +1311,7 @@</span><br><span> control {</span><br><span> execute(TC_pdp4_act_deact());</span><br><span> execute(TC_pdp4_act_deact_ipcp());</span><br><span style="color: hsl(120, 100%, 40%);">+ execute(TC_pdp4_act_deact_ipcp_pap_broken());</span><br><span> execute(TC_pdp4_act_deact_pcodns());</span><br><span> execute(TC_pdp4_act_deact_gtpu_access());</span><br><span> execute(TC_pdp4_clients_interact_with_txseq());</span><br><span>diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml</span><br><span>index c2defea..c60a804 100644</span><br><span>--- a/ggsn_tests/expected-results.xml</span><br><span>+++ b/ggsn_tests/expected-results.xml</span><br><span>@@ -1,7 +1,8 @@</span><br><span> <?xml version="1.0"?></span><br><span style="color: hsl(0, 100%, 40%);">-<testsuite name='GGSN_Tests' tests='14' failures='1' errors='0' skipped='0' inconc='0' time='MASKED'></span><br><span style="color: hsl(120, 100%, 40%);">+<testsuite name='GGSN_Tests' tests='15' failures='1' errors='0' skipped='0' inconc='0' time='MASKED'></span><br><span> <testcase classname='GGSN_Tests' name='TC_pdp4_act_deact' time='MASKED'/></span><br><span> <testcase classname='GGSN_Tests' name='TC_pdp4_act_deact_ipcp' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='GGSN_Tests' name='TC_pdp4_act_deact_ipcp_pap_broken' time='MASKED'/></span><br><span> <testcase classname='GGSN_Tests' name='TC_pdp4_act_deact_pcodns' time='MASKED'/></span><br><span> <testcase classname='GGSN_Tests' name='TC_pdp4_act_deact_gtpu_access' time='MASKED'/></span><br><span> <testcase classname='GGSN_Tests' name='TC_pdp4_clients_interact_with_txseq' time='MASKED'/></span><br><span>diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh</span><br><span>index 82e35d4..1b54e9d 100755</span><br><span>--- a/ggsn_tests/gen_links.sh</span><br><span>+++ b/ggsn_tests/gen_links.sh</span><br><span>@@ -45,7 +45,7 @@</span><br><span> gen_links $DIR $FILES</span><br><span> </span><br><span> DIR=../library</span><br><span style="color: hsl(0, 100%, 40%);">-FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn PAP_Types.ttcn "</span><br><span> FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Templates.ttcn "</span><br><span> FILES+="Osmocom_VTY_Functions.ttcn "</span><br><span> gen_links $DIR $FILES</span><br><span>diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn</span><br><span>index f2e6ac0..aa42759 100644</span><br><span>--- a/library/GTP_Templates.ttcn</span><br><span>+++ b/library/GTP_Templates.ttcn</span><br><span>@@ -471,6 +471,18 @@</span><br><span> lengthProtoID := ?,</span><br><span> protoIDContents := ?</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ template ProtocolElement ts_PCOelem_PAP_broken := {</span><br><span style="color: hsl(120, 100%, 40%);">+ protocolID := 'C023'O,</span><br><span style="color: hsl(120, 100%, 40%);">+ lengthProtoID := 60,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* PPP Password Authentication Protocol containing incorrect Peer-Id-Length set to 4 (6-7 should be the valid one), see OS#3914. */</span><br><span style="color: hsl(120, 100%, 40%);">+ protoIDContents := '0100003c'O & '0444435338323700bc1c08087c1508083e00790000150808fd06000001000000000000000000000000000000000000000000000000000000'O</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ template ProtConfigOptions ts_PCO_PAP_IPv4_DNS modifies ts_PCO := {</span><br><span style="color: hsl(120, 100%, 40%);">+ protocols := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_PCOelem_PAP_broken,</span><br><span style="color: hsl(120, 100%, 40%);">+ { protocolID := '8021'O, lengthProtoID := 16, protoIDContents := enc_IpcpPacket(valueof(ts_IPCP_ReqDNS)) }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> template ProtConfigOptions tr_PCO_Contains(OCT2 prot_id) modifies tr_PCO := {</span><br><span> protocols := { *, tr_PCO_Proto(prot_id), * }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13564">change 13564</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13564"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie89d984ed9e26fbbb2e4914bdb8623446d462a4c </div>
<div style="display:none"> Gerrit-Change-Number: 13564 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>