September 2026 - gerrit-log - lists.osmocom.org

[XS] Change in pysim[master]: transport: trace APDUs when they are sent
by Hoernchen 08 Sep '26

08 Sep '26

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/43554?usp=email ) Change subject: transport: trace APDUs when they are sent ...................................................................... transport: trace APDUs when they are sent Right now APDUs that never return/fail are omitted from the trace output. Move the print, so it actually tells me what failed.. Change-Id: I828ea36b06da36b6bb0aa073d235d4f49cbb3161 --- M pySim-shell.py M pySim/transport/__init__.py 2 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/54/43554/1 diff --git a/pySim-shell.py b/pySim-shell.py index 8e490f6..31de001 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -210,8 +210,10 @@ def __init__(self, cmd2_app): self.cmd2 = cmd2_app - def trace_response(self, cmd, sw, resp): + def trace_command(self, cmd): self.cmd2.poutput("-> %s %s" % (cmd[:10], cmd[10:])) + + def trace_response(self, cmd, sw, resp): self.cmd2.poutput("<- %s: %s" % (sw, resp)) def update_prompt(self): diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index 13e0c42..0da27ac 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -45,8 +45,10 @@ class StdoutApduTracer(ApduTracer): """Minimalistic APDU tracer, printing commands to stdout.""" - def trace_response(self, cmd, sw, resp): + def trace_command(self, cmd): log.info("-> %s %s", cmd[:10], cmd[10:]) + + def trace_response(self, cmd, sw, resp): log.info("<- %s: %s", sw, resp) def trace_reset(self): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43554?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I828ea36b06da36b6bb0aa073d235d4f49cbb3161 Gerrit-Change-Number: 43554 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: sms: don't mutate digits in AddressField.to_bytes()
by Hoernchen 08 Sep '26

08 Sep '26

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/43556?usp=email ) Change subject: sms: don't mutate digits in AddressField.to_bytes() ...................................................................... sms: don't mutate digits in AddressField.to_bytes() to_bytes() appended the BCD filler nibble, so the next call saw one digit more and derived a wrong length. This affects any code that encodes an address twice, even for printing/logging. Man, I really miss my beloved c++ const function decoration... Fix: keep the filler in a local. Change-Id: I81691c5a1fc5072d6d20c52d22da1eb2e180d04a --- M pySim/sms.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/56/43556/1 diff --git a/pySim/sms.py b/pySim/sms.py index 0c73a53..5d2bda9 100644 --- a/pySim/sms.py +++ b/pySim/sms.py @@ -239,8 +239,8 @@ def to_bytes(self) -> bytes: """Encode the AddressField into the binary representation as used in T-PDU.""" num_digits = len(self.digits) - if num_digits % 2: - self.digits += 'f' + # don't store the filler nibble or get_bytes() encodes it as digit and ends up too large + digits = self.digits + 'f' if num_digits % 2 else self.digits d = { 'addr_len': num_digits, 'type_of_addr': { @@ -248,7 +248,7 @@ 'type_of_number': self.ton, 'numbering_plan_id': self.npi, }, - 'digits': self.digits, + 'digits': digits, } return self._construct.build(d) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43556?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I81691c5a1fc5072d6d20c52d22da1eb2e180d04a Gerrit-Change-Number: 43556 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: tools: print tracebacks to the same stream as delimiters
by Hoernchen 08 Sep '26

08 Sep '26

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/43555?usp=email ) Change subject: tools: print tracebacks to the same stream as delimiters ...................................................................... tools: print tracebacks to the same stream as delimiters Error output is currently a garbled mess, delimiters are printed with poutput() or print(), traceback with traceback.print_exc() which goes to stderr. Reading stdout alone omits the report but not -->8-- lines. Reading both streams makes the traceback appear where the two buffers just happen to interleave, stderr is usually unbuffered but stdout is not, so I get the error trace, APDU trace, then empty -->8-- lines. Fix this by aligning the printing funcs. Change-Id: I2ed37dfe241d014e4a26894cddbc9b21be1fd0c2 --- M pySim-prog.py M pySim-shell.py 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/55/43555/1 diff --git a/pySim-prog.py b/pySim-prog.py index 6111fc1..0a3e888 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -816,7 +816,7 @@ print("") print("Card programming failed with an exception:") print("---------------------8<---------------------") - traceback.print_exc() + print(traceback.format_exc().rstrip()) print("---------------------8<---------------------") print("") rc = -1 diff --git a/pySim-shell.py b/pySim-shell.py index 31de001..4552bd0 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -351,7 +351,7 @@ self.poutput("") self.poutput("Card initialization (%s) failed with an exception:" % str(self.sl)) self.poutput("---------------------8<---------------------") - traceback.print_exc() + self.poutput(traceback.format_exc().rstrip()) self.poutput("---------------------8<---------------------") self.poutput("") return -1 @@ -465,7 +465,7 @@ self.poutput("") self.poutput("Card handling (%s) failed with an exception:" % str(self.sl)) self.poutput("---------------------8<---------------------") - traceback.print_exc() + self.poutput(traceback.format_exc().rstrip()) self.poutput("---------------------8<---------------------") self.poutput("") fail_count = fail_count + 1 @@ -1173,7 +1173,7 @@ startup_errors = True print("Card initialization (%s) failed with an exception:" % str(sl)) print("---------------------8<---------------------") - traceback.print_exc() + print(traceback.format_exc().rstrip()) print("---------------------8<---------------------") if not opts.noprompt: print("(you may still try to recover from this manually by using the 'equip' command.)") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43555?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2ed37dfe241d014e4a26894cddbc9b21be1fd0c2 Gerrit-Change-Number: 43555 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[S] Change in pysim[master]: cat: add sms_pp_download_envelope()
by Hoernchen 08 Sep '26

08 Sep '26

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/43557?usp=email ) Change subject: cat: add sms_pp_download_envelope() ...................................................................... cat: add sms_pp_download_envelope() Put a helper for wrapping an SMS-DELIVER TPDU in the ENVELOPE of TS 102 223 section 7.5.1 the assembly next to SMSPPDownload, where the IEs already live, so it can be reused by other tooling, for example for triggering scp81 sessions. Change-Id: Id23227eac53d697f4f13a84e087c32bf1d60f474 --- M pySim-smpp2sim.py M pySim/cat.py 2 files changed, 18 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/57/43557/1 diff --git a/pySim-smpp2sim.py b/pySim-smpp2sim.py index f7a45f5..95b9ccd 100755 --- a/pySim-smpp2sim.py +++ b/pySim-smpp2sim.py @@ -55,6 +55,7 @@ from pySim.commands import SimCardCommands from pySim.cards import UiccCardBase from pySim.exceptions import * +from pySim.cat import sms_pp_download_envelope from pySim.cat import ProactiveCommand, SendShortMessage, SMS_TPDU, SMSPPDownload, BearerDescription from pySim.cat import DeviceIdentities, Address, OtherAddress, UiccTransportLevel, BufferSize from pySim.cat import ChannelStatus, ChannelData, ChannelDataLength @@ -169,10 +170,7 @@ tpdu = SMS_DELIVER.from_smpp_submit(pdu) logger.info(tpdu) # 2) wrap into the CAT ENVELOPE for SMS-PP-Download - tpdu_ie = SMS_TPDU(decoded={'tpdu': b2h(tpdu.to_bytes())}) - addr_ie = Address(decoded={'ton_npi': {'ext':False, 'type_of_number':'unknown', 'numbering_plan_id':'unknown'}, 'call_number': '0123456'}) - dev_ids = DeviceIdentities(decoded={'source_dev_id': 'network', 'dest_dev_id': 'uicc'}) - sms_dl = SMSPPDownload(children=[dev_ids, addr_ie, tpdu_ie]) + sms_dl = sms_pp_download_envelope(tpdu) # 3) send to the card envelope_hex = b2h(sms_dl.to_tlv()) logger.info("ENVELOPE: %s" % envelope_hex) diff --git a/pySim/cat.py b/pySim/cat.py index d755545..8959004 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -763,6 +763,22 @@ nested=[DeviceIdentities, Address, SMS_TPDU]): pass + +def sms_pp_download_envelope(tpdu, call_number: str = '0123456') -> SMSPPDownload: + """TS 31.111 Section 7.1.1.2 wrap of a SMS-DELIVER TPDU in the ENVELOPE (SMS-PP Download) + call_number : + SMSC address to report, defined in TS 31.111 7.1.1.2 as + "the RP_Originating_Address of the Service Centre (TS-Service-Centre-Address, 3GPP TS 24.011)" + its presence is Conditional, and the note there says the UICC should be fine + if its missing, so for remote management its presence should suffice (?). + """ + return SMSPPDownload(children=[ + DeviceIdentities(decoded={'source_dev_id': 'network', 'dest_dev_id': 'uicc'}), + Address(decoded={'ton_npi': {'ext': False, 'type_of_number': 'unknown', + 'numbering_plan_id': 'unknown'}, + 'call_number': call_number}), + SMS_TPDU(decoded={'tpdu': b2h(tpdu.to_bytes())})]) + # TS 101 220 Table 7.17 + 31.111 7.1.1.3 class SMSCBDownload(BER_TLV_IE, tag=0xD2, nested=[DeviceIdentities, CBSPage]): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43557?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id23227eac53d697f4f13a84e087c32bf1d60f474 Gerrit-Change-Number: 43557 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: cat: fix TS 102 223 8.61 Access technology coding
by Hoernchen 08 Sep '26

08 Sep '26

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/43560?usp=email ) Change subject: cat: fix TS 102 223 8.61 Access technology coding ...................................................................... cat: fix TS 102 223 8.61 Access technology coding Spelling mistakes and new values missing. Change-Id: I74f361cd5b818079636f399cb8c1b1c609b9e1f2 --- M pySim/cat.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/60/43560/1 diff --git a/pySim/cat.py b/pySim/cat.py index 2fda7c5..991dd40 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -536,9 +536,9 @@ # TS 102 223 Section 8.61 class AccessTechnology(COMPR_TLV_IE, tag=0xBF): - SingleAccessTech = Enum(Int8ub, gsm=0, tia_eia_533=1, tia_eia_136_270=2, utran=3, tetra=4, - tia_eia_95_b=5, cdma1000_1x=6, cdma2000_hrpd=7, eutran=8, - ehrpd=9, nr=0x0a) + SingleAccessTech = Enum(Int8ub, gsm=0, tia_eia_553=1, tia_eia_136_270=2, utran=3, tetra=4, + tia_eia_95_b=5, cdma2000_1x=6, cdma2000_hrpd=7, eutran=8, + ehrpd=9, nr=0x0a, satellite_nr=0x0b, satellite_eutran=0x0c) _construct = GreedyRange(SingleAccessTech) # TS 102 223 Section 8.63 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43560?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I74f361cd5b818079636f399cb8c1b1c609b9e1f2 Gerrit-Change-Number: 43560 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[M] Change in pysim[master]: cat: fix Supported Radio Access Technologies state flag
by Hoernchen 08 Sep '26

08 Sep '26

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/43559?usp=email ) Change subject: cat: fix Supported Radio Access Technologies state flag ...................................................................... cat: fix Supported Radio Access Technologies state flag TS 102 223 8.105 codes each supported technology in two bytes: - the technology from 8.61 - state byte, b1 0 disabled/1 enabled - b2-b8 RFU Currently declared as FlagsEnum(Int8ub, enabled=0). kw value is used as bitmask, so currently: build {'enabled': True} -> b4 02 08 00 disabled build {'enabled': False} -> b4 02 08 00 disabled but parsed 08 00 / 08 01 / 08 ff -> all {'enabled': True} Use the bit the spec names + tests because well this is so easy that we don't need tests is apparently not the right approach here.. Change-Id: I4dd16182eb06c99265aabab5d889967b890f6bf2 --- M pySim/cat.py A tests/unittests/test_cat.py 2 files changed, 67 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/59/43559/1 diff --git a/pySim/cat.py b/pySim/cat.py index 8959004..2fda7c5 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -729,8 +729,12 @@ # TS 102 223 Section 8.105 class SupportedRadioAccessTechnologies(COMPR_TLV_IE, tag=0xB4): + # 2 bytes/entry: + # - technology of 8.61 + # - state byte b1 is 0 disabled/1 enabled + # - b2-b8 RFU. AccessTechTuple = Struct('technology'/AccessTechnology.SingleAccessTech, - 'state'/FlagsEnum(Int8ub, enabled=0)) + 'state'/FlagsEnum(Int8ub, enabled=1)) _construct = GreedyRange(AccessTechTuple) # TS 102 223 Section 8.107 diff --git a/tests/unittests/test_cat.py b/tests/unittests/test_cat.py new file mode 100644 index 0000000..4e0450c --- /dev/null +++ b/tests/unittests/test_cat.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python3 +"""Tests for the CAT (Card Application Toolkit) COMPREHENSION-TLV data objects""" + +# (C) 2026 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +# +# Author: Eric Wild +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# IEs not properly coverd by test_tlvs.py + + +import unittest + +from osmocom.utils import b2h, h2b + +from pySim.cat import SupportedRadioAccessTechnologies + + +class SupportedRadioAccessTechnologies_Test(unittest.TestCase): + """TS 102 223 8.105""" + + def test_enabled_is_encodable(self): + """The flag used to have a bm of 0 so enabled -> 00 (that is disabled..)""" + ie = SupportedRadioAccessTechnologies( + decoded=[{'technology': 'eutran', 'state': {'enabled': True}}]) + self.assertEqual(b2h(ie.to_tlv()), 'b4020801') + + def test_disabled_differs_from_enabled(self): + ie = SupportedRadioAccessTechnologies( + decoded=[{'technology': 'eutran', 'state': {'enabled': False}}]) + self.assertEqual(b2h(ie.to_tlv()), 'b4020800') + + def test_state_byte_is_read_back_faithfully(self): + """old 0 bm = all enabled, no way to disable""" + for encoded, enabled in [('b4020800', False), ('b4020801', True)]: + with self.subTest(encoded=encoded): + ie = SupportedRadioAccessTechnologies() + ie.from_tlv(h2b(encoded)) + self.assertEqual(ie.decoded[0]['state']['enabled'], enabled) + + def test_multiple_technologies(self): + ie = SupportedRadioAccessTechnologies() + ie.from_tlv(h2b('b40408010000')) + self.assertEqual([(e['technology'], e['state']['enabled']) for e in ie.decoded], + [('eutran', True), ('gsm', False)]) + + + +if __name__ == "__main__": + unittest.main() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43559?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4dd16182eb06c99265aabab5d889967b890f6bf2 Gerrit-Change-Number: 43559 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[S] Change in pysim[master]: bip: answer proactive commands the relay does not implement
by Hoernchen 08 Sep '26

08 Sep '26

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/43558?usp=email ) Change subject: bip: answer proactive commands the relay does not implement ...................................................................... bip: answer proactive commands the relay does not implement pySim-smpp2sim currently claims to support every feature flag that exists, but this immediately dies here with a SJA5: NotImplementedError: No handler method for ProvideLocalInformation(...) Answer anything unhandled with "performed_successfully" and log. Never "command_beyond_terminal_capability", tho, answering that for PROVIDE LOCAL INFORMATION refuses to open the session at all. Change-Id: I1e55d6f88c872a04b89a3946dd840d30b329621e --- M pySim/bip.py 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/58/43558/1 diff --git a/pySim/bip.py b/pySim/bip.py index e5ec029..14c75bc 100644 --- a/pySim/bip.py +++ b/pySim/bip.py @@ -203,6 +203,25 @@ self.sms_sink = sms_sink self.channels = ProactChannels(on_data_available=self._on_channel_data_available) + def receive_fetch(self, pcmd: ProactiveCommand): + """Answer anything this handler has no specific handler for. + + A card coming up will usually issue PROVIDE LOCAL INFORMATION, + POLL INTERVAL or TIMER MANAGEMENT before it gets anywhere near a BIP channel + because we claim to support every feature flag there is. + + Note that this is not the spec-correct answer. TS 102 223 6.8.7 + says a successful TERMINAL RESPONSE to PROVIDE LOCAL INFORMATION "shall" carry the + requested Local information data object, and 6.8.13/6.8.14 says the same for TIMER + MANAGEMENT, this returns empty results for all of them, which works with real cards. + + Always "performed_successfully", never "command_beyond_terminal_capability" because + answering that to PROVIDE LOCAL INFORMATION makes a card refuse to open the session. + """ + logger.info("no handler for %s, answering performed_successfully", + type(pcmd.decoded).__name__) + return self.prepare_response(pcmd, 'performed_successfully') + @staticmethod def _find_first_element_of_type(instlist, cls): for i in instlist: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43558?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1e55d6f88c872a04b89a3946dd840d30b329621e Gerrit-Change-Number: 43558 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: osmo-smdpp: case insensitive comp of ES9+ SM-DP+ address
by Hoernchen 08 Sep '26

08 Sep '26

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/43562?usp=email ) Change subject: osmo-smdpp: case insensitive comp of ES9+ SM-DP+ address ...................................................................... osmo-smdpp: case insensitive comp of ES9+ SM-DP+ address Do what the comment above the line already says.. Change-Id: Ie0738e810572ea3312c885ec8aaa2da4b8b12cd7 --- M osmo-smdpp.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/62/43562/1 diff --git a/osmo-smdpp.py b/osmo-smdpp.py index ef214a9..5ac08df 100755 --- a/osmo-smdpp.py +++ b/osmo-smdpp.py @@ -525,7 +525,7 @@ """See ES9+ InitiateAuthentication SGP.22 Section 5.6.1""" # Verify that the received address matches its own SM-DP+ address, where the comparison SHALL be # case-insensitive. Otherwise, the SM-DP+ SHALL return a status code "SM-DP+ Address - Refused". - if content['smdpAddress'] != self.server_hostname: + if content['smdpAddress'].lower() != self.server_hostname.lower(): raise ApiError('8.8.1', '3.8', 'Invalid SM-DP+ Address') euiccChallenge = b64decode(content['euiccChallenge']) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43562?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie0738e810572ea3312c885ec8aaa2da4b8b12cd7 Gerrit-Change-Number: 43562 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[M] Change in pysim[master]: bip: refuse OPEN CHANNEL with a TERMINAL RESPONSE
by Hoernchen 08 Sep '26

08 Sep '26

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/43563?usp=email ) Change subject: bip: refuse OPEN CHANNEL with a TERMINAL RESPONSE ...................................................................... bip: refuse OPEN CHANNEL with a TERMINAL RESPONSE handle_OpenChannel() raises where TS 102 223 demands a TERMINAL RESPONSE. Raising takes the whole proactive session down with it. All four are a BIP errors and differ only in the cause byte of 8.12.11. Change-Id: If8f01e6acb9cb3f7af952a0760fc093db81be53a --- M pySim/bip.py M tests/unittests/test_bip_relay.py 2 files changed, 106 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/43563/1 diff --git a/pySim/bip.py b/pySim/bip.py index 14c75bc..8370b5b 100644 --- a/pySim/bip.py +++ b/pySim/bip.py @@ -356,26 +356,53 @@ other_addr_ie = Proact._find_first_element_of_type(pcmd.children, OtherAddress) bearer_desc_ie = Proact._find_first_element_of_type(pcmd.children, BearerDescription) buffer_size_ie = Proact._find_first_element_of_type(pcmd.children, BufferSize) - if transp_lvl_ie.decoded['protocol_type'] != 'tcp_uicc_client_remote': - raise ValueError('Unsupported protocol_type') - if other_addr_ie.decoded.get('type_of_address', None) != 'ipv4': - raise ValueError('Unsupported type_of_address') + + def refuse(additional_information: str, chan_nr: int = 0): + """TERMINAL RESPONSE refusing the OPEN CHANNEL + + - always a BIP error, only the cause byte of TS 102 223 8.12.11 differs + - chan_nr 0 -> "no channel available" in the Channel status, 8.56 + - 6.8.18, 6.8.20, 6.8.21 want chan status, Bearer desc and buf size + in a successful or unsuccessful response + """ + ies = [ChannelStatus(decoded=self._channel_status(chan_nr, established=False))] + ies += [ie for ie in (bearer_desc_ie, buffer_size_ie) if ie is not None] + return self._bip_response_head(pcmd, 'bearer_independent_protocol_error', + additional_information) + ies + + # UICC/terminal interface transport level is Optional, TS 102 223 6.6.27.x. Absent means + # the CAT application runs its own network and transport layer, which we do not do. + if transp_lvl_ie is None or transp_lvl_ie.decoded['protocol_type'] != 'tcp_uicc_client_remote': + logger.warning("OpenChannel: unsupported UICC/terminal interface transport level (%s) " + "-> refusing", transp_lvl_ie.decoded if transp_lvl_ie else '(absent)') + return refuse('requested_uicc_if_transp_level_not_available') + if other_addr_ie is None or other_addr_ie.decoded.get('type_of_address', None) != 'ipv4': + # No cause byte fits a wrong address family. '06' is about the transport level data + # object, and 8.12.11 leaves '14' ("IPv4 only allowed") reserved by 3GPP, so '00'. + logger.warning("OpenChannel: unsupported data destination address (%s) -> refusing", + other_addr_ie.decoded if other_addr_ie else '(absent)') + return refuse('no_specific_cause') addr_bytes = h2b(other_addr_ie.decoded['address']) if isinstance( other_addr_ie.decoded['address'], str) else other_addr_ie.decoded['address'] ipv4_str = '%u.%u.%u.%u' % (addr_bytes[0], addr_bytes[1], addr_bytes[2], addr_bytes[3]) port_nr = transp_lvl_ie.decoded['port_number'] logger.info("OpenChannel: connecting to %s:%u", ipv4_str, port_nr) - channel = self.channels.channel_create() + try: + channel = self.channels.channel_create() + except ValueError: + # TS 102 223 6.4.27.2 and 6.4.27.3: no channel left -> BIP error + logger.warning("OpenChannel: all %u channels are in use -> refusing", + len(self.channels.channels)) + return refuse('no_channel_availabile') # yes, blocking connect() try: channel.connect(ipv4_str, port_nr) except OSError as e: logger.warning("OpenChannel: connect to %s:%u failed: %s", ipv4_str, port_nr, e) self.channels.channel_delete(channel.chan_nr) - return self._bip_response_head(pcmd, 'bearer_independent_protocol_error', - 'channel_closed') + [ - ChannelStatus(decoded=self._channel_status(channel.chan_nr, established=False)), - bearer_desc_ie, buffer_size_ie] + # TS 102 223 6.4.30 is the only clause naming a cause for a link that could not be + # established: BIP error, channel closed. 6.4.27.4 lists no error cases at all. + return refuse('channel_closed', channel.chan_nr) # Terminal Response example: [ # {'command_details': {'command_number': 1, diff --git a/tests/unittests/test_bip_relay.py b/tests/unittests/test_bip_relay.py index cf11b7f..8716585 100644 --- a/tests/unittests/test_bip_relay.py +++ b/tests/unittests/test_bip_relay.py @@ -91,6 +91,17 @@ ]) +def _open_channel_raw(extra_ies, cmd_nr=1): + """OPEN CHANNEL with only the head data""" + return _pcmd([ + CommandDetails(decoded={'command_number': cmd_nr, 'type_of_command': 'open_channel', + 'command_qualifier': 3}).to_tlv(), + DeviceIdentities(decoded={'source_dev_id': 'uicc', 'dest_dev_id': 'terminal'}).to_tlv(), + BearerDescription(decoded={'bearer_type': 'default', 'bearer_parameters': b''}).to_tlv(), + BufferSize(decoded=1024).to_tlv(), + ] + extra_ies) + + def _send_data(payload, chan='channel_1', cmd_nr=1): return _pcmd([ CommandDetails(decoded={'command_number': cmd_nr, 'type_of_command': 'send_data', @@ -252,8 +263,65 @@ self.assertEqual(_first(til, ChannelDataLength).decoded, 0) -if __name__ == "__main__": - unittest.main() +class OpenChannelRefusalTest(unittest.TestCase): + """Refusal is a TERMINAL RESPONSE, not an exception, raising takes the whole + proactive session down and leaves the card wondering why""" + + ADDR = OtherAddress(decoded={'type_of_address': 'ipv4', 'address': bytes([127, 0, 0, 1])}) + TCP = UiccTransportLevel(decoded={'protocol_type': 'tcp_uicc_client_remote', 'port_number': 1234}) + + def setUp(self): + self.proact = Proact() + self.addCleanup(self._close_all_channels) + + def _close_all_channels(self): + for chan in list(self.proact.channels.channels.values()): + try: + chan.close() + except Exception: + pass + + def _assert_refused(self, til, additional_information, chan_nr=0): + b''.join(x.to_tlv() for x in til) # must serialise, the transport posts it + res = _first(til, Result).decoded + self.assertEqual(res['general_result'], 'bearer_independent_protocol_error') + self.assertEqual(res['additional_information'], additional_information) + self.assertEqual(_first(til, ChannelStatus).decoded, '%02x00' % chan_nr) # 8.56 + self.assertIsNotNone(_first(til, BearerDescription)) # 6.8.20 + self.assertIsNotNone(_first(til, BufferSize)) # 6.8.21 + self.assertEqual(b2h(_first(til, DeviceIdentities).to_tlv()), '82028281') # 6.8.2 + + def test_transport_level(self): + udp = UiccTransportLevel(decoded={'protocol_type': 'udp_uicc_client_remote', + 'port_number': 1234}) + for extra in ([self.ADDR.to_tlv()], # absent, 6.6.27.x Optional + [udp.to_tlv(), self.ADDR.to_tlv()]): # not TCP client remote + with self.subTest(extra=len(extra)): + self._assert_refused(self.proact.handle_OpenChannel(_open_channel_raw(extra)), + 'requested_uicc_if_transp_level_not_available') + + def test_destination_address(self): + v6 = OtherAddress(decoded={'type_of_address': 'ipv6', 'address': bytes(16)}) + for extra in ([self.TCP.to_tlv()], # absent + [self.TCP.to_tlv(), v6.to_tlv()]): # not IPv4 + with self.subTest(extra=len(extra)): + self._assert_refused(self.proact.handle_OpenChannel(_open_channel_raw(extra)), + 'no_specific_cause') + + def test_no_channel_left(self): + for _ in range(7): # 6.4.27.2, 6.4.27.3 + self.proact.channels.channel_create() + cmd = _open_channel_raw([self.TCP.to_tlv(), self.ADDR.to_tlv()]) + self._assert_refused(self.proact.handle_OpenChannel(cmd), 'no_channel_availabile') + + def test_connect_failure(self): + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) # port nothing listens on + s.bind(('127.0.0.1', 0)) + dead_port = s.getsockname()[1] + s.close() + til = self.proact.handle_OpenChannel(_open_channel(dead_port)) + self._assert_refused(til, 'channel_closed', chan_nr=1) # 6.4.30 + self.assertEqual(self.proact.channels.channels, {}) # channel given back class BipSinkTest(unittest.TestCase): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43563?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If8f01e6acb9cb3f7af952a0760fc093db81be53a Gerrit-Change-Number: 43563 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[M] Change in pysim[master]: cat: properly decode IMEI/IMEISV IE
by Hoernchen 08 Sep '26

08 Sep '26

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/43561?usp=email ) Change subject: cat: properly decode IMEI/IMEISV IE ...................................................................... cat: properly decode IMEI/IMEISV IE Currently BcdAdapter(GreedyBytes), a plain swapped nibble digit string, which is wrong, it is not a bcd string. See TS 124.008 10.5.1.4 figure 10.5.4 + table 10.5.4 It currently - decodes framing nibble as digit - encodes a 15 digit IMEI as 7 bytes, wrong len, dropped last digit Fix this, while at it add the 8.74 IMEISV as well + tests for the framing because the current round trip missed all of this. Change-Id: Iad7aea77513d413c338edc18ef1bcc37488ae849 --- M pySim/cat.py M tests/unittests/test_cat.py M tests/unittests/test_tlvs.py 3 files changed, 115 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/61/43561/1 diff --git a/pySim/cat.py b/pySim/cat.py index 991dd40..8e072d8 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -22,7 +22,7 @@ from bidict import bidict from construct import Int8ub, Int16ub, Byte, BitsInteger from construct import Struct, Enum, BitStruct, this -from construct import Switch, GreedyRange, FlagsEnum +from construct import Switch, GreedyRange, FlagsEnum, Adapter from osmocom.tlv import TLV_IE, COMPR_TLV_IE, BER_TLV_IE, TLV_IE_Collection from osmocom.construct import PlmnAdapter, BcdAdapter, GsmStringAdapter, TonNpi, GsmString, Bytes, GreedyBytes from osmocom.utils import b2h, h2b @@ -320,9 +320,52 @@ class LocationInformation(COMPR_TLV_IE, tag=0x93): pass -# TS 102 223 Section 8.20 +class MobileIdentityAdapter(Adapter): + """TS 124.008 section 10.5.1.4 figure 10.5.4 + table 10.5.4 + + NOT a plain BCD string: + - bits 1-3 type of identity + odd/even bit 4 + - digit 1 in bits 5-8, following octets contain 2 digits, low nibble first + - if even length: high nibble of last octet 1111 + So IMEI IE of 8 bytes is 15 digits + framing nibble.""" + + # Table 10.5.4 bits 321 + TYPE_IMSI = 1 + TYPE_IMEI = 2 + TYPE_IMEISV = 3 + + def __init__(self, subcon, type_of_identity: int): + super().__init__(subcon) + self.type_of_identity = type_of_identity + + def _decode(self, obj, context, path): + data = bytes(obj) + if not data: + return '' + odd = bool(data[0] & 0x08) # bit 4: 1 = odd number of digits + digits = '%x' % (data[0] >> 4) # bits 5-8: digit 1 + for octet in data[1:]: + digits += '%x%x' % (octet & 0x0f, octet >> 4) + if not odd: + digits = digits[:-1] # drop the 1111 end mark + return digits + + def _encode(self, obj, context, path): + digits = str(obj) + odd = len(digits) % 2 + first = (int(digits[0], 16) << 4) | (0x08 if odd else 0x00) | self.type_of_identity + rest = digits[1:] if odd else digits[1:] + 'f' + return bytes([first]) + bytes((int(rest[i+1], 16) << 4) | int(rest[i], 16) + for i in range(0, len(rest), 2)) + +# TS 102 223 Section 8.20, len is fixed at 8: "The IMEI is coded [..] as the +# value part of the Mobile Identity IE as specified in TS 124 008", and the +# IMEI itself is the 15 digits of TS 123 003. class IMEI(COMPR_TLV_IE, tag=0x94): - _construct = BcdAdapter(GreedyBytes) + _test_de_encode = [ + ( '94081a32547698103254', '123456789012345' ), + ] + _construct = MobileIdentityAdapter(GreedyBytes, MobileIdentityAdapter.TYPE_IMEI) # TS 102 223 Section 8.21 class HelpRequest(COMPR_TLV_IE, tag=0x95): @@ -596,6 +639,14 @@ eutran_inter_rat_utran=0x08, eutran_inter_rat_nr=0x09) +# TS 102 223 Section 8.74, length is not fixed, because IMEISV is 16 digits per TS 123.003 +# -> even count needs the '1111' end mark and is 9 bytes long +class IMEISV(COMPR_TLV_IE, tag=0xE2): + _test_de_encode = [ + ( 'e2091332547698103254f6', '1234567890123456' ), + ] + _construct = MobileIdentityAdapter(GreedyBytes, MobileIdentityAdapter.TYPE_IMEISV) + # TS 102 223 Section 8.75 class NetworkSearchMode(COMPR_TLV_IE, tag=0xE5): _construct = Enum(Int8ub, manual=0, automatic=1) diff --git a/tests/unittests/test_cat.py b/tests/unittests/test_cat.py index 4e0450c..c6324c2 100644 --- a/tests/unittests/test_cat.py +++ b/tests/unittests/test_cat.py @@ -25,7 +25,66 @@ from osmocom.utils import b2h, h2b -from pySim.cat import SupportedRadioAccessTechnologies +from pySim.cat import IMEI, IMEISV, AccessTechnology, SupportedRadioAccessTechnologies + + +class IMEI_Test(unittest.TestCase): + """TS 102 223 8.20: the IMEI IE is 8 bytes, coded as valie part of Mobile Identity IE from 124 008""" + + IMEI_15 = '123456789012345' + ENCODED = '94081a32547698103254' + + def test_encode_is_eight_bytes(self): + """15 digits in 8 byte: 16 nibbles, one is type/parity framing.""" + tlv = IMEI(decoded=self.IMEI_15).to_tlv() + self.assertEqual(b2h(tlv), self.ENCODED) + self.assertEqual(tlv[1], 0x08) # spec len 8 + self.assertEqual(len(tlv) - 2, 8) + + def test_first_octet_framing(self): + """TS 24.008 table 10.5.4""" + octet1 = IMEI(decoded=self.IMEI_15).to_tlv()[2] + self.assertEqual(octet1 & 0x07, 2) # IMEI + self.assertEqual((octet1 >> 3) & 0x01, 1) # odd + self.assertEqual(octet1 >> 4, 1) # digit 1 + + def test_decodes_to_the_raw_imei(self): + """strip framing nibble""" + ie = IMEI() + ie.from_tlv(h2b(self.ENCODED)) + self.assertEqual(ie.decoded, self.IMEI_15) + + def test_even_digit_count_uses_the_end_mark(self): + """"end marker, IMEISV case""" + ie = IMEI(decoded='1234567890123456') + tlv = ie.to_tlv() + self.assertEqual(tlv[2] >> 3 & 0x01, 0) # even + self.assertEqual(tlv[-1] >> 4, 0x0f) # end mark + back = IMEI() + back.from_tlv(tlv) + self.assertEqual(back.decoded, '1234567890123456') + + +class IMEISV_Test(unittest.TestCase): + """TS 102 223 8.74, no fixed len, end marker""" + + IMEISV_16 = '1234567890123456' + ENCODED = 'e2091332547698103254f6' + + def test_encode(self): + self.assertEqual(b2h(IMEISV(decoded=self.IMEISV_16).to_tlv()), self.ENCODED) + + def test_type_of_identity_and_end_mark(self): + value = IMEISV(decoded=self.IMEISV_16).to_tlv()[2:] + self.assertEqual(value[0] & 0x07, 3) # IMEISV + self.assertEqual((value[0] >> 3) & 0x01, 0) # even + self.assertEqual(value[-1] >> 4, 0x0f) # end mark + self.assertEqual(len(value), 9) + + def test_decode(self): + ie = IMEISV() + ie.from_tlv(h2b(self.ENCODED)) + self.assertEqual(ie.decoded, self.IMEISV_16) class SupportedRadioAccessTechnologies_Test(unittest.TestCase): diff --git a/tests/unittests/test_tlvs.py b/tests/unittests/test_tlvs.py index 7f1b72b..71eaa05 100755 --- a/tests/unittests/test_tlvs.py +++ b/tests/unittests/test_tlvs.py @@ -21,6 +21,7 @@ from osmocom.utils import b2h, h2b, all_subclasses from osmocom.tlv import * +import pySim.cat import pySim.iso7816_4 import pySim.ts_102_221 import pySim.ts_102_222 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43561?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iad7aea77513d413c338edc18ef1bcc37488ae849 Gerrit-Change-Number: 43561 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log September 2026