<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23533">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">filesystem: allow selection of arbitrary files<br><br>Some cards may have additional propritary EF files which pySim-shell<br>does not support. If the user knows the exact FID the file can still be<br>selected and it is possible to read the file type and memory model from<br>the select response. This info can be used to create a new file object<br>at runtime that will work like any other EF/DF.<br><br>Change-Id: Iafff97443130f8bb8c5bc68f51d2fe1d93fff07c<br>Related: OS#4963<br>---<br>M pySim/filesystem.py<br>1 file changed, 51 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/filesystem.py b/pySim/filesystem.py</span><br><span>index cb39b94..9f3b221 100644</span><br><span>--- a/pySim/filesystem.py</span><br><span>+++ b/pySim/filesystem.py</span><br><span>@@ -130,12 +130,19 @@</span><br><span> </span><br><span> class CardDF(CardFile):</span><br><span> """DF (Dedicated File) in the smart card filesystem. Those are basically sub-directories."""</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ @with_default_category('DF/ADF Commands')</span><br><span style="color: hsl(120, 100%, 40%);">+ class ShellCommands(CommandSet):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def __init__(self, **kwargs):</span><br><span> if not isinstance(self, CardADF):</span><br><span> if not 'fid' in kwargs:</span><br><span> raise TypeError('fid is mandatory for all DF')</span><br><span> super().__init__(**kwargs)</span><br><span> self.children = dict()</span><br><span style="color: hsl(120, 100%, 40%);">+ self.shell_commands = [self.ShellCommands()]</span><br><span> </span><br><span> def __str__(self):</span><br><span> return "DF(%s)" % (super().__str__())</span><br><span>@@ -614,17 +621,48 @@</span><br><span> else:</span><br><span> return self.profile.interpret_sw(sw)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def probe_file(self, fid, cmd_app=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ blindly try to select a file and automatically add a matching file</span><br><span style="color: hsl(120, 100%, 40%);">+ object if the file actually exists</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ if not is_hex(fid, 4, 4):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError("Cannot select unknown file by name %s, only hexadecimal 4 digit FID is allowed" % fid)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ (data, sw) = self.card._scc.select_file(fid)</span><br><span style="color: hsl(120, 100%, 40%);">+ except SwMatchError as swm:</span><br><span style="color: hsl(120, 100%, 40%);">+ k = self.interpret_sw(swm.sw_actual)</span><br><span style="color: hsl(120, 100%, 40%);">+ if not k:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise(swm)</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError("%s: %s - %s" % (swm.sw_actual, k[0], k[1]))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ select_resp = self.selected_file.decode_select_response(data)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (select_resp['file_descriptor']['file_type'] == 'df'):</span><br><span style="color: hsl(120, 100%, 40%);">+ f = CardDF(fid=fid, sfid=None, name="DF." + str(fid).upper(), desc="dedicated file, manually added at runtime")</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (select_resp['file_descriptor']['structure'] == 'transparent'):</span><br><span style="color: hsl(120, 100%, 40%);">+ f = TransparentEF(fid=fid, sfid=None, name="EF." + str(fid).upper(), desc="elementry file, manually added at runtime")</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ f = LinFixedEF(fid=fid, sfid=None, name="EF." + str(fid).upper(), desc="elementry file, manually added at runtime")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.selected_file.add_files([f])</span><br><span style="color: hsl(120, 100%, 40%);">+ self.selected_file = f</span><br><span style="color: hsl(120, 100%, 40%);">+ return select_resp</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def select(self, name, cmd_app=None):</span><br><span> """Change current directory"""</span><br><span> sels = self.selected_file.get_selectables()</span><br><span> if is_hex(name):</span><br><span> name = name.lower()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # unregister commands of old file</span><br><span style="color: hsl(120, 100%, 40%);">+ if cmd_app and self.selected_file.shell_commands:</span><br><span style="color: hsl(120, 100%, 40%);">+ for c in self.selected_file.shell_commands:</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd_app.unregister_command_set(c)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if name in sels:</span><br><span> f = sels[name]</span><br><span style="color: hsl(0, 100%, 40%);">- # unregister commands of old file</span><br><span style="color: hsl(0, 100%, 40%);">- if cmd_app and self.selected_file.shell_commands:</span><br><span style="color: hsl(0, 100%, 40%);">- for c in self.selected_file.shell_commands:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd_app.unregister_command_set(c)</span><br><span> try:</span><br><span> if isinstance(f, CardADF):</span><br><span> (data, sw) = self.card._scc.select_adf(f.aid)</span><br><span>@@ -636,14 +674,16 @@</span><br><span> if not k:</span><br><span> raise(swm)</span><br><span> raise RuntimeError("%s: %s - %s" % (swm.sw_actual, k[0], k[1]))</span><br><span style="color: hsl(0, 100%, 40%);">- # register commands of new file</span><br><span style="color: hsl(0, 100%, 40%);">- if cmd_app and self.selected_file.shell_commands:</span><br><span style="color: hsl(0, 100%, 40%);">- for c in self.selected_file.shell_commands:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd_app.register_command_set(c)</span><br><span style="color: hsl(0, 100%, 40%);">- return f.decode_select_response(data)</span><br><span style="color: hsl(0, 100%, 40%);">- #elif looks_like_fid(name):</span><br><span style="color: hsl(120, 100%, 40%);">+ select_resp = f.decode_select_response(data)</span><br><span> else:</span><br><span style="color: hsl(0, 100%, 40%);">- raise ValueError("Cannot select unknown %s" % (name))</span><br><span style="color: hsl(120, 100%, 40%);">+ select_resp = self.probe_file(name, cmd_app)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # register commands of new file</span><br><span style="color: hsl(120, 100%, 40%);">+ if cmd_app and self.selected_file.shell_commands:</span><br><span style="color: hsl(120, 100%, 40%);">+ for c in self.selected_file.shell_commands:</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd_app.register_command_set(c)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return select_resp</span><br><span> </span><br><span> def read_binary(self, length=None, offset=0):</span><br><span> if not isinstance(self.selected_file, TransparentEF):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23533">change 23533</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/23533"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iafff97443130f8bb8c5bc68f51d2fe1d93fff07c </div>
<div style="display:none"> Gerrit-Change-Number: 23533 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>