<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/25483">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-shell: move command desc and verify_adm to PySimCommands<br><br>Almost all pySim-shell related commands are agrgated in PySimCommands.<br>There are a feq exceptions, so there are some commands in PysimApp.<br>However, it makes sense to reserve PysimApp exclusively for very basic<br>commands that do not directly relate to card operations. So lets move<br>the command verify_adm and desc to PySimCommands.<br><br>Change-Id: I4a215c8a3907d69f702a70df9b85988be1ce3dbf<br>---<br>M pySim-shell.py<br>1 file changed, 27 insertions(+), 29 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/83/25483/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-shell.py b/pySim-shell.py</span><br><span>index 7977ff5..244ad3c 100755</span><br><span>--- a/pySim-shell.py</span><br><span>+++ b/pySim-shell.py</span><br><span>@@ -114,35 +114,6 @@</span><br><span>            """Display the intro banner"""</span><br><span>                 self.poutput(self.intro)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    @cmd2.with_category(CUSTOM_CATEGORY)</span><br><span style="color: hsl(0, 100%, 40%);">-    def do_verify_adm(self, arg):</span><br><span style="color: hsl(0, 100%, 40%);">-           """VERIFY the ADM1 PIN"""</span><br><span style="color: hsl(0, 100%, 40%);">-         if arg:</span><br><span style="color: hsl(0, 100%, 40%);">-                 # use specified ADM-PIN</span><br><span style="color: hsl(0, 100%, 40%);">-                 pin_adm = sanitize_pin_adm(arg)</span><br><span style="color: hsl(0, 100%, 40%);">-         else:</span><br><span style="color: hsl(0, 100%, 40%);">-                   # try to find an ADM-PIN if none is specified</span><br><span style="color: hsl(0, 100%, 40%);">-                   result = card_key_provider_get_field('ADM1', key='ICCID', value=self.iccid)</span><br><span style="color: hsl(0, 100%, 40%);">-                     pin_adm = sanitize_pin_adm(result)</span><br><span style="color: hsl(0, 100%, 40%);">-                      if pin_adm:</span><br><span style="color: hsl(0, 100%, 40%);">-                             self.poutput("found ADM-PIN '%s' for ICCID '%s'" % (result, self.iccid))</span><br><span style="color: hsl(0, 100%, 40%);">-                      else:</span><br><span style="color: hsl(0, 100%, 40%);">-                           self.poutput("cannot find ADM-PIN for ICCID '%s'" % (self.iccid))</span><br><span style="color: hsl(0, 100%, 40%);">-                             return</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-          if pin_adm:</span><br><span style="color: hsl(0, 100%, 40%);">-                     self.card.verify_adm(h2b(pin_adm))</span><br><span style="color: hsl(0, 100%, 40%);">-              else:</span><br><span style="color: hsl(0, 100%, 40%);">-                   self.poutput("error: cannot authenticate, no adm-pin!")</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       @cmd2.with_category(CUSTOM_CATEGORY)</span><br><span style="color: hsl(0, 100%, 40%);">-    def do_desc(self, opts):</span><br><span style="color: hsl(0, 100%, 40%);">-                """Display human readable file description for the currently selected file"""</span><br><span style="color: hsl(0, 100%, 40%);">-             desc = self.rs.selected_file.desc</span><br><span style="color: hsl(0, 100%, 40%);">-               if desc:</span><br><span style="color: hsl(0, 100%, 40%);">-                        self.poutput(desc)</span><br><span style="color: hsl(0, 100%, 40%);">-              else:</span><br><span style="color: hsl(0, 100%, 40%);">-                   self.poutput("no description available")</span><br><span> </span><br><span> @with_default_category('pySim Commands')</span><br><span> class PySimCommands(CommandSet):</span><br><span>@@ -319,6 +290,33 @@</span><br><span>                self._cmd.poutput('Card ATR: %s' % atr)</span><br><span>              self._cmd.update_prompt()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def do_desc(self, opts):</span><br><span style="color: hsl(120, 100%, 40%);">+              """Display human readable file description for the currently selected file"""</span><br><span style="color: hsl(120, 100%, 40%);">+           desc = self._cmd.rs.selected_file.desc</span><br><span style="color: hsl(120, 100%, 40%);">+                if desc:</span><br><span style="color: hsl(120, 100%, 40%);">+                      self._cmd.poutput(desc)</span><br><span style="color: hsl(120, 100%, 40%);">+               else:</span><br><span style="color: hsl(120, 100%, 40%);">+                 self._cmd.poutput("no description available")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     def do_verify_adm(self, arg):</span><br><span style="color: hsl(120, 100%, 40%);">+         """VERIFY the ADM1 PIN"""</span><br><span style="color: hsl(120, 100%, 40%);">+               if arg:</span><br><span style="color: hsl(120, 100%, 40%);">+                       # use specified ADM-PIN</span><br><span style="color: hsl(120, 100%, 40%);">+                       pin_adm = sanitize_pin_adm(arg)</span><br><span style="color: hsl(120, 100%, 40%);">+               else:</span><br><span style="color: hsl(120, 100%, 40%);">+                 # try to find an ADM-PIN if none is specified</span><br><span style="color: hsl(120, 100%, 40%);">+                 result = card_key_provider_get_field('ADM1', key='ICCID', value=self._cmd.iccid)</span><br><span style="color: hsl(120, 100%, 40%);">+                      pin_adm = sanitize_pin_adm(result)</span><br><span style="color: hsl(120, 100%, 40%);">+                    if pin_adm:</span><br><span style="color: hsl(120, 100%, 40%);">+                           self._cmd.poutput("found ADM-PIN '%s' for ICCID '%s'" % (result, self._cmd.iccid))</span><br><span style="color: hsl(120, 100%, 40%);">+                  else:</span><br><span style="color: hsl(120, 100%, 40%);">+                         self._cmd.poutput("cannot find ADM-PIN for ICCID '%s'" % (self._cmd.iccid))</span><br><span style="color: hsl(120, 100%, 40%);">+                         return</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+              if pin_adm:</span><br><span style="color: hsl(120, 100%, 40%);">+                   self._cmd.card.verify_adm(h2b(pin_adm))</span><br><span style="color: hsl(120, 100%, 40%);">+               else:</span><br><span style="color: hsl(120, 100%, 40%);">+                 self._cmd.poutput("error: cannot authenticate, no adm-pin!")</span><br><span> </span><br><span> @with_default_category('ISO7816 Commands')</span><br><span> class Iso7816Commands(CommandSet):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/25483">change 25483</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/+/25483"/><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: I4a215c8a3907d69f702a70df9b85988be1ce3dbf </div>
<div style="display:none"> Gerrit-Change-Number: 25483 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>