catarrh/pysim
1
0
Fork 0
forked from public/pysim
Code Pull Requests Activity

pySim-shell: use verify_adm command for commandline ADM auth

Browse Source 
since the very early days, pySim-shell.py has a commandline option
where the user may supply an ADM pin as commandline parameter.
(-a / --pin-adm and -A --pin-adm-hex) This was introduced to simplify
the usage of pySim-shell.py with shellscripts.

Unfortunately the code that handles those commandline options
duplicates the code of the verify_adm commmand. Fortunately it is
very easy to call pySim-shell commands directly using the CMD2
onecmd_plus_hooks method, so we can just call the verify_adm and
replace the duplicated code with that.

So far we are only able to use ADM1 pins from the commandline, since
we now practically use the verify_adm commnad, we can add another
parameter to allow the verification of ADM as well.

Related: SYS#8239
Change-Id: I7164fad757048774aa7186a84041febde75c351c
This commit is contained in:
Philipp Maier
2026-09-14 12:35:50 +02:00
parent 2761d16582
commit 1e41568c12
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pySim-shell.py
+14 -14
View File
@@ -1129,10 +1129,13 @@ global_group.add_argument("--verbose", help="Enable verbose logging",
action='store_true', default=False) action='store_true', default=False)
adm_group = global_group.add_mutually_exclusive_group() adm_group = global_group.add_mutually_exclusive_group()
adm_group.add_argument('-a', '--pin-adm', metavar='PIN_ADM1', dest='pin_adm', default=None, adm_group.add_argument('-a', '--pin-adm', metavar='PIN_ADM', dest='pin_adm', default=None,
help='ADM PIN used for provisioning (overwrites default)') help='ADM PIN used for provisioning (overwrites default)')
adm_group.add_argument('-A', '--pin-adm-hex', metavar='PIN_ADM1_HEX', dest='pin_adm_hex', default=None, adm_group.add_argument('-A', '--pin-adm-hex', metavar='PIN_ADM_HEX', dest='pin_adm_hex', default=None,
help='ADM PIN used for provisioning, as hex string (16 characters long)') help='ADM PIN used for provisioning, as hex string (16 characters long)')
global_group.add_argument('--pin-adm-type',
choices=[x for x in pin_names.values() if x.startswith('ADM')],
help='Override ADM number. Default is card-model-specific, usually 1')
option_parser.add_argument('-e', '--execute-command', action='append', default=[], option_parser.add_argument('-e', '--execute-command', action='append', default=[],
help='A pySim-shell command that will be executed at startup') help='A pySim-shell command that will be executed at startup')
@@ -1182,18 +1185,15 @@ if __name__ == '__main__':
# If the user supplies an ADM PIN at via commandline args authenticate # If the user supplies an ADM PIN at via commandline args authenticate
# immediately so that the user does not have to use the shell commands # immediately so that the user does not have to use the shell commands
pin_adm = sanitize_pin_adm(opts.pin_adm, opts.pin_adm_hex) pin_adm_type = ""
if pin_adm: if opts.pin_adm_type:
if not card: pin_adm_type = "--adm-type %s" % opts.pin_adm_type
print("Card error, cannot do ADM verification with supplied ADM pin now.") if opts.pin_adm:
try: app.onecmd_plus_hooks("verify_adm %s %s" %
card._scc.verify_chv(card._adm_chv_num, h2b(pin_adm)) (opts.pin_adm, pin_adm_type), add_to_history = False)
except Exception as e: elif opts.pin_adm_hex:
startup_errors = True app.onecmd_plus_hooks("verify_adm %s --pin-is-hex %s" %
print("ADM verification (%s) failed with an exception:" % str(pin_adm)) (opts.pin_adm_hex, pin_adm_type), add_to_history = False)
print("---------------------8<---------------------")
print(e)
print("---------------------8<---------------------")
# Run optional commands # Run optional commands
for c in opts.execute_command: for c in opts.execute_command: