public/pysim
1
0
Fork 1
mirror of https://gitea.osmocom.org/sim-card/pysim.git synced 2026-03-27 15:58:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source 
Change-Id: I65d2d591c2e5c70cac40467f0648df52360fe5f1
This commit is contained in:
Neels Hofmeyr
2025-11-17 04:25:11 +01:00
parent e59a623201
commit b4b8582c0b
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pySim/esim/saip/personalization.py
View File

@@ -1250,6 +1250,8 @@ class UppAudit(dict):
For der_size=True, also include a {'der_size':12345} entry. For der_size=True, also include a {'der_size':12345} entry.
''' '''
# make an instance of this class
upp_audit = cls() upp_audit = cls()
if der_size: if der_size:
@@ -1257,10 +1259,6 @@ class UppAudit(dict):
pes = ProfileElementSequence.from_der(der) pes = ProfileElementSequence.from_der(der)
for param in params: for param in params:
key = param.get_name()
if key in upp_audit:
raise ValueError(f'UPP audit: there seem to be two conflicting parameters with the name {key!r}: '
+ ', '.join(f"{param.get_name()}={param.__name__}" for param in params))
try: try:
for valdict in param.get_values_from_pes(pes): for valdict in param.get_values_from_pes(pes):
upp_audit.add_values(valdict) upp_audit.add_values(valdict)
@@ -1282,18 +1280,16 @@ class UppAudit(dict):
upp_audit[audit_key] = audit_val upp_audit[audit_key] = audit_val
return upp_audit return upp_audit
def get_single_val(self, param, validate=True, allow_absent=False, absent_val=None): def get_single_val(self, key, validate=True, allow_absent=False, absent_val=None):
""" """
Return the audit's value for the given ConfigurableParameter class. Return the audit's value for the given audit key (like 'IMSI' or 'IMSI-ACC').
Any kind of value may occur multiple times in a profile. When all of these agree to the same unambiguous value, Any kind of value may occur multiple times in a profile. When all of these agree to the same unambiguous value,
return that value. When they do not agree, raise a ValueError. return that value. When they do not agree, raise a ValueError.
""" """
cp = None # key should be a string, but if someone passes a ConfigurableParameter, just use its default name
if ConfigurableParameter.is_super_of(param): if ConfigurableParameter.is_super_of(key):
cp = param key = key.get_name()
key = param.name
else:
key = param
assert isinstance(key, str) assert isinstance(key, str)
v = self.get(key) v = self.get(key)
if v is None and allow_absent: if v is None and allow_absent:
@@ -1303,10 +1299,6 @@ class UppAudit(dict):
if len(v) != 1: if len(v) != 1:
raise ValueError(f'expected a single value for {key}, got {v!r}') raise ValueError(f'expected a single value for {key}, got {v!r}')
v = tuple(v)[0] v = tuple(v)[0]
if validate and cp:
# run value by the ConfigurableParameter's validation.
# (do not use the returned value, because the returned value is encoded for a PES)
cp.validate_val(v)
return v return v
@staticmethod @staticmethod
@@ -1421,14 +1413,19 @@ class BatchAudit(list):
return batch_audit return batch_audit
def to_csv_rows(self, headers=True): def to_csv_rows(self, headers=True, sort_key=None):
'''generator that yields all audits' values as rows, useful feed to a csv.writer.''' '''generator that yields all audits' values as rows, useful feed to a csv.writer.'''
params = tuple(sorted(self.params, key=lambda param: param.get_name())) columns = set()
for audit in self:
columns.update(audit.keys())
columns = tuple(sorted(columns, key=sort_key))
if headers: if headers:
yield (p.get_name() for p in params) yield columns
for audit in self: for audit in self:
yield (audit.get_single_val(p, allow_absent=True, absent_val="") for p in params) yield (audit.get_single_val(col, allow_absent=True, absent_val="") for col in columns)
def bytes_to_hexstr(b:bytes, sep=''): def bytes_to_hexstr(b:bytes, sep=''):
return sep.join(f'{x:02x}' for x in b) return sep.join(f'{x:02x}' for x in b)