- gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: add HOST field to header lines.
by pespin 02 Apr '24

02 Apr '24

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36503?usp=email ) Change subject: HTTP_Adapter: add HOST field to header lines. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36503?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: Id4b2220da4b2b5fbe74cdc2776cf66d6b34ddbcf Gerrit-Change-Number: 36503 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Apr 2024 15:26:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: msc: fix race condition in TC_mm_id_resp_no_identity
by pespin 02 Apr '24

02 Apr '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36502?usp=email ) Change subject: msc: fix race condition in TC_mm_id_resp_no_identity ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36502?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: I5d2b5d49df8f7ae1eb12fc137f4256fe6fab9117 Gerrit-Change-Number: 36502 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Apr 2024 15:24:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[XL] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: add testsuite for an IPAd
by Jenkins Builder 02 Apr '24

02 Apr '24

Attention is currently required from: fixeria, pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email ) Change subject: IPAd_Tests: add testsuite for an IPAd ...................................................................... Patch Set 2: (13 comments) File ipad/example_ca/pki/certs_by_serial/11192A13CF3A3BC43FE1594BA8567DF0.pem: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15516): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/3c2b16e3_8743… PS2, Line 36: X509v3 Basic Constraints: trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15516): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/db33ca48_1211… PS2, Line 38: X509v3 Subject Key Identifier: trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15516): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/f9b9c8e9_8432… PS2, Line 40: X509v3 Authority Key Identifier: trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15516): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/1316252e_4e71… PS2, Line 45: X509v3 Extended Key Usage: trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15516): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/c388ae46_2018… PS2, Line 47: X509v3 Key Usage: trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15516): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/a912d025_4a9b… PS2, Line 49: X509v3 Subject Alternative Name: trailing whitespace File ipad/example_ca/pki/issued/alttest.crt: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15516): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/fb1c5389_b62f… PS2, Line 36: X509v3 Basic Constraints: trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15516): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/ce983c85_69a1… PS2, Line 38: X509v3 Subject Key Identifier: trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15516): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/f2e9c9cc_3e55… PS2, Line 40: X509v3 Authority Key Identifier: trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15516): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/88b3d449_8b78… PS2, Line 45: X509v3 Extended Key Usage: trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15516): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/579ed89c_ea7b… PS2, Line 47: X509v3 Key Usage: trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15516): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/4e767527_7c73… PS2, Line 49: X509v3 Subject Alternative Name: trailing whitespace File ipad/example_ca/vars: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15516): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/d6e62e11_9e47… PS2, Line 30: # trailing whitespace -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?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: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Gerrit-Change-Number: 36229 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Apr 2024 15:07:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: allow body to be "omit"
by dexter 02 Apr '24

02 Apr '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36505?usp=email ) Change subject: HTTP_Adapter: allow body to be "omit" ...................................................................... HTTP_Adapter: allow body to be "omit" In HTTP not all requests have a body. At the moment we describe a missing body with body := "". This is not 100% correct since the rest of the code interprets this as a present body with zero length and will put a content_length = 0 header line into the HTTP header, even in the GET request. This will most likely be ignored by any HTTP server, but it is still not 100% spec compliant. Related: SYS#6824 Change-Id: Ifedc8c2a590835663d1ba0b08b1fe4d54bdd0fff --- M library/HTTP_Adapter.ttcn 1 file changed, 38 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/36505/1 diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn index 879313d..968b44f 100644 --- a/library/HTTP_Adapter.ttcn +++ b/library/HTTP_Adapter.ttcn @@ -73,21 +73,31 @@ return hdr; } -template (value) HTTPMessage ts_HTTP_Req(charstring url, - charstring method := "GET", - charstring body := "", - integer v_maj := 1, integer v_min := 1, - charstring host, - HeaderLines custom_hdr := { }) := { - request := { +function ts_HTTP_Req(charstring url, + charstring method := "GET", + template charstring body := omit, + integer v_maj := 1, integer v_min := 1, + charstring host, + HeaderLines custom_hdr := { }) +return template (value) HTTPMessage { + var HTTPMessage msg; + + msg.request := { client_id := omit, method := method, uri := url, version_major := v_maj, version_minor := v_min, - header := valueof(ts_HTTP_Header(body, host, custom_hdr)), - body := body + header := valueof(ts_HTTP_Header(body, host, custom_hdr)) } + + if (ispresent(body)) { + msg.request.body := valueof(body); + } else { + msg.request.body := ""; + } + + return msg; } template HTTPMessage tr_HTTP_Resp(template integer sts := ?) := { @@ -104,7 +114,7 @@ template HTTPMessage tr_HTTP_Resp2xx := tr_HTTP_Resp((200..299)); -function f_http_tx_request(charstring url, charstring method := "GET", charstring body := "", +function f_http_tx_request(charstring url, charstring method := "GET", template charstring body := omit, HeaderLines custom_hdr := { }) runs on http_CT { HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); @@ -135,7 +145,7 @@ /* run a HTTP request and return the response */ function f_http_transact(charstring url, charstring method := "GET", - charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx, + template charstring body := omit, template HTTPMessage exp := tr_HTTP_Resp2xx, float tout := 2.0, HeaderLines custom_hdr := { }) runs on http_CT return HTTPMessage { f_http_tx_request(url, method, body, custom_hdr); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36505?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: Ifedc8c2a590835663d1ba0b08b1fe4d54bdd0fff Gerrit-Change-Number: 36505 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: Allow API users to enable/disable SSL
by dexter 02 Apr '24

02 Apr '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36506?usp=email ) Change subject: HTTP_Adapter: Allow API users to enable/disable SSL ...................................................................... HTTP_Adapter: Allow API users to enable/disable SSL At the moment HTTP_Adapter has no option to enable SSL Related: SYS#6824 Change-Id: I6487deea50cd9b4ed4905d9a3a78e00def8ea319 --- M library/HTTP_Adapter.ttcn 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/36506/1 diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn index 968b44f..0c8b5c8 100644 --- a/library/HTTP_Adapter.ttcn +++ b/library/HTTP_Adapter.ttcn @@ -21,12 +21,14 @@ port HTTPmsg_PT HTTP; var charstring g_http_host; var integer g_http_port; + var boolean g_use_ssl; }; -function f_http_init(charstring host, integer http_port) runs on http_CT { +function f_http_init(charstring host, integer http_port, boolean use_ssl := false) runs on http_CT { map(self:HTTP, system:HTTP); g_http_host := host; g_http_port := http_port; + g_use_ssl := use_ssl; } template (value) Connect ts_HTTP_Connect(template (value) charstring hostname, @@ -117,7 +119,7 @@ function f_http_tx_request(charstring url, charstring method := "GET", template charstring body := omit, HeaderLines custom_hdr := { }) runs on http_CT { - HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); + HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port, g_use_ssl)); HTTP.receive(Connect_result:?); HTTP.send(ts_HTTP_Req(url, method, body, host := g_http_host & ":" & int2str(g_http_port), custom_hdr := custom_hdr)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36506?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: I6487deea50cd9b4ed4905d9a3a78e00def8ea319 Gerrit-Change-Number: 36506 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: add HOST field to header lines.
by dexter 02 Apr '24

02 Apr '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36503?usp=email ) Change subject: HTTP_Adapter: add HOST field to header lines. ...................................................................... HTTP_Adapter: add HOST field to header lines. In HTTP 1.1 (this is what the HTTP_Adapter uses), the Host header field is mandatory, see also: RFC 2616, section 14.23. Related: SYS#6824 Change-Id: Id4b2220da4b2b5fbe74cdc2776cf66d6b34ddbcf --- M library/HTTP_Adapter.ttcn 1 file changed, 19 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/36503/1 diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn index a957fdd..0885f05 100644 --- a/library/HTTP_Adapter.ttcn +++ b/library/HTTP_Adapter.ttcn @@ -37,7 +37,8 @@ } template (value) Close ts_HTTP_Close := { client_id := omit }; -template (value) HeaderLines ts_HTTP_Header(charstring body) := { +template (value) HeaderLines ts_HTTP_Header(charstring body, charstring host) := { + { header_name := "Host", header_value := host }, { header_name := "Content-Type", header_value := "application/json" }, { header_name := "Content-Length", header_value := int2str(lengthof(body)) } } @@ -45,14 +46,15 @@ template (value) HTTPMessage ts_HTTP_Req(charstring url, charstring method := "GET", charstring body := "", - integer v_maj := 1, integer v_min := 1) := { + integer v_maj := 1, integer v_min := 1, + charstring host) := { request := { client_id := omit, method := method, uri := url, version_major := v_maj, version_minor := v_min, - header := ts_HTTP_Header(body), + header := valueof(ts_HTTP_Header(body, host)), body := body } } @@ -75,7 +77,7 @@ runs on http_CT { HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); HTTP.receive(Connect_result:?); - HTTP.send(ts_HTTP_Req(url, method, body)); + HTTP.send(ts_HTTP_Req(url, method, body, host := g_http_host & ":" & int2str(g_http_port))); } function f_http_rx_response(template HTTPMessage exp := tr_HTTP_Resp2xx, float tout := 2.0) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36503?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: Id4b2220da4b2b5fbe74cdc2776cf66d6b34ddbcf Gerrit-Change-Number: 36503 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[XL] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: add testsuite for an IPAd
by dexter 02 Apr '24

02 Apr '24

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?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: IPAd_Tests: add testsuite for an IPAd ...................................................................... IPAd_Tests: add testsuite for an IPAd With this patch we add a testsuite that can be used to test an IPAd implementation. The testsuite emulates the ESipa and the ES10x (pcsc cardreader) interface and is capable of testing a direct profile download and other ESipa features like the execution of an eIM package (eCO, PSMO). Change-Id: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Related: SYS#6564 --- M Makefile A ipad/IPAd_Tests.cfg A ipad/IPAd_Tests.default A ipad/IPAd_Tests.ttcn A ipad/example_ca/openssl-easyrsa.cnf A ipad/example_ca/pki/.rnd A ipad/example_ca/pki/ca.crt A ipad/example_ca/pki/certs_by_serial/11192A13CF3A3BC43FE1594BA8567DF0.pem A ipad/example_ca/pki/extensions.temp A ipad/example_ca/pki/index.txt A ipad/example_ca/pki/index.txt.attr A ipad/example_ca/pki/index.txt.old A ipad/example_ca/pki/issued/alttest.cabundle A ipad/example_ca/pki/issued/alttest.crt A ipad/example_ca/pki/issued/alttest.notes A ipad/example_ca/pki/openssl-easyrsa.cnf A ipad/example_ca/pki/openssl-easyrsa.temp A ipad/example_ca/pki/private/alttest.key A ipad/example_ca/pki/private/ca.key A ipad/example_ca/pki/reqs/alttest.req A ipad/example_ca/pki/safessl-easyrsa.cnf A ipad/example_ca/pki/serial A ipad/example_ca/pki/serial.old A ipad/example_ca/vars A ipad/gen_links.sh A ipad/regen_makefile.sh M regen-makefile.sh 27 files changed, 1,863 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/36229/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?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: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Gerrit-Change-Number: 36229 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[XL] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: add testsuite for an IPAd
by dexter 02 Apr '24

02 Apr '24

Attention is currently required from: fixeria, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email ) Change subject: IPAd_Tests: add testsuite for an IPAd ...................................................................... Patch Set 2: (5 comments) File ipad/IPAd_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/731959b6_c76e… PS1, Line 51: function f_make_http_resp > this looks more like a `template`? Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/d776d58e_3279… PS1, Line 104: modulepar > not critical, but we usually have module params on top Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/c9997b95_78a2… PS1, Line 208: while(true) > cosmetic: while is not a function (same below) Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/0e601fe3_fb27… PS1, Line 445: for (i := 0; i < sizeof(esipa_res.getBoundProfilePackageResponseEsipa.getBoundProfilePackageOkEsipa.boundProfilePackage.firstSequenceOf87); i := i + 1) { > sounds like you want to put this in a variable ;) "esipa_res.getBoundProfilePackageResponseEsipa. […] I do not know if this looks much nicer ;-/ var RSPDefinitions.BoundProfilePackage.firstSequenceOf87 firstSequenceOf87 := esipa_res.getBoundProfilePackageResponseEsipa.getBoundProfilePackageOkEsipa.boundProfilePackage.firstSequenceOf87; https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/dd96cb3e_15c1… PS1, Line 652: // execute ( TC_add_init_eim() ); > why is this one commented out? This test requires the IPAd to be called with different command line parameters and a file that contains the eIM configuration. I have used this testcase mainly as a vehicle to see what is spoken to the eUICC on the other end. The testcase does not add much value anyway, so I have removed it now. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?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: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Gerrit-Change-Number: 36229 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Apr 2024 15:06:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: allow API users to specifiy custom header
by dexter 02 Apr '24

02 Apr '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36504?usp=email ) Change subject: HTTP_Adapter: allow API users to specifiy custom header ...................................................................... HTTP_Adapter: allow API users to specifiy custom header At the moment HTTP_Adapter can only make requests with a fixed pre-defined HTTP header. However, some application may require additional custom header lines or different values than the ones specified in the pre-defined HTTP header. Related: SYS#6824 Change-Id: I115fd14254e0957c0955649aeb47059dc180bf57 --- M library/HTTP_Adapter.ttcn 1 file changed, 57 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/36504/1 diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn index 0885f05..879313d 100644 --- a/library/HTTP_Adapter.ttcn +++ b/library/HTTP_Adapter.ttcn @@ -15,6 +15,7 @@ import from HTTPmsg_Types all; import from HTTPmsg_PortType all; +import from Native_Functions all; type component http_CT { port HTTPmsg_PT HTTP; @@ -37,24 +38,54 @@ } template (value) Close ts_HTTP_Close := { client_id := omit }; -template (value) HeaderLines ts_HTTP_Header(charstring body, charstring host) := { - { header_name := "Host", header_value := host }, - { header_name := "Content-Type", header_value := "application/json" }, - { header_name := "Content-Length", header_value := int2str(lengthof(body)) } +function ts_HTTP_Header(template charstring body := omit, + template charstring host := omit, + HeaderLines custom_hdr := { }) +return template (value) HeaderLines { + var HeaderLines hdr := { }; + var integer i; + var integer k; + var boolean updated; + + /* Build default header */ + if (ispresent(host)) { + hdr := hdr & {{ header_name := "Host", header_value := valueof(host) }}; + } + hdr := hdr & {{ header_name := "Content-Type", header_value := "application/json" }}; + if (ispresent(body)) { + hdr := hdr & {{ header_name := "Content-Length", header_value := int2str(lengthof(body)) }} + } + + /* Add custom header lines, already existing headers (name) are updated */ + for (i := 0; i < lengthof(custom_hdr); i := i+1) { + updated := false; + for (k := 0; k < lengthof(hdr); k := k+1) { + if (f_str_tolower(hdr[k].header_name) == f_str_tolower(custom_hdr[i].header_name)) { + hdr[k] := custom_hdr[i]; + updated := true; + } + } + if (updated == false) { + hdr := hdr & { custom_hdr[i] }; + } + } + + return hdr; } template (value) HTTPMessage ts_HTTP_Req(charstring url, charstring method := "GET", charstring body := "", integer v_maj := 1, integer v_min := 1, - charstring host) := { + charstring host, + HeaderLines custom_hdr := { }) := { request := { client_id := omit, method := method, uri := url, version_major := v_maj, version_minor := v_min, - header := valueof(ts_HTTP_Header(body, host)), + header := valueof(ts_HTTP_Header(body, host, custom_hdr)), body := body } } @@ -73,11 +104,12 @@ template HTTPMessage tr_HTTP_Resp2xx := tr_HTTP_Resp((200..299)); -function f_http_tx_request(charstring url, charstring method := "GET", charstring body := "") +function f_http_tx_request(charstring url, charstring method := "GET", charstring body := "", + HeaderLines custom_hdr := { }) runs on http_CT { HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); HTTP.receive(Connect_result:?); - HTTP.send(ts_HTTP_Req(url, method, body, host := g_http_host & ":" & int2str(g_http_port))); + HTTP.send(ts_HTTP_Req(url, method, body, host := g_http_host & ":" & int2str(g_http_port), custom_hdr := custom_hdr)); } function f_http_rx_response(template HTTPMessage exp := tr_HTTP_Resp2xx, float tout := 2.0) @@ -104,9 +136,9 @@ /* run a HTTP request and return the response */ function f_http_transact(charstring url, charstring method := "GET", charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx, - float tout := 2.0) + float tout := 2.0, HeaderLines custom_hdr := { }) runs on http_CT return HTTPMessage { - f_http_tx_request(url, method, body); + f_http_tx_request(url, method, body, custom_hdr); return f_http_rx_response(exp, tout); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36504?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: I115fd14254e0957c0955649aeb47059dc180bf57 Gerrit-Change-Number: 36504 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: msc: fix race condition in TC_mm_id_resp_no_identity
by fixeria 02 Apr '24

02 Apr '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36502?usp=email ) Change subject: msc: fix race condition in TC_mm_id_resp_no_identity ...................................................................... msc: fix race condition in TC_mm_id_resp_no_identity This testcase is failing sporadically ever since it was introduced back in 2019, during 36C3. The problem is that osmo-msc does not react to the malformed MM IDENTITY RESPONSE immediately, but only after timeout of timer X1 (5 seconds, by default); while the testsuite expects the LU REJECT to be received within 5 seconds. We should ideally fix osmo-msc to react immediately, but for now let's enlarge the LU REJECT waiting timeout in the testcase. Change-Id: I5d2b5d49df8f7ae1eb12fc137f4256fe6fab9117 Related: OS#6426, OS#4340 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 28 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/36502/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index be12fae..6f8078b 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -916,11 +916,11 @@ } } -function f_expect_lu_reject(template OCT1 cause := ?) runs on BSC_ConnHdlr { +function f_expect_lu_reject(template OCT1 cause := ?, float Tval := 5.0) runs on BSC_ConnHdlr { var PDU_DTAP_MT dtap_mt; - timer T := 5.0; + timer T; - T.start; + T.start(Tval); alt { [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej(cause))) { setverdict(pass); diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 52a5c2f..513e346 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -6616,15 +6616,13 @@ vc_conn.done; } +/* Test how the MSC handles a malformed MM IDENTITY RESPONSE with no identity. */ friend function f_tc_mm_id_resp_no_identity(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { - pars.tmsi := 'FFFFFFFF'O; f_init_handler(pars); - f_create_gsup_expect(hex2str(g_pars.imsi)); - /* Initiate Location Updating using an unknown TMSI */ - f_bssap_compl_l3(f_build_lu_tmsi(pars.tmsi)); + f_bssap_compl_l3(f_build_lu_tmsi('FFFFFFFF'O)); /* Expect an Identity Request, send response with no identity */ BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_MM_ID_Req(CM_ID_TYPE_IMSI))); @@ -6641,7 +6639,10 @@ } }))); - f_expect_lu_reject(); + /* XXX: Current osmo-msc does not react on bad/malformed MM IDENTITY RESPONSE immediately. + * It instead relies on expiry of timer X1, which is set to 5.0 seconds by default. This + * is not good (DoS vector) and should ideally be fixed, but for now just work it around. */ + f_expect_lu_reject(Tval := 5.0 + 1.0); f_expect_clear(); } testcase TC_mm_id_resp_no_identity() runs on MTC_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36502?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: I5d2b5d49df8f7ae1eb12fc137f4256fe6fab9117 Gerrit-Change-Number: 36502 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log