From c9c5bd24701b3d880530775ee3a9c6b45ac57a94 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Sat, 1 Mar 2025 21:20:17 +0100 Subject: [PATCH] personalization: indicate default ParamSource per ConfigurableParameter Add default_source class members pointing to ParamSource classes to all ConfigurableParameter subclasses. This is useful to automatically set up a default ParamSource for a given ConfigurableParameter subclass, during user interaction to produce a batch personalization. For example, if the user selects a Pin1 parameter, a calling program can implicitly set this to a RandomDigitSource, which will magically make it work the way that most users need. BTW, default_source and default_value can be combined to configure a matching ParamSource instance: my_source = MyParam.default_source.from_str( MyParam.default_value ) Change-Id: Ie58d13bce3fa1aa2547cf3cee918c2f5b30a8b32 --- pySim/esim/saip/personalization.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py index c2cdc085..246577a2 100644 --- a/pySim/esim/saip/personalization.py +++ b/pySim/esim/saip/personalization.py @@ -24,6 +24,7 @@ from osmocom.tlv import camel_to_snake from osmocom.utils import hexstr from pySim.utils import enc_iccid, dec_iccid, enc_imsi, dec_imsi, h2b, b2h, rpad, sanitize_iccid from pySim.esim.saip import ProfileElement, ProfileElementSequence +from pySim.esim.saip import param_source from pySim.ts_51_011 import EF_SMSP def unrpad(s: hexstr, c='f') -> hexstr: @@ -122,6 +123,7 @@ class ConfigurableParameter(abc.ABC, metaclass=ClassVarMeta): max_len = None allow_len = None # a list of specific lengths example_input = None + default_source = None # a param_source.ParamSource subclass def __init__(self, input_value=None): self.input_value = input_value # the raw input value as given by caller @@ -330,6 +332,7 @@ class BinaryParam(ConfigurableParameter): allow_types = (str, io.BytesIO, bytes, bytearray) allow_chars = '0123456789abcdefABCDEF' strip_chars = ' \t\r\n' + default_source = param_source.RandomHexDigitSource @classmethod def validate_val(cls, val): @@ -356,6 +359,7 @@ class Iccid(DecimalParam): min_len = 18 max_len = 20 example_input = '998877665544332211' + default_source = param_source.IncDigitSource @classmethod def validate_val(cls, val): @@ -388,6 +392,7 @@ class Imsi(DecimalParam): min_len = 6 max_len = 15 example_input = '00101' + ('0' * 10) + default_source = param_source.IncDigitSource @classmethod def apply_val(cls, pes: ProfileElementSequence, val): @@ -423,6 +428,7 @@ class SmspTpScAddr(ConfigurableParameter): max_len = 21 # '+' and 20 digits min_len = 1 example_input = '+49301234567' + default_source = param_source.ConstantSource @classmethod def validate_val(cls, val): @@ -607,6 +613,7 @@ class Puk(DecimalHexParam): rpad = 16 keyReference = None example_input = '0' * allow_len + default_source = param_source.RandomDigitSource @classmethod def apply_val(cls, pes: ProfileElementSequence, val): @@ -642,6 +649,7 @@ class Pin(DecimalHexParam): min_len = 4 max_len = 8 example_input = '0' * max_len + default_source = param_source.RandomDigitSource keyReference = None @staticmethod @@ -754,6 +762,7 @@ class AlgorithmID(DecimalParam, AlgoConfig): algo_config_key = 'algorithmID' allow_len = 1 example_input = 1 # Milenage + default_source = param_source.ConstantSource @classmethod def validate_val(cls, val): @@ -783,6 +792,7 @@ class MilenageRotationConstants(BinaryParam, AlgoConfig): algo_config_key = 'rotationConstants' allow_len = 5 # length in bytes (from BinaryParam) example_input = '40 00 20 40 60' + default_source = param_source.ConstantSource @classmethod def validate_val(cls, val): @@ -813,6 +823,7 @@ class MilenageXoringConstants(BinaryParam, AlgoConfig): ' 00000000000000000000000000000002' ' 00000000000000000000000000000004' ' 00000000000000000000000000000008') + default_source = param_source.ConstantSource class TuakNumberOfKeccak(IntegerParam, AlgoConfig): """Number of iterations of Keccak-f[1600] permutation as recomended by Section 7.2 of 3GPP TS 35.231""" @@ -821,3 +832,4 @@ class TuakNumberOfKeccak(IntegerParam, AlgoConfig): min_val = 1 max_val = 255 example_input = '1' + default_source = param_source.ConstantSource