February 2022 - gerrit-log - lists.osmocom.org

Change in libosmocore[master]: stats: sanitize tcp stat name identifiers

by pespin

Attention is currently required from: iedemam, neels, fixeria, daniel, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: sanitize tcp stat name identifiers ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Perhaps my comment is misleading. […] Oh then I'd expect osmo_stat_item_group_set_name to already do some sanitizing, maybe that's not correct in current implementation? Did you check osmo_stat_item_group_set_name implementation? I added Daniel as reviewer, he may know better. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 10 Feb 2022 22:15:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in libosmocore[master]: stats: sanitize tcp stat name identifiers

by iedemam

Attention is currently required from: pespin. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: sanitize tcp stat name identifiers ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I'd argue it's not the duty of stats to be "friendly as filenames", but rather something specific to […] Perhaps my comment is misleading. Yes, I'm converting these into file names based on the statsd key name. But what we're using right now in tcp_stats for names are not valid for statsd. They need to be sanitized like the GPRS NS2 names are before being used as statsd key names. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 19:18:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in pysim[master]: utils: Fix missing Optional[] in type annotations

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27142 ) Change subject: utils: Fix missing Optional[] in type annotations ...................................................................... utils: Fix missing Optional[] in type annotations Thanks to Vadim for pointing this out Change-Id: I6e7d3725f28410d66580e88f2271d2b240d1f98e --- M pySim/utils.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/42/27142/1 diff --git a/pySim/utils.py b/pySim/utils.py index 3ce3e58..555aa82 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -1253,7 +1253,7 @@ has the habit of specifying TLV data but with very spcific ordering, or specific choices of tags at specific points in a stream. This class tries to represent this.""" - def __init__(self, name: str, desc: str = None, tag: int = None): + def __init__(self, name: str, desc: Optional[str] = None, tag: Optional[int] = None): """ Args: name: A brief, all-lowercase, underscore separated string identifier @@ -1376,7 +1376,7 @@ A given encoded DO may contain any of them in any order, and may contain multiple instances of each DO.""" - def __init__(self, name: str, desc: str = None, members=None): + def __init__(self, name: str, desc: Optional[str] = None, members=None): self.name = name self.desc = desc self.members = members or [] @@ -1491,7 +1491,7 @@ By wrapping them into this formal DataObjectSequence, we can offer convenience methods for encoding or decoding an entire sequence.""" - def __init__(self, name: str, desc: str = None, sequence=None): + def __init__(self, name: str, desc: Optional[str] = None, sequence=None): self.sequence = sequence or [] self.name = name self.desc = desc -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6e7d3725f28410d66580e88f2271d2b240d1f98e Gerrit-Change-Number: 27142 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in pysim[master]: filesystem.py: Accept both a class or an instance as TLV._tlv member

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27140 ) Change subject: filesystem.py: Accept both a class or an instance as TLV._tlv member ...................................................................... filesystem.py: Accept both a class or an instance as TLV._tlv member As we've seen in recent patches, this has been a source of bugs, so let's be tolerant and deal with both. Change-Id: I0a5ec2a860104ffe4524c647105a42505ac394d6 --- M pySim/filesystem.py 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/27140/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 7100b21..cfca708 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -532,7 +532,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_bin_data.hex()} @@ -559,7 +559,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_bin_data.hex()} @@ -585,7 +585,7 @@ if self._construct: return self._construct.build(abstract_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -612,7 +612,7 @@ if self._construct: return b2h(self._construct.build(abstract_data)) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -771,7 +771,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_bin_data.hex()} @@ -798,7 +798,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_hex_data} @@ -825,7 +825,7 @@ if self._construct: return b2h(self._construct.build(abstract_data)) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -851,7 +851,7 @@ if self._construct: return self._construct.build(abstract_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -909,7 +909,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_hex_data} @@ -936,7 +936,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_hex_data} @@ -962,7 +962,7 @@ if self._construct: return b2h(filter_dict(self._construct.build(abstract_data))) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -988,7 +988,7 @@ if self._construct: return filter_dict(self._construct.build(abstract_data)) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0a5ec2a860104ffe4524c647105a42505ac394d6 Gerrit-Change-Number: 27140 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in pysim[master]: cosmetic: Switch to consistent four-spaces indent; run autopep8

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27141 ) Change subject: cosmetic: Switch to consistent four-spaces indent; run autopep8 ...................................................................... cosmetic: Switch to consistent four-spaces indent; run autopep8 We had a mixture of tab and 4space based indenting, which is a bad idea. 4space is the standard in python, so convert all our code to that. The result unfortuantely still shoed even more inconsistencies, so I've decided to run autopep8 on the entire code base. Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 --- M pySim-prog.py M pySim-read.py M pySim-shell.py M pySim/__init__.py M pySim/ara_m.py M pySim/card_handler.py M pySim/card_key_provider.py M pySim/cards.py M pySim/cat.py M pySim/commands.py M pySim/construct.py M pySim/exceptions.py M pySim/filesystem.py M pySim/gsm_r.py M pySim/iso7816_4.py M pySim/jsonpath.py M pySim/profile.py M pySim/sysmocom_sja2.py M pySim/tlv.py M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py M pySim/ts_102_221.py M pySim/ts_31_102.py M pySim/ts_31_103.py M pySim/ts_51_011.py M pySim/utils.py 29 files changed, 7,420 insertions(+), 6,468 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/27141/1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 Gerrit-Change-Number: 27141 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in pysim[master]: filesystem: Fix TLV decode/encode

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27100 ) Change subject: filesystem: Fix TLV decode/encode ...................................................................... filesystem: Fix TLV decode/encode We cannot call a method of a class without instantiating it Change-Id: I6d7c1bf49a8eaf3d8e50fb12888bf3d5b46b6c55 --- M pySim/filesystem.py 1 file changed, 36 insertions(+), 24 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 3e9d52e..7100b21 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -532,8 +532,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_bin_data.hex()} def decode_hex(self, raw_hex_data:str) -> dict: @@ -558,8 +559,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_bin_data.hex()} def encode_bin(self, abstract_data:dict) -> bytearray: @@ -583,8 +585,9 @@ if self._construct: return self._construct.build(abstract_data) elif self._tlv: - self._tlv.from_dict(abstract_data) - return self._tlv.to_tlv() + t = self._tlv() + t.from_dict(abstract_data) + return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_hex(self, abstract_data:dict) -> str: @@ -609,8 +612,9 @@ if self._construct: return b2h(self._construct.build(abstract_data)) elif self._tlv: - self._tlv.from_dict(abstract_data) - return b2h(self._tlv.to_tlv()) + t = self._tlv() + t.from_dict(abstract_data) + return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -767,8 +771,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_bin_data.hex()} def decode_record_bin(self, raw_bin_data:bytearray) -> dict: @@ -793,8 +798,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_hex_data} def encode_record_hex(self, abstract_data:dict) -> str: @@ -819,8 +825,9 @@ if self._construct: return b2h(self._construct.build(abstract_data)) elif self._tlv: - self._tlv.from_dict(abstract_data) - return b2h(self._tlv.to_tlv()) + t = self._tlv() + t.from_dict(abstract_data) + return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_record_bin(self, abstract_data:dict) -> bytearray: @@ -844,8 +851,9 @@ if self._construct: return self._construct.build(abstract_data) elif self._tlv: - self._tlv.from_dict(abstract_data) - return self._tlv.to_tlv() + t = self._tlv() + t.from_dict(abstract_data) + return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) class CyclicEF(LinFixedEF): @@ -901,8 +909,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_hex_data} def decode_record_bin(self, raw_bin_data:bytearray) -> dict: @@ -927,8 +936,9 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - self._tlv.from_tlv(raw_bin_data) - return self._tlv.to_dict() + t = self._tlv() + t.from_tlv(raw_bin_data) + return t.to_dict() return {'raw': raw_hex_data} def encode_record_hex(self, abstract_data:dict) -> str: @@ -952,8 +962,9 @@ if self._construct: return b2h(filter_dict(self._construct.build(abstract_data))) elif self._tlv: - self._tlv.from_dict(abstract_data) - return b2h(self._tlv.to_tlv()) + t = self._tlv() + t.from_dict(abstract_data) + return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_record_bin(self, abstract_data:dict) -> bytearray: @@ -977,8 +988,9 @@ if self._construct: return filter_dict(self._construct.build(abstract_data)) elif self._tlv: - self._tlv.from_dict(abstract_data) - return self._tlv.to_tlv() + t = self._tlv() + t.from_dict(abstract_data) + return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def _decode_bin(self, raw_bin_data:bytearray): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6d7c1bf49a8eaf3d8e50fb12888bf3d5b46b6c55 Gerrit-Change-Number: 27100 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: ts_31_102: TLV._tlv must point to the class, not an instance

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27135 ) Change subject: ts_31_102: TLV._tlv must point to the class, not an instance ...................................................................... ts_31_102: TLV._tlv must point to the class, not an instance In Change-Id I6d7c1bf49a8eaf3d8e50fb12888bf3d5b46b6c55 we fixed the filesystem code to assume the self._tlv memper is a reference to a class, and not an instance (as this is what the majority of the code did). However, it seems thre wer two instances where we actually had _tlv reference an instance. Change that to class so it's the same all over the code base. Change-Id: Ie4878ad6a92feafe47e375c4f5f3f198921e1e95 --- M pySim/ts_31_102.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index e2ab925..3ae88d3 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -335,7 +335,7 @@ def __init__(self, fid="4f03", sfid=0x03, name='EF.5GS3GPPNSC', rec_len={57, None}, desc='5GS 3GPP Access NAS Security Context'): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len) - self._tlv = EF_5GS3GPPNSC.FiveGSNasSecurityContext() + self._tlv = EF_5GS3GPPNSC.FiveGSNasSecurityContext # 3GPP TS 31.102 Section 4.4.11.6 class EF_5GAUTHKEYS(TransparentEF): @@ -351,7 +351,7 @@ def __init__(self, fid='4f05', sfid=0x05, name='EF.5GAUTHKEYS', size={68, None}, desc='5G authentication keys'): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) - self._tlv = EF_5GAUTHKEYS.FiveGAuthKeys() + self._tlv = EF_5GAUTHKEYS.FiveGAuthKeys # 3GPP TS 31.102 Section 4.4.11.8 class ProtSchemeIdList(BER_TLV_IE, tag=0xa0): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie4878ad6a92feafe47e375c4f5f3f198921e1e95 Gerrit-Change-Number: 27135 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: utils.py: Fix some tuple type annotations

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27133 ) Change subject: utils.py: Fix some tuple type annotations ...................................................................... utils.py: Fix some tuple type annotations Change-Id: I869b0268383f6babd9b51d0ddfce448a1d2dda1e --- M pySim/utils.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 4eb539b..3e79034 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -161,7 +161,7 @@ # length value coding is equal to BER-TLV -def comprehensiontlv_parse_one(binary:bytes) -> (dict, int, bytes, bytes): +def comprehensiontlv_parse_one(binary:bytes) -> Tuple[dict, int, bytes, bytes]: """Parse a single TLV IE at the start of the given binary data. Args: binary : binary input data of BER-TLV length field @@ -311,7 +311,7 @@ else: raise ValueError("Length > 32bits not supported") -def bertlv_parse_one(binary:bytes) -> (dict, int, bytes, bytes): +def bertlv_parse_one(binary:bytes) -> Tuple[dict, int, bytes, bytes]: """Parse a single TLV IE at the start of the given binary data. Args: binary : binary input data of BER-TLV length field -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I869b0268383f6babd9b51d0ddfce448a1d2dda1e Gerrit-Change-Number: 27133 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: utils.py: type annotations for DataObject related methods

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27132 ) Change subject: utils.py: type annotations for DataObject related methods ...................................................................... utils.py: type annotations for DataObject related methods Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 --- M pySim/utils.py 1 file changed, 31 insertions(+), 29 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 0a9be86..4eb539b 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -1170,7 +1170,7 @@ simply has any number of different TLVs that may occur in any order at any point, ISO 7816 has the habit of specifying TLV data but with very spcific ordering, or specific choices of tags at specific points in a stream. This class tries to represent this.""" - def __init__(self, name, desc = None, tag = None): + def __init__(self, name:str, desc:str = None, tag:int = None): """ Args: name: A brief, all-lowercase, underscore separated string identifier @@ -1186,10 +1186,10 @@ def __str__(self): return self.name - def __repr__(self): + def __repr__(self) -> str: return '%s(%s)' % (self.__class__, self.name) - def __or__(self, other): + def __or__(self, other) -> 'DataObjectChoice': """OR-ing DataObjects together renders a DataObjectChoice.""" if isinstance(other, DataObject): # DataObject | DataObject = DataObjectChoice @@ -1197,17 +1197,19 @@ else: raise TypeError - def __add__(self, other): + def __add__(self, other) -> 'DataObjectCollection': """ADD-ing DataObjects together renders a DataObjectCollection.""" if isinstance(other, DataObject): # DataObject + DataObject = DataObjectCollectin return DataObjectCollection(None, members=[self, other]) + else: + raise TypeError - def _compute_tag(self): + def _compute_tag(self) -> int: """Compute the tag (sometimes the tag encodes part of the value).""" return self.tag - def to_dict(self): + def to_dict(self) -> dict: """Return a dict in form "name: decoded_value" """ return {self.name: self.decoded} @@ -1219,13 +1221,13 @@ """ @abc.abstractmethod - def to_bytes(self): + def to_bytes(self) -> bytes: """Encode the internal state of this instance into the TLV value part. Returns: binary bytes encoding the internal state """ - def from_tlv(self, do:bytes): + def from_tlv(self, do:bytes) -> bytes: """Parse binary TLV representation into internal state. The resulting decoded representation is _not_ returned, but just internalized in the object instance! Args: @@ -1241,7 +1243,7 @@ # return remaining bytes return do[2+length:] - def to_tlv(self): + def to_tlv(self) -> bytes: """Encode internal representation to binary TLV. Returns: bytes encoded in TLV format. @@ -1250,7 +1252,7 @@ return bytes(self._compute_tag()) + bytes(len(val)) + val # 'codec' interface - def decode(self, binary:bytes): + def decode(self, binary:bytes) -> Tuple[dict, bytes]: """Decode a single DOs from the input data. Args: binary : binary bytes of encoded data @@ -1265,12 +1267,12 @@ return (self.to_dict(), remainder) # 'codec' interface - def encode(self): + def encode(self) -> bytes: return self.to_tlv() class TL0_DataObject(DataObject): """Data Object that has Tag, Len=0 and no Value part.""" - def __init__(self, name, desc, tag, val=None): + def __init__(self, name:str, desc:str, tag:int, val=None): super().__init__(name, desc, tag) self.val = val @@ -1279,7 +1281,7 @@ raise ValueError self.decoded = self.val - def to_bytes(self): + def to_bytes(self) -> bytes: return b'' @@ -1287,7 +1289,7 @@ """A DataObjectCollection consits of multiple Data Objects identified by their tags. A given encoded DO may contain any of them in any order, and may contain multiple instances of each DO.""" - def __init__(self, name, desc = None, members=None): + def __init__(self, name:str, desc:str = None, members=None): self.name = name self.desc = desc self.members = members or [] @@ -1296,15 +1298,15 @@ self.members_by_tag = { m.tag:m for m in members } self.members_by_name = { m.name:m for m in members } - def __str__(self): + def __str__(self) -> str: member_strs = [str(x) for x in self.members] return '%s(%s)' % (self.name, ','.join(member_strs)) - def __repr__(self): + def __repr__(self) -> str: member_strs = [repr(x) for x in self.members] return '%s(%s)' % (self.__class__, ','.join(member_strs)) - def __add__(self, other): + def __add__(self, other) -> 'DataObjectCollection': """Extending DataCollections with other DataCollections or DataObjects.""" if isinstance(other, DataObjectCollection): # adding one collection to another @@ -1317,7 +1319,7 @@ raise TypeError # 'codec' interface - def decode(self, binary:bytes): + def decode(self, binary:bytes) -> Tuple[List, bytes]: """Decode any number of DOs from the collection until the end of the input data, or uninitialized memory (0xFF) is found. Args: @@ -1343,7 +1345,7 @@ return (res, remainder) # 'codec' interface - def encode(self, decoded): + def encode(self, decoded) -> bytes: res = bytearray() for i in decoded: obj = self.members_by_name(i[0]) @@ -1358,7 +1360,7 @@ """We overload the add operator here to avoid inheriting it from DataObjecCollection.""" raise TypeError - def __or__(self, other): + def __or__(self, other) -> 'DataObjectChoice': """OR-ing a Choice to another choice extends the choice, as does OR-ing a DataObject.""" if isinstance(other, DataObjectChoice): # adding one collection to another @@ -1371,7 +1373,7 @@ raise TypeError # 'codec' interface - def decode(self, binary:bytes): + def decode(self, binary:bytes) -> Tuple[dict, bytes]: """Decode a single DOs from the choice based on the tag. Args: binary : binary bytes of encoded data @@ -1389,7 +1391,7 @@ return (obj.to_dict(), remainder) # 'codec' interface - def encode(self, decoded): + def encode(self, decoded) -> bytes: obj = self.members_by_name(decoded[0]) return obj.to_tlv() @@ -1398,20 +1400,20 @@ ordered sequence of DOs or choices of DOs that have to appear as per the specification. By wrapping them into this formal DataObjectSequence, we can offer convenience methods for encoding or decoding an entire sequence.""" - def __init__(self, name, desc=None, sequence=None): + def __init__(self, name:str, desc:str=None, sequence=None): self.sequence = sequence or [] self.name = name self.desc = desc - def __str__(self): + def __str__(self) -> str: member_strs = [str(x) for x in self.sequence] return '%s(%s)' % (self.name, ','.join(member_strs)) - def __repr__(self): + def __repr__(self) -> str: member_strs = [repr(x) for x in self.sequence] return '%s(%s)' % (self.__class__, ','.join(member_strs)) - def __add__(self, other): + def __add__(self, other) -> 'DataObjectSequence': """Add (append) a DataObject or DataObjectChoice to the sequence.""" if isinstance(other, 'DataObject'): return DataObjectSequence(self.name, self.desc, self.sequence + [other]) @@ -1421,7 +1423,7 @@ return DataObjectSequence(self.name, self.desc, self.sequence + other.sequence) # 'codec' interface - def decode(self, binary:bytes): + def decode(self, binary:bytes) -> Tuple[list, bytes]: """Decode a sequence by calling the decoder of each element in the sequence. Args: binary : binary bytes of encoded data @@ -1437,7 +1439,7 @@ return (res, remainder) # 'codec' interface - def decode_multi(self, do:bytes): + def decode_multi(self, do:bytes) -> Tuple[list, bytes]: """Decode multiple occurrences of the sequence from the binary input data. Args: do : binary input data to be decoded @@ -1458,7 +1460,7 @@ return (res, remainder) # 'codec' interface - def encode(self, decoded): + def encode(self, decoded) -> bytes: """Encode a sequence by calling the encoder of each element in the sequence.""" encoded = bytearray() i = 0 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 Gerrit-Change-Number: 27132 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: Better decode of EF.UST, EF.EST and EF.IST

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27127 ) Change subject: Better decode of EF.UST, EF.EST and EF.IST ...................................................................... Better decode of EF.UST, EF.EST and EF.IST So far, we only returned an array of service numbers like [ 2, 4, 5, 9 ] which is not very friendly to the human reader. In EF.SST we already had more verbose decoding including a description of each service. Let's add the same principle to EF.UST, EST and IST The same output above now looks like this: { "1": { "description": "Local Phone Book", "activated": false }, "2": { "description": "Fixed Dialling Numbers (FDN)", "activated": true }, "3": { "description": "Extension 2", "activated": false }, "4": { "description": "Service Dialling Numbers (SDN)", "activated": true }, "5": { "description": "Extension3", "activated": true }, "6": { "description": "Barred Dialling Numbers (BDN)", "activated": false }, "7": { "description": "Extension4", "activated": false }, "9": { "description": "Incoming Call Information (ICI and ICT)", "activated": true } } Change-Id: I34f64d1043698dc385619b2fdda23cb541675f76 --- M pySim/ts_31_102.py M pySim/ts_31_103.py 2 files changed, 46 insertions(+), 39 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index f6f6c00..e2ab925 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -165,6 +165,13 @@ 135: 'Support for Trusted non-3GPP access networks by USIM' } +# Mapping between USIM Enbled Service Number and its description +EF_EST_map = { + 1: 'Fixed Dialling Numbers (FDN)', + 2: 'Barred Dialling Numbers (BDN)', + 3: 'APN Control List (ACL)' +} + LOCI_STATUS_map = { 0: 'updated', 1: 'not updated', @@ -282,6 +289,7 @@ import enum from struct import unpack, pack +from typing import Tuple from construct import * from construct import Optional as COptional from pySim.construct import * @@ -519,30 +527,49 @@ self._construct = Int8ub # TS 31.102 Section 4.2.8 -class EF_UST(TransparentEF): - def __init__(self, fid='6f38', sfid=0x04, name='EF.UST', desc='USIM Service Table', size={1,17}): +class EF_UServiceTable(TransparentEF): + def __init__(self, fid, sfid, name, desc, size, table): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size=size) + self.table = table # add those commands to the general commands of a TransparentEF self.shell_commands += [self.AddlShellCommands()] + @staticmethod + def _bit_byte_offset_for_service(service:int) -> Tuple[int, int]: + i = service - 1 + byte_offset = i//8 + bit_offset = (i % 8) + return (byte_offset, bit_offset) def _decode_bin(self, in_bin): - ret = [] + ret = {} for i in range (0, len(in_bin)): byte = in_bin[i] for bitno in range(0,7): - if byte & (1 << bitno): - ret.append(i * 8 + bitno + 1) + service_nr = i * 8 + bitno + 1 + ret[service_nr] = { + 'activated': True if byte & (1 << bitno) else False + } + if service_nr in self.table: + ret[service_nr]['description'] = self.table[service_nr] return ret def _encode_bin(self, in_json): - # FIXME: size this to length of file - ret = bytearray(20) - for srv in in_json: - print("srv=%d"%srv) - srv = srv-1 - byte_nr = srv // 8 - # FIXME: detect if service out of range was selected - bit_nr = srv % 8 - ret[byte_nr] |= (1 << bit_nr) - return ret + # compute the required binary size + bin_len = 0 + for srv in in_json.keys(): + service_nr = int(srv) + (byte_offset, bit_offset) = EF_UServiceTable._bit_byte_offset_for_service(service_nr) + if byte_offset >= bin_len: + bin_len = byte_offset+1 + # encode the actual data + out = bytearray(b'\x00' * bin_len) + for srv in in_json.keys(): + service_nr = int(srv) + (byte_offset, bit_offset) = EF_UServiceTable._bit_byte_offset_for_service(service_nr) + if in_json[srv]['activated'] == True: + bit = 1 + else: + bit = 0 + out[byte_offset] |= (bit) << bit_offset + return out @with_default_category('File-Specific Commands') class AddlShellCommands(CommandSet): def __init__(self): @@ -991,7 +1018,7 @@ 'User controlled PLMN Selector with Access Technology'), EF_HPPLMN(), EF_ACMmax(), - EF_UST(), + EF_UServiceTable('6f38', 0x04, 'EF.UST', 'USIM Service Table', size={1,17}, table=EF_UST_map), CyclicEF('6f39', None, 'EF.ACM', 'Accumulated call meter', rec_len={3,3}), TransparentEF('6f3e', None, 'EF.GID1', 'Group Identifier Level 1'), TransparentEF('6f3f', None, 'EF.GID2', 'Group Identifier Level 2'), @@ -1027,7 +1054,7 @@ EF_ADN('6f4d', None, 'EF.BDN', 'Barred Dialling Numbers'), EF_EXT('6f55', None, 'EF.EXT4', 'Extension4 (BDN/SSC)'), EF_CMI(), - EF_UST('6f56', 0x05, 'EF.EST', 'Enabled Services Table', size={1,None}), + EF_UServiceTable('6f56', 0x05, 'EF.EST', 'Enabled Services Table', size={1,None}, table=EF_EST_map), EF_ACL(), EF_DCK(), EF_CNL(), diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index 9c7843f..6b69990 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -26,7 +26,7 @@ from pySim.utils import * from pySim.tlv import * from pySim.ts_51_011 import EF_AD, EF_SMS, EF_SMSS, EF_SMSR, EF_SMSP -from pySim.ts_31_102 import ADF_USIM, EF_FromPreferred +from pySim.ts_31_102 import ADF_USIM, EF_FromPreferred, EF_UServiceTable import pySim.ts_102_221 from pySim.ts_102_221 import EF_ARR @@ -101,26 +101,6 @@ super().__init__(fid=fid, sfid=sfid, name=name, desc=desc) self._tlv = EF_IMPU.impu -# TS 31.103 Section 4.2.7 -class EF_IST(TransparentEF): - def __init__(self, fid='6f07', sfid=0x07, name='EF.IST', desc='ISIM Service Table'): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size={1,4}) - # add those commands to the general commands of a TransparentEF - self.shell_commands += [self.AddlShellCommands()] - - @with_default_category('File-Specific Commands') - class AddlShellCommands(CommandSet): - def __init__(self): - super().__init__() - - def do_ist_service_activate(self, arg): - """Activate a service within EF.IST""" - self._cmd.card.update_ist(int(arg), 1) - - def do_ist_service_deactivate(self, arg): - """Deactivate a service within EF.IST""" - self._cmd.card.update_ist(int(arg), 0) - # TS 31.103 Section 4.2.8 class EF_PCSCF(LinFixedEF): def __init__(self, fid='6f09', sfid=None, name='EF.P-CSCF', desc='P-CSCF Address'): @@ -192,7 +172,7 @@ EF_IMPU(), EF_AD(), EF_ARR('6f06', 0x06), - EF_IST(), + EF_UServiceTable('6f07', 0x07, 'EF.IST', 'ISIM Service Table', {1,None}, EF_IST_map), EF_PCSCF(), EF_GBABP(), EF_GBANL(), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I34f64d1043698dc385619b2fdda23cb541675f76 Gerrit-Change-Number: 27127 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022