v3.27.0 review: the outfile import hardening

- The endpoint validates algorithm16 (3des2/aes, case-insensitive) and mode
  (merge/replace or omitted): a misspelled value answers 400 instead of
  silently picking 3DES2 or turning an import into a dry run.  The choices
  come from outfile.ALGORITHM16_CHOICES, derived from the algorithm map, so
  the validation and the parser cannot drift apart.
- A present but unusable PIN/PUK value is reported with its raw text: a value
  that strips to nothing (e.g. 'abcd') used to vanish without a report line,
  contradicting the "nothing is silently dropped" contract.  A column absent
  from a short row stays silent - it is not present.
- The column-line detection drops the arbitrary 8-character column-name cap:
  a candidate header must carry ICCID plus at least one column the import
  consumes (a fixed name or a numbered KIC/KID), so a long unknown column
  name next to a real one parses while 'ICCID <value>' and
  'ICCID CUSTOMER_NAME' config lines are still rejected.  Both real samples
  are unaffected.
- PWA: a chosen default keyset survives an empty or failed preview (it used
  to reset to null, and the import silently fell back to the card's first
  keyset); the select renders the preview's keysets plus a remembered value.
- PWA: the destructive Replace mode asks for confirmation first, matching the
  other store-wiping actions.
- api.md documents both validations.  Tests: the endpoint's 400s and the
  replace import, the raw-value report, the header guards, the keyset
  preservation and the declined confirmation.  906 frontend + 904 Python;
  sw cache simple-v437.
This commit is contained in:
2026-10-14 13:50:30 +03:00
parent 212bfc24ac
commit 21d7f58f61
8 changed files with 163 additions and 23 deletions
+21 -3
View File
@@ -10875,11 +10875,30 @@ class PysimHandler(BaseHTTPRequestHandler):
self._send_json(resp, 400)
self._log_resp(resp)
return
# A misspelled algorithm must not silently pick one: the 16-byte
# key's algorithm nibble decides whether the card accepts the
# packet at all.
algorithm16 = str(body.get('algorithm16') or '3des2').strip().lower()
if algorithm16 not in outfile.ALGORITHM16_CHOICES:
resp = {'error': 'algorithm16 must be one of: %s'
% ', '.join(outfile.ALGORITHM16_CHOICES)}
self._send_json(resp, 400)
self._log_resp(resp)
return
mode = body.get('mode')
if mode in (None, ''):
mode = None
elif mode not in ('merge', 'replace'):
resp = {'error': "mode must be 'merge', 'replace' or omitted "
'(a preview)'}
self._send_json(resp, 400)
self._log_resp(resp)
return
try:
parsed = outfile.parse_outfile(
text,
name=str(body.get('name') or ''),
algorithm16=str(body.get('algorithm16') or '3des2'),
algorithm16=algorithm16,
tars=body.get('tars'),
tar_keyset=tar_keyset)
except ValueError as e:
@@ -10887,8 +10906,7 @@ class PysimHandler(BaseHTTPRequestHandler):
self._send_json(resp, 400)
self._log_resp(resp)
return
mode = body.get('mode')
if mode not in ('merge', 'replace'):
if mode is None:
resp = {'ok': True, 'preview': True,
'presets': parsed['presets'], 'report': parsed['report']}
self._send_json(resp)