From dffe7af5789d9a59d6e12c43a449eaf2955f8443 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 23 Dec 2023 17:23:52 +0100 Subject: [PATCH] Fix enumeration of GlobbalPlatformISDR during card_init() We used __subclasses__(), but this only returns the immediate subclasses and not all further/nested subclasses. Instead, we must use the pySim.utils.all_subclasses() function to really get all of them. The hack to use the method signature of the constructor to determine if it's an intermediate class didn't work, as even GlobbalPlatformISDR has a optional argument for non-default AIDs. So let's introduce an explicit class attribute for that purpose. Change-Id: I7fb1637f8f7a149b536c4d77dac92736c526aa6c --- pySim/app.py | 7 +++---- pySim/global_platform.py | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pySim/app.py b/pySim/app.py index b0df85f8..43ef06d4 100644 --- a/pySim/app.py +++ b/pySim/app.py @@ -14,7 +14,6 @@ # along with this program. If not, see . -import inspect from typing import Tuple from pySim.transport import LinkBase @@ -26,6 +25,7 @@ from pySim.runtime import RuntimeState from pySim.profile import CardProfile from pySim.cdma_ruim import CardProfileRUIM from pySim.ts_102_221 import CardProfileUICC +from pySim.utils import all_subclasses # we need to import this module so that the SysmocomSJA2 sub-class of # CardModel is created, which will add the ATR-based matching and @@ -87,10 +87,9 @@ def init_card(sl: LinkBase) -> Tuple[RuntimeState, SimCardBase]: # We cannot do it within pySim/profile.py as that would create circular # dependencies between the individual profiles and profile.py. if isinstance(profile, CardProfileUICC): - for app_cls in CardApplication.__subclasses__(): - constr_sig = inspect.signature(app_cls.__init__) + for app_cls in all_subclasses(CardApplication): # skip any intermediary sub-classes such as CardApplicationSD - if len(constr_sig.parameters) != 1: + if hasattr(app_cls, '_' + app_cls.__name__ + '__intermediate'): continue profile.add_application(app_cls()) # We have chosen SimCard() above, but we now know it actually is an UICC diff --git a/pySim/global_platform.py b/pySim/global_platform.py index 2ed6ee40..0ceb8840 100644 --- a/pySim/global_platform.py +++ b/pySim/global_platform.py @@ -267,6 +267,7 @@ class ADF_SD(CardADF): # Card Application of a Security Domain class CardApplicationSD(CardApplication): + __intermediate = True def __init__(self, aid: str, name: str, desc: str): super().__init__(name, adf=ADF_SD(aid, name, desc), sw=sw_table)