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

[M] Change in ...pyosmocom[master]: osmocom.construct.Asn1DerInteger

by laforge

Attention is currently required from: dexter, fixeria, osmith. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38272?usp=email ) Change subject: osmocom.construct.Asn1DerInteger ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I0cfe97daf957919de86453d6d44f9c99ab3075ac Gerrit-Change-Number: 38272 Gerrit-PatchSet: 8 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Sep 2024 17:14:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

8 months, 3 weeks

1
0
0 0

[M] Change in ...pyosmocom[master]: construct: move __bytes_required to utils and finish the implementation

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38289?usp=email ) Change subject: construct: move __bytes_required to utils and finish the implementation ...................................................................... construct: move __bytes_required to utils and finish the implementation The method __bytes_required in the GreedyInteger class computes how many byte a given integer number requires, when it is encoded. This method currently only works for unsigned integers. Let's move it to utils and add support for signed integers. Related: SYS#7094 Change-Id: I9ae4acc30dbd5fb6a6b24b10254ffb205bfde52d --- M src/osmocom/construct.py M src/osmocom/utils.py M tests/test_utils.py 3 files changed, 77 insertions(+), 21 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmocom/construct.py b/src/osmocom/construct.py index def5d85..7c0f034 100644 --- a/src/osmocom/construct.py +++ b/src/osmocom/construct.py @@ -16,7 +16,7 @@ from construct.core import evaluate from construct.lib import integertypes -from osmocom.utils import b2h, h2b, swap_nibbles +from osmocom.utils import b2h, h2b, swap_nibbles, int_bytes_required # (C) 2021-2022 by Harald Welte <laforge(a)osmocom.org> # @@ -587,29 +587,10 @@ except ValueError as e: raise IntegerError(str(e), path=path) - def __bytes_required(self, i, minlen=0): - if self.signed: - raise NotImplementedError("FIXME: Implement support for encoding signed integer") - - # compute how many bytes we need - nbytes = 1 - while True: - i = i >> 8 - if i == 0: - break - else: - nbytes = nbytes + 1 - - # round up to the minimum number - # of bytes we anticipate - nbytes = max(nbytes, minlen) - - return nbytes - def _build(self, obj, stream, context, path): if not isinstance(obj, integertypes): raise IntegerError(f"value {obj} is not an integer", path=path) - length = self.__bytes_required(obj, self.minlen) + length = int_bytes_required(obj, self.minlen, self.signed) try: data = obj.to_bytes(length, byteorder='big', signed=self.signed) except ValueError as e: diff --git a/src/osmocom/utils.py b/src/osmocom/utils.py index 009eb04..5947453 100644 --- a/src/osmocom/utils.py +++ b/src/osmocom/utils.py @@ -137,6 +137,44 @@ return (n + 1)//2 +def int_bytes_required(number: int, minlen:int = 0, signed:bool = False): + """compute how many bytes an integer requires when it is encoded into bytes + Args: + number : integer number + minlen : minimum length + signed : compute the number of bytes for a signed integer (two's complement) + Returns: + Integer 'nbytes', which is the number of bytes required to encode 'number' + """ + + if signed == False and number < 0: + raise ValueError("expecting a positive number") + + # Compute how many bytes we need for the absolute (positive) value of the given number + nbytes = 1 + i = abs(number) + while True: + i = i >> 8 + if i == 0: + break + else: + nbytes = nbytes + 1 + + # When we deal with signed numbers, then the two's complement applies. This means that we must check if the given + # number would still fit in the value range of the number of bytes we have calculated above. If not, one more + # byte is required. + if signed: + value_range_limit = pow(2,nbytes*8) // 2 + if number < -value_range_limit: + nbytes = nbytes + 1 + elif number >= value_range_limit: + nbytes = nbytes + 1 + + # round up to the minimum number of bytes we anticipate + nbytes = max(nbytes, minlen) + return nbytes + + def str_sanitize(s: str) -> str: """replace all non printable chars, line breaks and whitespaces, with ' ', make sure that there are no whitespaces at the end and at the beginning of the string. diff --git a/tests/test_utils.py b/tests/test_utils.py index 8e4732f..0f22e35 100755 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -54,5 +54,42 @@ self.assertEqual(str(hexstr('ABCD')), 'abcd') +class Test_int_bytes_required(unittest.TestCase): + + def test_int_bytes_required(self): + + tests = [ + # unsigned positive numbers + ( 1, 0, False ), + ( 1, 1, False ), + ( 1, 255, False ), + ( 2, 256, False ), + ( 2, 65535, False ), + ( 3, 65536, False ), + ( 2, 65535, False ), + ( 3, 16777215, False ), + ( 4, 16777216, False ), + + # signed positive numbers + ( 1, 0, True ), + ( 1, 1, True ), + ( 1, 127, True ), + ( 2, 128, True ), + ( 2, 32767, True ), + ( 3, 32768, True ), + + # signed negative numbers + ( 1, -0, True ), + ( 1, -1, True ), + ( 1, -128, True ), + ( 2, -129, True ), + ( 2, -32768, True ), + ( 3, -32769, True ), + ] + + for t in tests: + self.assertEqual(t[0], int_bytes_required(t[1], signed = t[2])) + + if __name__ == "__main__": unittest.main() -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38289?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I9ae4acc30dbd5fb6a6b24b10254ffb205bfde52d Gerrit-Change-Number: 38289 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

8 months, 3 weeks

1
0
0 0

[M] Change in ...pyosmocom[master]: construct: move __bytes_required to utils and finish the implementation

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38289?usp=email ) Change subject: construct: move __bytes_required to utils and finish the implementation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38289?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I9ae4acc30dbd5fb6a6b24b10254ffb205bfde52d Gerrit-Change-Number: 38289 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Sep 2024 17:13:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

8 months, 3 weeks

1
0
0 0

[XL] Change in pysim[master]: tests: sanitize all cards before running tests

by laforge

Attention is currently required from: dexter, fixeria, osmith. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38254?usp=email ) Change subject: tests: sanitize all cards before running tests ...................................................................... Patch Set 3: (1 comment) Patchset: PS1: > we could also start with running this 'sanitizer' only once every night? This way any breakage would […] actually, even the tests could probably run in parallel for each of the cards? There's no need to execute them sequentially. That should give a nice speed-up. The output should of course not be mixed, but each concurrent test run output should be redirected to a file, which could then be concatenated one after each other _after_ all of them have terminated? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38254?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I42eaf61280968518164f2280245136fd30a603ce Gerrit-Change-Number: 38254 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Sep 2024 16:51:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>

8 months, 3 weeks

1
0
0 0

[XL] Change in pysim[master]: tests: sanitize all cards before running tests

by laforge

Attention is currently required from: dexter, fixeria, osmith. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38254?usp=email ) Change subject: tests: sanitize all cards before running tests ...................................................................... Patch Set 3: (1 comment) Patchset: PS1: > I now did a test run with a stopwatch to measure this. It takes 7:31 for all 7 cards. […] we could also start with running this 'sanitizer' only once every night? This way any breakage would at least auto-recover? @osmith@sysmocom.de Also: @pmaier You could actually restore all cards in parallel, given that each reader is separate and can be accessed concurrently. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38254?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I42eaf61280968518164f2280245136fd30a603ce Gerrit-Change-Number: 38254 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Sep 2024 16:50:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>

8 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: cosmetic: use **kwargs instead of **_kwargs

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38300?usp=email ) Change subject: cosmetic: use **kwargs instead of **_kwargs ...................................................................... cosmetic: use **kwargs instead of **_kwargs Some methods sometimes have a **_kwargs parameter, let's be consistent and use **kwargs only. Related: OS#5714 Change-Id: I98857cc774185e55a604eb4fbfbf62ed4bd6ded7 --- M pySim/ts_102_221.py M pySim/ts_31_102.py 2 files changed, 7 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index f09b1e3..fa1bd39 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -733,7 +733,7 @@ raise ValueError return by_mode - def _decode_record_bin(self, raw_bin_data, **_kwargs): + def _decode_record_bin(self, raw_bin_data, **kwargs): # we can only guess if we should decode for EF or DF here :( arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO]) dec = arr_seq.decode_multi(raw_bin_data) @@ -741,7 +741,7 @@ # 'un-flattening' decoder, and hence would be unable to encode :( return dec[0] - def _encode_record_bin(self, in_json, **_kwargs): + def _encode_record_bin(self, in_json, **kwargs): # we can only guess if we should decode for EF or DF here :( arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO]) return arr_seq.encode_multi(in_json) diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index ab5ee54..b82c411 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -405,14 +405,14 @@ desc='Language Indication'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len) - def _decode_record_bin(self, in_bin, **_kwargs): + def _decode_record_bin(self, in_bin, **kwargs): if in_bin == b'\xff\xff': return None else: # officially this is 7-bit GSM alphabet with one padding bit in each byte return in_bin.decode('ascii') - def _encode_record_bin(self, in_json, **_kwargs): + def _encode_record_bin(self, in_json, **kwargs): if in_json is None: return b'\xff\xff' else: @@ -505,7 +505,7 @@ desc='Emergency Call Codes'): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(4, 20)) - def _decode_record_bin(self, in_bin, **_kwargs): + def _decode_record_bin(self, in_bin, **kwargs): # mandatory parts code = in_bin[:3] if code == b'\xff\xff\xff': @@ -519,7 +519,7 @@ ret['alpha_id'] = parse_construct(EF_ECC.alpha_construct, alpha_id) return ret - def _encode_record_bin(self, in_json, **_kwargs): + def _encode_record_bin(self, in_json, **kwargs): if in_json is None: return b'\xff\xff\xff\xff' code = EF_ECC.cc_construct.build(in_json['call_code']) @@ -682,7 +682,7 @@ def __init__(self, fid='6f65', sfid=None, name='EF.RPLMNAcTD', size=(2, 4), rec_len=2, desc='RPLMN Last used Access Technology', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) - def _decode_record_hex(self, in_hex, **_kwargs): + def _decode_record_hex(self, in_hex, **kwargs): return dec_act(in_hex) # TODO: Encode -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38300?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I98857cc774185e55a604eb4fbfbf62ed4bd6ded7 Gerrit-Change-Number: 38300 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

8 months, 3 weeks

1
0
0 0

[M] Change in pysim[master]: ts_51_011: replace encoding of EF.MSISDN with construct model

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38117?usp=email ) Change subject: ts_51_011: replace encoding of EF.MSISDN with construct model ...................................................................... ts_51_011: replace encoding of EF.MSISDN with construct model The encoding of EF.MSISDN is currently done with enc_msisdn and dec_msisdn from utils.py. Let's replace this with a construct based model, similar to the one we already use with EF.ADN Related: OS#5714 Change-Id: I647f5c63f7f87902a86c0c5d8e92fdc7f4350a5a --- M pySim/ts_51_011.py M tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng.ok 2 files changed, 48 insertions(+), 15 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 1070b42..1ef6bb6 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -40,7 +40,6 @@ from osmocom.construct import * from pySim.utils import dec_iccid, enc_iccid, dec_imsi, enc_imsi, dec_plmn, enc_plmn, dec_xplmn_w_act -from pySim.utils import dec_msisdn, enc_msisdn from pySim.profile import CardProfile, CardProfileAddon from pySim.filesystem import * from pySim.ts_31_102_telecom import DF_PHONEBOOK, DF_MULTIMEDIA, DF_MCS, DF_V2X @@ -189,20 +188,54 @@ # TS 51.011 Section 10.5.5 class EF_MSISDN(LinFixedEF): + _test_de_encode = [ + ( 'ffffffffffffffffffffffffffffffffffffffff04b12143f5ffffffffffffffffff', + {"alpha_id": "", "len_of_bcd": 4, "ton_npi": {"ext": True, "type_of_number": "network_specific", + "numbering_plan_id": "isdn_e164"}, + "dialing_nr": "12345f"}), + ( '456967656e65205275666e756d6d6572ffffffff0891947172199181f3ffffffffff', + {"alpha_id": "Eigene Rufnummer", "len_of_bcd": 8, "ton_npi": {"ext": True, "type_of_number": "international", + "numbering_plan_id": "isdn_e164"}, + "dialing_nr": "4917279119183f"}), + ] + + # Ensure deprecated representations still work + _test_encode = [ + ( 'ffffffffffffffffffffffffffffffffffffffff05b1716662f6ffffffffffffffff', + {"msisdn": [ 1, 3, "1766266"]}), + ( 'ffffffffffffffffffffffffffffffffffffffff06b121436587f9ffffffffffffff', + {"msisdn": "123456789"}), + ] + + _test_no_pad = True + def __init__(self, fid='6f40', sfid=None, name='EF.MSISDN', desc='MSISDN', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(15, 34), leftpad=True, **kwargs) + self._construct = Struct('alpha_id'/COptional(GsmOrUcs2Adapter(Rpad(Bytes(this._.total_len-14)))), + 'len_of_bcd'/Int8ub, + 'ton_npi'/TonNpi, + 'dialing_nr'/ExtendedBcdAdapter(BcdAdapter(Rpad(Bytes(10)))), + Padding(2, pattern=b'\xff')) - def _decode_record_hex(self, raw_hex_data, **kwargs): - return {'msisdn': dec_msisdn(raw_hex_data)} - - def _encode_record_hex(self, abstract, **kwargs): - msisdn = abstract['msisdn'] - if type(msisdn) == str: - encoded_msisdn = enc_msisdn(msisdn) - else: - encoded_msisdn = enc_msisdn(msisdn[2], msisdn[0], msisdn[1]) - alpha_identifier = (list(self.rec_len)[0] - len(encoded_msisdn) // 2) * "ff" - return alpha_identifier + encoded_msisdn + # Maintain compatibility with deprecated representations + def encode_record_hex(self, abstract_data: dict, record_nr: int, total_len: int = None) -> str: + if 'msisdn' in abstract_data: + msisdn = abstract_data['msisdn'] + if type(msisdn) == str: + npi = 'isdn_e164' + ton = 'network_specific' + dialing_nr = msisdn + len(msisdn) % 2 * "f" + else: + npi = msisdn[0] + ton = msisdn[1] + dialing_nr = msisdn[2] + len(msisdn[2]) % 2 * "f" + abstract_data = {'alpha_id' : "", + 'len_of_bcd' : len(dialing_nr) // 2 + 1, + 'ton_npi' : {'ext' : True, + 'type_of_number' : ton, + 'numbering_plan_id' : npi}, + 'dialing_nr' : dialing_nr} + return super().encode_record_hex(abstract_data, record_nr, total_len) # TS 51.011 Section 10.5.6 class EF_SMSP(LinFixedEF): diff --git a/tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng.ok b/tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng.ok index ed76fd5..395acbf 100644 --- a/tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng.ok +++ b/tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng.ok @@ -125,7 +125,7 @@ =============================== 00 READ RECORD MF/DF.TELECOM/DF.PHONEBOOK/EF.PBR 01 9000 {"raw": "a81ec0034f3a01c1034f3202c3034f5414c5034f0904c6034f5212c9034f2109a90ac4034f1108ca034f500daa14c2034f4a03c7034f4b06c8034f5313cb034f4f16ffffff"} =============================== -00 READ RECORD MF/ADF.USIM/EF.MSISDN 01 9000 {"msisdn": null} +00 READ RECORD MF/ADF.USIM/EF.MSISDN 01 9000 {"alpha_id": null, "len_of_bcd": 255, "ton_npi": {"ext": false, "type_of_number": "unknown", "numbering_plan_id": 7}, "dialing_nr": "19491234567890"} =============================== 00 UPDATE RECORD MF/ADF.USIM/EF.EPSNSC 01 9000 {"eps_nas__security__context": [{"ksi_asme": 7}, {"k_asme": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"}, {"uplink_nas_count": 4294967295}, {"downlink_nas_count": 4294967295}, {"i_dof_nas_algorithms": "00"}]} =============================== @@ -203,7 +203,7 @@ =============================== 00 READ RECORD MF/DF.TELECOM/EF.FDN 01 9000 {"alpha_id": "", "len_of_bcd": 255, "ton_npi": {"ext": true, "type_of_number": "reserved_for_extension", "numbering_plan_id": "reserved_for_extension"}, "dialing_nr": "", "cap_conf_id": 255, "ext2_record_id": 255} =============================== -00 READ RECORD MF/ADF.USIM/EF.MSISDN 01 9000 {"msisdn": null} +00 READ RECORD MF/ADF.USIM/EF.MSISDN 01 9000 {"alpha_id": null, "len_of_bcd": 255, "ton_npi": {"ext": false, "type_of_number": "unknown", "numbering_plan_id": 7}, "dialing_nr": "19491234567890"} =============================== 00 SEARCH RECORD MF/DF.TELECOM/EF.SDN 01 9000 {"cmd": {"file": "currently_selected_ef", "mode": "forward_search", "record_number": 1, "search_string": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"}, "rsp": {"body": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20], "sw": "9000"}} =============================== @@ -357,7 +357,7 @@ =============================== 00 MANAGE CHANNEL 02 9000 {"mode": "open_channel", "created_channel": 2} =============================== -00 READ RECORD MF/ADF.USIM/EF.MSISDN 01 9000 {"msisdn": null} +00 READ RECORD MF/ADF.USIM/EF.MSISDN 01 9000 {"alpha_id": null, "len_of_bcd": 255, "ton_npi": {"ext": false, "type_of_number": "unknown", "numbering_plan_id": 7}, "dialing_nr": "19491234567890"} =============================== 01 READ RECORD MF/ADF.ISIM/EF.IMPU 03 9000 {"impu": null} =============================== -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38117?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I647f5c63f7f87902a86c0c5d8e92fdc7f4350a5a Gerrit-Change-Number: 38117 Gerrit-PatchSet: 12 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

8 months, 3 weeks

1
0
0 0

[L] Change in pysim[master]: filesystem: pass total_len to construct of when encoding file contents

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38195?usp=email ) Change subject: filesystem: pass total_len to construct of when encoding file contents ...................................................................... filesystem: pass total_len to construct of when encoding file contents In our construct models we frequently use a context parameter "total_len", we also pass this parameter to construct when we decode files, but we do not pass it when we generate files. This is a problem, because when total_len is used in the construct model, this parameter must be known also when decoding the file. Let's make sure that the total_len is properly determined and and passed to construct (via pyosmocom). Related: OS#5714 Change-Id: I1b7a51594fbc5d9fe01132c39354a2fa88d53f9b --- M pySim/filesystem.py M pySim/gsm_r.py M pySim/runtime.py M pySim/sysmocom_sja2.py M pySim/ts_31_102.py M pySim/ts_31_102_telecom.py M pySim/ts_51_011.py M tests/pySim-shell_test/file_content/test_record_uicc.ok M tests/unittests/test_files.py 9 files changed, 348 insertions(+), 41 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/filesystem.py b/pySim/filesystem.py index c55bcbe..6e8852a 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -743,7 +743,26 @@ return t.to_dict() return {'raw': raw_bin_data.hex()} - def encode_bin(self, abstract_data: dict) -> bytearray: + def __get_size(self, total_len: Optional[int] = None) -> Optional[int]: + """Get the size (total length) of the file""" + + # Caller has provided the actual total length of the file, this should be the default case + if total_len is not None: + return total_len + + if self.size is None: + return None + + # Alternatively use the recommended size from the specification + if self.size[1] is not None: + return self.size[1] + # In case no recommended size is specified, use the minimum size + if self.size[0] is not None: + return self.size[0] + + return None + + def encode_bin(self, abstract_data: dict, total_len: Optional[int] = None) -> bytearray: """Encode abstract representation into raw (binary) data. A derived class would typically provide an _encode_bin() or _encode_hex() method @@ -752,17 +771,18 @@ Args: abstract_data : dict representing the decoded data + total_len : expected total length of the encoded data (file size) Returns: binary encoded data """ method = getattr(self, '_encode_bin', None) if callable(method): - return method(abstract_data) + return method(abstract_data, total_len = self.__get_size(total_len)) method = getattr(self, '_encode_hex', None) if callable(method): - return h2b(method(abstract_data)) + return h2b(method(abstract_data, total_len = self.__get_size(total_len))) if self._construct: - return build_construct(self._construct, abstract_data) + return build_construct(self._construct, abstract_data, {'total_len' : self.__get_size(total_len)}) if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) @@ -770,7 +790,7 @@ raise NotImplementedError( "%s encoder not yet implemented. Patches welcome." % self) - def encode_hex(self, abstract_data: dict) -> str: + def encode_hex(self, abstract_data: dict, total_len: Optional[int] = None) -> str: """Encode abstract representation into raw (hex string) data. A derived class would typically provide an _encode_bin() or _encode_hex() method @@ -779,18 +799,19 @@ Args: abstract_data : dict representing the decoded data + total_len : expected total length of the encoded data (file size) Returns: hex string encoded data """ method = getattr(self, '_encode_hex', None) if callable(method): - return method(abstract_data) + return method(abstract_data, total_len = self.__get_size(total_len)) method = getattr(self, '_encode_bin', None) if callable(method): - raw_bin_data = method(abstract_data) + raw_bin_data = method(abstract_data, total_len = self.__get_size(total_len)) return b2h(raw_bin_data) if self._construct: - return b2h(build_construct(self._construct, abstract_data)) + return b2h(build_construct(self._construct, abstract_data, {'total_len':self.__get_size(total_len)})) if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) @@ -1030,7 +1051,26 @@ return t.to_dict() return {'raw': raw_hex_data} - def encode_record_hex(self, abstract_data: dict, record_nr: int) -> str: + def __get_rec_len(self, total_len: Optional[int] = None) -> Optional[int]: + """Get the length (total length) of the file record""" + + # Caller has provided the actual total length of the record, this should be the default case + if total_len is not None: + return total_len + + if self.rec_len is None: + return None + + # Alternatively use the recommended length from the specification + if self.rec_len[1] is not None: + return self.rec_len[1] + # In case no recommended length is specified, use the minimum length + if self.rec_len[0] is not None: + return self.rec_len[0] + + return None + + def encode_record_hex(self, abstract_data: dict, record_nr: int, total_len: Optional[int] = None) -> str: """Encode abstract representation into raw (hex string) data. A derived class would typically provide an _encode_record_bin() or _encode_record_hex() @@ -1040,18 +1080,19 @@ Args: abstract_data : dict representing the decoded data record_nr : record number (1 for first record, ...) + total_len : expected total length of the encoded data (record length) Returns: hex string encoded data """ method = getattr(self, '_encode_record_hex', None) if callable(method): - return method(abstract_data, record_nr=record_nr) + return method(abstract_data, record_nr=record_nr, total_len = self.__get_rec_len(total_len)) method = getattr(self, '_encode_record_bin', None) if callable(method): - raw_bin_data = method(abstract_data, record_nr=record_nr) + raw_bin_data = method(abstract_data, record_nr=record_nr, total_len = self.__get_rec_len(total_len)) return b2h(raw_bin_data) if self._construct: - return b2h(build_construct(self._construct, abstract_data)) + return b2h(build_construct(self._construct, abstract_data, {'total_len':self.__get_rec_len(total_len)})) if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) @@ -1059,7 +1100,7 @@ raise NotImplementedError( "%s encoder not yet implemented. Patches welcome." % self) - def encode_record_bin(self, abstract_data: dict, record_nr : int) -> bytearray: + def encode_record_bin(self, abstract_data: dict, record_nr : int, total_len: Optional[int] = None) -> bytearray: """Encode abstract representation into raw (binary) data. A derived class would typically provide an _encode_record_bin() or _encode_record_hex() @@ -1069,17 +1110,18 @@ Args: abstract_data : dict representing the decoded data record_nr : record number (1 for first record, ...) + total_len : expected total length of the encoded data (record length) Returns: binary encoded data """ method = getattr(self, '_encode_record_bin', None) if callable(method): - return method(abstract_data, record_nr=record_nr) + return method(abstract_data, record_nr=record_nr, total_len = self.__get_rec_len(total_len)) method = getattr(self, '_encode_record_hex', None) if callable(method): - return h2b(method(abstract_data, record_nr=record_nr)) + return h2b(method(abstract_data, record_nr=record_nr, total_len = self.__get_rec_len(total_len))) if self._construct: - return build_construct(self._construct, abstract_data) + return build_construct(self._construct, abstract_data, {'total_len':self.__get_rec_len(total_len)}) if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) @@ -1224,7 +1266,20 @@ return t.to_dict() return {'raw': raw_hex_data} - def encode_record_hex(self, abstract_data: dict) -> str: + def __get_rec_len(self, total_len: Optional[int] = None) -> Optional[int]: + """Get the length (total length) of the file record""" + + # Caller has provided the actual total length of the record, this should be the default case + if total_len is not None: + return total_len + + # Alternatively use the record length from the specification + if self.rec_len: + return self.rec_len + + return None + + def encode_record_hex(self, abstract_data: dict, total_len: Optional[int] = None) -> str: """Encode abstract representation into raw (hex string) data. A derived class would typically provide an _encode_record_bin() or _encode_record_hex() @@ -1233,17 +1288,19 @@ Args: abstract_data : dict representing the decoded data + total_len : expected total length of the encoded data (record length) Returns: hex string encoded data """ method = getattr(self, '_encode_record_hex', None) if callable(method): - return method(abstract_data) + return method(abstract_data, total_len = self.__get_rec_len(total_len)) method = getattr(self, '_encode_record_bin', None) if callable(method): - return b2h(method(abstract_data)) + return b2h(method(abstract_data, total_len = self.__get_rec_len(total_len))) if self._construct: - return b2h(filter_dict(build_construct(self._construct, abstract_data))) + return b2h(filter_dict(build_construct(self._construct, abstract_data, + {'total_len':self.__get_rec_len(total_len)}))) if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) @@ -1251,7 +1308,7 @@ raise NotImplementedError( "%s encoder not yet implemented. Patches welcome." % self) - def encode_record_bin(self, abstract_data: dict) -> bytearray: + def encode_record_bin(self, abstract_data: dict, total_len: Optional[int] = None) -> bytearray: """Encode abstract representation into raw (binary) data. A derived class would typically provide an _encode_record_bin() or _encode_record_hex() @@ -1260,17 +1317,19 @@ Args: abstract_data : dict representing the decoded data + total_len : expected total length of the encoded data (record length) Returns: binary encoded data """ method = getattr(self, '_encode_record_bin', None) if callable(method): - return method(abstract_data) + return method(abstract_data, total_len = self.__get_rec_len(total_len)) method = getattr(self, '_encode_record_hex', None) if callable(method): - return h2b(method(abstract_data)) + return h2b(method(abstract_data, total_len = self.__get_rec_len(total_len))) if self._construct: - return filter_dict(build_construct(self._construct, abstract_data)) + return filter_dict(build_construct(self._construct, abstract_data, + {'total_len':self.__get_rec_len(total_len)})) if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) @@ -1283,8 +1342,8 @@ for i in range(0, len(raw_bin_data), self.rec_len)] return [self.decode_record_bin(x) for x in chunks] - def _encode_bin(self, abstract_data) -> bytes: - chunks = [self.encode_record_bin(x) for x in abstract_data] + def _encode_bin(self, abstract_data, **kwargs) -> bytes: + chunks = [self.encode_record_bin(x, total_len = kwargs.get('total_len', None)) for x in abstract_data] # FIXME: pad to file size return b''.join(chunks) diff --git a/pySim/gsm_r.py b/pySim/gsm_r.py index b29fbc4..bc54c72 100644 --- a/pySim/gsm_r.py +++ b/pySim/gsm_r.py @@ -290,7 +290,7 @@ else: return parse_construct(self.construct_others, raw_bin_data) - def _encode_record_bin(self, abstract_data : dict, record_nr : int) -> bytearray: + def _encode_record_bin(self, abstract_data : dict, record_nr : int, **kwargs) -> bytearray: r = None if record_nr == 1: r = self.construct_first.build(abstract_data) diff --git a/pySim/runtime.py b/pySim/runtime.py index 3714832..0ee15d0 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -524,7 +524,7 @@ Args: data : abstract data which is to be encoded and written """ - data_hex = self.selected_file.encode_hex(data) + data_hex = self.selected_file.encode_hex(data, self.selected_file_size()) return self.update_binary(data_hex) def read_record(self, rec_nr: int = 0): @@ -574,7 +574,7 @@ rec_nr : Record number to read data_hex : Abstract data to be written """ - data_hex = self.selected_file.encode_record_hex(data, rec_nr) + data_hex = self.selected_file.encode_record_hex(data, rec_nr, self.selected_file_record_len()) return self.update_record(rec_nr, data_hex) def retrieve_data(self, tag: int = 0): diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index 2c6d66a..bef955a 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -252,7 +252,7 @@ else: return parse_construct(self._construct, raw_bin_data) - def _encode_bin(self, abstract_data: dict) -> bytearray: + def _encode_bin(self, abstract_data: dict, **kwargs) -> bytearray: if abstract_data['cfg']['algorithm'] == 'tuak': return build_construct(self._constr_tuak, abstract_data) else: diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index e27d2db..ab5ee54 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -344,7 +344,7 @@ out.append({k: v}) return out - def _encode_hex(self, in_json): + def _encode_hex(self, in_json, **kwargs): out_bytes = self._encode_prot_scheme_id_list( in_json['prot_scheme_id_list']) d = self._expand_pubkey_list(in_json['hnet_pubkey_list']) @@ -396,8 +396,8 @@ 'hnet_pubkey_list': hnet_pubkey_list } - def _encode_bin(self, in_json): - return h2b(self._encode_hex(in_json)) + def _encode_bin(self, in_json, **kwargs): + return h2b(self._encode_hex(in_json, **kwargs)) class EF_LI(TransRecEF): diff --git a/pySim/ts_31_102_telecom.py b/pySim/ts_31_102_telecom.py index 93154bb..a949070 100644 --- a/pySim/ts_31_102_telecom.py +++ b/pySim/ts_31_102_telecom.py @@ -59,7 +59,7 @@ ret[service_nr]['description'] = self.table[service_nr] return ret - def _encode_bin(self, in_json): + def _encode_bin(self, in_json, **kwargs): # compute the required binary size bin_len = 0 for srv in in_json.keys(): diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 26dce8b..1070b42 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -358,7 +358,7 @@ def _decode_hex(self, raw_hex): return {'imsi': dec_imsi(raw_hex)} - def _encode_hex(self, abstract): + def _encode_hex(self, abstract, **kwargs): return enc_imsi(abstract['imsi']) @with_default_category('File-Specific Commands') @@ -446,7 +446,7 @@ } return ret - def _encode_bin(self, in_json): + def _encode_bin(self, in_json, **kwargs): # compute the required binary size bin_len = 0 for srv in in_json.keys(): @@ -969,7 +969,7 @@ def _decode_hex(self, raw_hex): return {'iccid': dec_iccid(raw_hex)} - def _encode_hex(self, abstract): + def _encode_hex(self, abstract, **kwargs): return enc_iccid(abstract['iccid']) # TS 102 221 Section 13.3 / TS 31.101 Secction 13 / TS 51.011 Section 10.1.2 diff --git a/tests/pySim-shell_test/file_content/test_record_uicc.ok b/tests/pySim-shell_test/file_content/test_record_uicc.ok index 268740e..14183eb 100644 --- a/tests/pySim-shell_test/file_content/test_record_uicc.ok +++ b/tests/pySim-shell_test/file_content/test_record_uicc.ok @@ -12,7 +12,7 @@ 010 0123456789abcdef0123456789abcdef0123456789abcdef0123456789 [ { - "alpha_id": null, + "alpha_id": "", "len_of_bcd": 7, "ton_npi": { "ext": true, @@ -60,7 +60,7 @@ "ext4_record_id": 255 }, { - "alpha_id": null, + "alpha_id": "", "len_of_bcd": 7, "ton_npi": { "ext": true, @@ -120,7 +120,7 @@ "ext4_record_id": 255 }, { - "alpha_id": null, + "alpha_id": "", "len_of_bcd": 7, "ton_npi": { "ext": true, @@ -133,7 +133,7 @@ } ] { - "alpha_id": null, + "alpha_id": "", "len_of_bcd": 7, "ton_npi": { "ext": true, diff --git a/tests/unittests/test_files.py b/tests/unittests/test_files.py index 2bd3aea..a3ccf06 100755 --- a/tests/unittests/test_files.py +++ b/tests/unittests/test_files.py @@ -30,6 +30,9 @@ import pySim.gsm_r import pySim.cdma_ruim +from construct import Int8ub, Struct, Padding, this +from osmocom.tlv import BER_TLV_IE + def get_qualified_name(c): """return the qualified (by module) name of a class.""" return "%s.%s" % (c.__module__, c.__name__) @@ -288,6 +291,251 @@ re_dec = inst.decode_hex(encoded) self.assertEqual(decoded, re_dec) + +class filesystem_enc_dec_test(unittest.TestCase): + """ The following set of tests is to verify the code paths in filesystem.py. There are several methods to encode + or decode a file. Depending on which methods (encode_hex, decode_hex, etc.) or structs (_construct, _tlv) are + define in the related file object, the encoding/decoding will take a different code path. In this test we will + try out all of the different encoding/decoding variants by defining one test file for each variant. Then we will + run an encoding/decoding cycle on each of the test files. + + The test files will also include a padding that is dependent on the total_len keyword argument that is passed + via the construct context or via **kwargs in case the hand written encoding methods (encode_hex, encode_record_hex, + etc.) are used. This will ensure that total_len is passed correctly in all possible variants. + """ + + def test_encode_TransparentEF(self): + + class TransparentEF_construct(TransparentEF): + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', size=(2, 2), + desc='dummy TransparentEF file to test encoding/decoding via _construct'): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) + self._construct = Struct('test'/Int8ub, Padding(this._.total_len-1)) + + class TransparentEF_encode_hex(TransparentEF): + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', size=(2, 2), + desc='dummy TransparentEF file to test manual encoding/decoding via _encode/decode_hex'): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) + def _encode_hex(self, in_json, **kwargs): + return "%02x" % in_json['test'] + "00" * (kwargs.get('total_len') -1) + def _decode_hex(self, raw_hex): + return {'test': int(raw_hex[0:2],16)} + + class TransparentEF_encode_bin(TransparentEF): + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', size=(2, 2), + desc='dummy TransparentEF file to test manual encoding/decoding via _encode/decode_bin'): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) + def _encode_bin(self, in_json, **kwargs): + return h2b("%02x" % in_json['test'] + "00" * (kwargs.get('total_len') -1)) + def _decode_bin(self, raw_bin_data: bytearray): + return {'test': int(b2h(raw_bin_data[0:1]),16)} + + class TransparentEF_tlv(TransparentEF): + class TestTlv(BER_TLV_IE, tag=0x81): + _construct = Int8ub + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', size=(1, 1), + desc='dummy TransparentEF file to test encoding/decoding via _tlv'): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) + self._tlv = TransparentEF_tlv.TestTlv + + class TransparentEF_raw(TransparentEF): + class TestTlv(BER_TLV_IE, tag=0x81): + _construct = Int8ub + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', size=(1, 1), + desc='dummy TransparentEF file to test raw encoding/decoding'): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) + + def do_encdec_test(file): + res = file.encode_hex({'test':0x41}) + self.assertEqual(res,hexstr("4100")) + res = file.encode_bin({'test':0x41}) + self.assertEqual(b2h(res),hexstr("4100")) + res = file.encode_hex({'test':0x41}, total_len=3) + self.assertEqual(res,hexstr("410000")) + res = file.encode_bin({'test':0x41}, total_len=3) + self.assertEqual(b2h(res),hexstr("410000")) + res = file.decode_hex("4100") + self.assertEqual(res,{'test':0x41}) + res = file.decode_bin(b'\x41\x01') + self.assertEqual(res,{'test':0x41}) + + def do_encdec_test_tlv(file): + res = file.encode_hex({'test_tlv':0x41}) + self.assertEqual(res,hexstr("810141")) + res = file.encode_bin({'test_tlv':0x41}) + self.assertEqual(b2h(res),hexstr("810141")) + res = file.decode_hex(hexstr("810141")) + self.assertEqual(res,{'test_tlv':0x41}) + res = file.decode_bin(h2b("810141")) + self.assertEqual(res,{'test_tlv':0x41}) + + def do_encdec_test_raw(file): + res = file.decode_hex("41") + self.assertEqual(res,{'raw':'41'}) + res = file.decode_bin(b'\x41') + self.assertEqual(res,{'raw':'41'}) + + do_encdec_test(TransparentEF_construct()) + do_encdec_test(TransparentEF_encode_hex()) + do_encdec_test(TransparentEF_encode_bin()) + do_encdec_test_tlv(TransparentEF_tlv()) + do_encdec_test_raw(TransparentEF_raw()) + + def test_encode_LinFixedEF(self): + + class LinFixedEF_construct(LinFixedEF): + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', + desc='dummy LinFixedEF file to test encoding/decoding via _construct', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=(2, 2), **kwargs) + self._construct = Struct('test'/Int8ub, Padding(this._.total_len-1)) + + class LinFixedEF_encode_hex(LinFixedEF): + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', + desc='dummy LinFixedEF file to test manual encoding/decoding via _encode/decode_hex', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=(2, 2), **kwargs) + def _encode_record_hex(self, in_json, **kwargs): + return "%02x" % in_json['test'] + "00" * (kwargs.get('total_len') -1) + def _decode_record_hex(self, in_hex, **kwargs): + return {'test': int(in_hex[0:2],16)} + + class LinFixedEF_encode_bin(LinFixedEF): + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', + desc='dummy LinFixedEF file to test manual encoding/decoding via _encode/decode_bin', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=(2, 2), **kwargs) + def _encode_record_bin(self, in_json, **kwargs): + return h2b("%02x" % in_json['test'] + "00" * (kwargs.get('total_len') -1)) + def _decode_record_bin(self, in_bin, **kwargs): + return {'test': int(b2h(in_bin[0:1]),16)} + + class LinFixedEF_tlv(LinFixedEF): + class TestTlv(BER_TLV_IE, tag=0x81): + _construct = Int8ub + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', + desc='dummy LinFixedEF file to test encoding/decoding via _tlv', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=(1, 1), **kwargs) + self._tlv = LinFixedEF_tlv.TestTlv + + class LinFixedEF_raw(LinFixedEF): + class TestTlv(BER_TLV_IE, tag=0x81): + _construct = Int8ub + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', + desc='dummy LinFixedEF file to test raw encoding/decoding', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=(1, 1), **kwargs) + + def do_encdec_test(file): + res = file.encode_record_hex({'test':0x41}, 1) + self.assertEqual(res,hexstr("4100")) + res = file.encode_record_bin({'test':0x41}, 1) + self.assertEqual(b2h(res),hexstr("4100")) + res = file.encode_record_hex({'test':0x41}, 1, total_len=3) + self.assertEqual(res,hexstr("410000")) + res = file.encode_record_bin({'test':0x41}, 1, total_len=3) + self.assertEqual(b2h(res),hexstr("410000")) + res = file.decode_record_hex("4100", 1) + self.assertEqual(res,{'test':0x41}) + res = file.decode_record_bin(b'\x41\x00', 1) + self.assertEqual(res,{'test':0x41}) + + def do_encdec_test_tlv(file): + res = file.encode_record_hex({'test_tlv':0x41}, 1) + self.assertEqual(res,hexstr("810141")) + res = file.encode_record_bin({'test_tlv':0x41}, 1) + self.assertEqual(b2h(res),hexstr("810141")) + res = file.decode_record_hex(hexstr("810141"), 1) + self.assertEqual(res,{'test_tlv':0x41}) + res = file.decode_record_bin(h2b("810141"), 1) + self.assertEqual(res,{'test_tlv':0x41}) + + def do_encdec_test_raw(file): + res = file.decode_record_hex("41", 1) + self.assertEqual(res,{'raw':'41'}) + res = file.decode_record_bin(b'\x41', 1) + self.assertEqual(res,{'raw':'41'}) + + do_encdec_test(LinFixedEF_construct()) + do_encdec_test(LinFixedEF_encode_hex()) + do_encdec_test(LinFixedEF_encode_bin()) + do_encdec_test_tlv(LinFixedEF_tlv()) + do_encdec_test_raw(LinFixedEF_raw()) + + def test_encode_TransRecEF(self): + + class TransRecEF_construct(TransRecEF): + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', size=(2, 2), rec_len=2, + desc='dummy TransRecEF file to test encoding/decoding via _construct', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) + self._construct = Struct('test'/Int8ub, Padding(this._.total_len-1)) + + class TransRecEF_encode_hex(TransRecEF): + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', size=(2, 2), rec_len=2, + desc='dummy TransRecEF file to test manual encoding/decoding via _encode/decode_hex', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) + def _encode_record_hex(self, in_json, **kwargs): + return "%02x" % in_json['test'] + "00" * (kwargs.get('total_len') -1) + def _decode_record_hex(self, in_hex, **kwargs): + return {'test': int(in_hex[0:2],16)} + + class TransRecEF_encode_bin(TransRecEF): + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', size=(2, 2), rec_len=2, + desc='dummy TransRecEF file to test manual encoding/decoding via _encode/decode_bin', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) + def _encode_record_bin(self, in_json, **kwargs): + return h2b("%02x" % in_json['test'] + "00" * (kwargs.get('total_len') -1)) + def _decode_record_bin(self, in_bin, **kwargs): + return {'test': int(b2h(in_bin[0:1]),16)} + + class TransRecEF_tlv(TransRecEF): + class TestTlv(BER_TLV_IE, tag=0x81): + _construct = Int8ub + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', size=(1, 1), rec_len=1, + desc='dummy TransRecEF file to test encoding/decoding via _tlv', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) + self._tlv = TransRecEF_tlv.TestTlv + + class TransRecEF_raw(TransRecEF): + class TestTlv(BER_TLV_IE, tag=0x81): + _construct = Int8ub + def __init__(self, fid='0000', sfid=None, name='EF.DUMMY', size=(1, 1), rec_len=1, + desc='dummy TransRecEF file to test raw encoding/decoding', **kwargs): + super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size=size, rec_len=rec_len, **kwargs) + + def do_encdec_test(file): + res = file.encode_record_hex({'test':0x41}) + self.assertEqual(res,hexstr("4100")) + res = file.encode_record_bin({'test':0x41}) + self.assertEqual(b2h(res),hexstr("4100")) + res = file.encode_record_hex({'test':0x41}, total_len=3) + self.assertEqual(res,hexstr("410000")) + res = file.encode_record_bin({'test':0x41}, total_len=3) + self.assertEqual(b2h(res),hexstr("410000")) + res = file.decode_record_hex("4100") + self.assertEqual(res,{'test':0x41}) + res = file.decode_record_bin(b'\x41\x00') + self.assertEqual(res,{'test':0x41}) + + def do_encdec_test_tlv(file): + res = file.encode_record_hex({'test_tlv':0x41}) + self.assertEqual(res,hexstr("810141")) + res = file.encode_record_bin({'test_tlv':0x41}) + self.assertEqual(b2h(res),hexstr("810141")) + res = file.decode_record_hex(hexstr("810141")) + self.assertEqual(res,{'test_tlv':0x41}) + res = file.decode_record_bin(h2b("810141")) + self.assertEqual(res,{'test_tlv':0x41}) + + def do_encdec_test_raw(file): + res = file.decode_record_hex("41") + self.assertEqual(res,{'raw':'41'}) + res = file.decode_record_bin(b'\x41') + self.assertEqual(res,{'raw':'41'}) + + do_encdec_test(TransRecEF_construct()) + do_encdec_test(TransRecEF_encode_hex()) + do_encdec_test(TransRecEF_encode_bin()) + do_encdec_test_tlv(TransRecEF_tlv()) + do_encdec_test_raw(TransRecEF_raw()) + + if __name__ == '__main__': logger = logging.getLogger() logger.setLevel(logging.DEBUG) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38195?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1b7a51594fbc5d9fe01132c39354a2fa88d53f9b Gerrit-Change-Number: 38195 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

8 months, 3 weeks

1
0
0 0

[XS] Change in pysim[master]: ts_51_011: fix unittest for EF.ADN

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38199?usp=email ) Change subject: ts_51_011: fix unittest for EF.ADN ...................................................................... ts_51_011: fix unittest for EF.ADN The unittest for EF.ADN can run with _test_de_encode. However, the original test vectors seem to be from a card with a slightly larger record size, so they need a bit of re-alignment Related: OS#5714 Change-Id: I241792e66ee6167be6ddc076453344b6307d6265 --- M pySim/ts_51_011.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 1ef6bb6..be8926c 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -131,13 +131,13 @@ # TS 51.011 Section 10.5.1 class EF_ADN(LinFixedEF): - _test_decode = [ - ( '42204841203120536963ffffffff06810628560810ffffffffffffff', + _test_de_encode = [ + ( '42204841203120536963FFFFFFFFFFFF06810628560810FFFFFFFFFFFFFF', { "alpha_id": "B HA 1 Sic", "len_of_bcd": 6, "ton_npi": { "ext": True, "type_of_number": "unknown", "numbering_plan_id": "isdn_e164" }, "dialing_nr": "6082658001", "cap_conf_id": 255, "ext1_record_id": 255 }), - ( '4B756E64656E626574726575756E67FFFFFF0791947112122721ffffffffffff', + ( '4B756E64656E626574726575756E67FF0791947112122721ffffffffffff', {"alpha_id": "Kundenbetreuung", "len_of_bcd": 7, "ton_npi": {"ext": True, "type_of_number": "international", "numbering_plan_id": "isdn_e164"}, -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38199?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I241792e66ee6167be6ddc076453344b6307d6265 Gerrit-Change-Number: 38199 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

8 months, 3 weeks

1
0
0 0

[XS] Change in pysim[master]: ts_51_011: use _test_de_encode instead of _test_decode in EF.CFIS uni...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38200?usp=email ) Change subject: ts_51_011: use _test_de_encode instead of _test_decode in EF.CFIS unittest ...................................................................... ts_51_011: use _test_de_encode instead of _test_decode in EF.CFIS unittest The unittest for EF.CFIS only runs with _test_decode, but it also runs with _test_de_encode without any problems Related: OS#5714 Change-Id: Ib876fd799f871fe64ced2a7b64847ffd09e16ed9 --- M pySim/ts_51_011.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index be8926c..d28e8ee 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -841,7 +841,7 @@ # TS 51.011 Section 10.3.46 class EF_CFIS(LinFixedEF): - _test_decode = [ + _test_de_encode = [ ( '0100ffffffffffffffffffffffffffff', {"msp_number": 1, "cfu_indicator_status": { "voice": False, "fax": False, "data": False, "rfu": 0 }, "len_of_bcd": 255, "ton_npi": {"ext": True, -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38200?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib876fd799f871fe64ced2a7b64847ffd09e16ed9 Gerrit-Change-Number: 38200 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

8 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2024