Allow for unparsed logging

Some unknown cards, which the Relay card may need to deal with, may not
use the APDU format. Trying to parse commands sent to those cards as
though they were in the APDU format is obviously wrong. However, most
cards do support APDU, so default to logging parsed APDUs, still.

virtualsmartcard/src/vpicc/vicc.in

@@ -58,6 +58,7 @@ parser.add_argument("-P", "--port",
 parser.add_argument("-R", "--reversed",
  action="store_true",
  help="use reversed connection mode. vicc will wait for an incoming connection from vpcd. (default: %(default)s)")
+parser.add_argument('--log-unparsed', action="store_true", help="Log unparsed command APDUs, rather than trying to parse them")
 parser.add_argument('--version', action='version', version='%(prog)s @PACKAGE_VERSION@')
 
 relay = parser.add_argument_group('Relaying a local smart card (`--type=relay`)')
@@ -156,7 +157,7 @@ vicc = VirtualICC(args.datasetfile, args.type, hostname, args.port,
  readernum=args.reader, ef_cardaccess=ef_cardaccess_data,
  ef_cardsecurity=ef_cardsecurity_data, ca_key=ca_key_data, cvca=cvca,
  disable_checks=args.disable_ta_checks, esign_ca_cert=esign_ca_cert,
- esign_cert=esign_cert, logginglevel=logginglevel)
+ esign_cert=esign_cert, logginglevel=logginglevel, logunparsed=args.log_unparsed)
 try:
  vicc.run()
 except KeyboardInterrupt:

virtualsmartcard/src/vpicc/virtualsmartcard/VirtualSmartcard.py

@@ -56,6 +56,11 @@ def execute(self, msg):
  """
  return ""
 
+ def logAPDU(self, parsed, unparsed):
+ if(self.logunparsed):
+ logging.info("Unparsed APDU:\n%s", hexdump(unparsed));
+ else:
+ logging.info("Parsed APDU:\n%s", str(parsed))
 
 class Iso7816OS(SmartcardOS):
 
@@ -286,7 +291,7 @@ def notImplemented(*argz, **args):
  return self.formatResult(False, 0, "",
  SW["ERR_INCORRECTPARAMETERS"], False)
 
- logging.info("Parsed APDU:\n%s", str(c))
+ self.logAPDU(parsed=c, unparsed=msg)
 
  # Handle Class Byte
  # {{{
@@ -391,7 +396,7 @@ def __init__(self, datasetfile, card_type, host, port,
  readernum=None, ef_cardsecurity=None, ef_cardaccess=None,
  ca_key=None, cvca=None, disable_checks=False, esign_key=None,
  esign_ca_cert=None, esign_cert=None,
- logginglevel=logging.INFO):
+ logginglevel=logging.INFO, logunparsed=False):
  from os.path import exists
 
  logging.basicConfig(level=logginglevel,
@@ -437,6 +442,7 @@ def __init__(self, datasetfile, card_type, host, port,
  card_type = "iso7816"
  self.os = Iso7816OS(MF, SAM)
  self.type = card_type
+ self.os.logunparsed = logunparsed
 
  # Connect to the VPCD
  self.host = host

virtualsmartcard/src/vpicc/virtualsmartcard/cards/Relay.py

@@ -115,7 +115,7 @@ def reset(self):
  def execute(self, msg):
  try:
  c = C_APDU(msg)
- logging.info("Parsed APDU:\n%s", str(c))
+ self.logAPDU(parsed=c, unparsed=msg)
  except ValueError as e:
  # ignore the parse failure, just don't log the parsed APDU
  logging.warning("Could not parse APDU:%s", str(e))