dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28161 )
Change subject: pySim-shell: add export option to add CREATE FILE APDUs ......................................................................
pySim-shell: add export option to add CREATE FILE APDUs
Export currently only exports the contents of the files. When running the resulting script it is expected that the files already exist. This is normaly the case. However, when replaying the script on a blank card the files do not exist yet.
The CREATE FILE parameters are created based on the FCP template that the card returns when the file is selected. In some cases the returned FCP template may lacl data that the card needs to create the file properly. This means that the --create parameter must be used with caution and possibly manual re-work of the result is necessary.
Change-Id: If529b86062f7c678c9c75f46ce9ca116cea8b47b --- M pySim-shell.py 1 file changed, 45 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/61/28161/1
diff --git a/pySim-shell.py b/pySim-shell.py index b1503a8..5e379e7 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -521,6 +521,7 @@ context['COUNT'] += 1 df = self._cmd.rs.selected_file as_json = opts['JSON'] + create = opts['CREATE']
# The currently selected file (not the file we are going to export) # must always be an ADF or DF. From this starting point we select @@ -550,7 +551,11 @@
for f in df_path_list: self._cmd.poutput("select " + str(f)) - self._cmd.poutput("select " + self._cmd.rs.selected_file.name) + + if create: + self._cmd.poutput("apdu 00E00000%02x%s" % (int(len(self._cmd.rs.selected_file_fcp_hex)/2), str(self._cmd.rs.selected_file_fcp_hex))) + else: + self._cmd.poutput("select " + self._cmd.rs.selected_file.name)
if structure == 'transparent': if as_json: @@ -615,22 +620,59 @@
self._cmd.poutput("#")
+ def export_df(self, context, opts): + """ Export the currently selected dedicated file (DF or ADF) """ + df = self._cmd.rs.selected_file + + create = opts['CREATE'] + + # For consistency, ensure that at the time we call this function the + # selected file is a dedicated file. + if not isinstance(df, CardDF): + raise RuntimeError( + "currently selected file %s is not an EF" % str(df)) + + # This type of export only makes sense when we intend to add APDUs for + # file creation. In the other case the files are already present on the + # card, only the contents are updated. + if not create: + return; + + df = self._cmd.rs.selected_file + df_path_list = df.fully_qualified_path(True) + df_path_list_fid = df.fully_qualified_path(False) + + file_str = '/'.join(df_path_list) + "/" + self._cmd.poutput(boxed_heading_str(file_str)) + + structure = self._cmd.rs.selected_file_structure() + self._cmd.poutput("# RAW FCP Template: %s" % str(self._cmd.rs.selected_file_fcp_hex)) + self._cmd.poutput("# Decoded FCP Template: %s" % str(self._cmd.rs.selected_file_fcp)) + + for f in df_path_list[:-1]: + self._cmd.poutput("select " + str(f)) + + self._cmd.poutput("apdu 00E00000%02x%s" % (int(len(self._cmd.rs.selected_file_fcp_hex)/2), str(self._cmd.rs.selected_file_fcp_hex))) + self._cmd.poutput("#") + export_parser = argparse.ArgumentParser() export_parser.add_argument( '--filename', type=str, default=None, help='only export specific file') export_parser.add_argument( '--json', action='store_true', help='export as JSON (less reliable)') + export_parser.add_argument( + '--create', action='store_true', help='add APDUs for file creation (less reliable')
@cmd2.with_argparser(export_parser) def do_export(self, opts): """Export files to script that can be imported back later""" context = {'ERR': 0, 'COUNT': 0, 'BAD': [], 'DF_SKIP': 0, 'DF_SKIP_REASON': []} - opts_export = {'JSON': opts.json} + opts_export = {'JSON': opts.json, 'CREATE': opts.create} if opts.filename: self.export_ef(opts.filename, context, opts_export) else: - self.walk(0, self.export_ef, None, context, opts_export) + self.walk(0, self.export_ef, self.export_df, context, opts_export)
self._cmd.poutput(boxed_heading_str("Export summary"))
-
dexter