v3.29.2: the strict row rule for the outfile import

The format is positional: an empty value drops its token, so the parser
now requires every data row to have exactly the header's column count.
That catches an empty value anywhere - including a middle one, which
would otherwise shift the following columns (a missing ADM made the KIC
columns read the KIK values: valid hex, wrong preset) - and a KICn/KIDn
pair declared in the header must carry a usable hex value in every row
(a placeholder fails).

A violation makes the whole file invalid: the report's error names the
line, no presets are returned, and an import (mode) answers 400 - it is
never partially imported.  The PWA disables the Import button while the
report carries an error and guards the call.

Unchanged per-row reports: a non-hex PIN/PUK/ADM/PSK value (dropped, the
card kept), an unsupported key size (that keyset skipped), a card whose
remaining keysets are unusable (skipped).  All three real samples satisfy
the rule exactly (11/11, 18/18, 18/18).

Docs: help EN/RU, api.md, the repo AGENTS.  Tests: the short/long row and
the placeholder-keyset file errors, the valid-file round trip, the
endpoint's refusal (nothing stored), the PWA's disabled button.
926 frontend + 945 Python; sw cache simple-v449.
This commit is contained in:
2026-10-15 00:43:53 +03:00
parent 8a66ea5a0a
commit 94d7cff485
11 changed files with 105 additions and 24 deletions
+14 -6
View File
@@ -208,7 +208,6 @@ def parse_outfile(text, name='', algorithm16='3des2', tars=None, tar_keyset=None
report['keysets'] = ['KIC%d/KID%d' % (n, n) for n in pairs]
tars_base = normalise_tars(tars, tar_keyset)
report['tars'] = len(tars_base)
used_max = max([idx['ICCID']] + [i for pair in pairs.values() for i in pair])
def skip(msg):
if len(report['skipped']) < SKIP_REPORT_MAX:
@@ -224,9 +223,15 @@ def parse_outfile(text, name='', algorithm16='3des2', tars=None, tar_keyset=None
toks = str(line).split()
if not toks:
continue
if len(toks) <= used_max:
skip('line %d: too few columns' % row_no)
continue
# The file is positional: an empty value drops its token, so a row whose
# token count differs from the header's column count carries an empty
# (or extra) value somewhere. The file is invalid then - it is never
# partially imported (v3.29.2).
if len(toks) != len(columns):
report['error'] = ('line %d has %d values, the header declares %d '
'columns - the file is invalid'
% (row_no, len(toks), len(columns)))
return {'presets': [], 'report': report}
report['rows'] += 1
iccid = presets.normalize_iccid(toks[idx['ICCID']]) if idx['ICCID'] >= 0 else ''
if not iccid:
@@ -237,8 +242,11 @@ def parse_outfile(text, name='', algorithm16='3des2', tars=None, tar_keyset=None
kic_key = _hex_value(toks[ki])
kid_key = _hex_value(toks[di])
if not kic_key or not kid_key:
skip('line %d: keyset %d has no KIC/KID' % (row_no, n))
continue
# The header declares this keyset: every row must carry a usable
# value for it (v3.29.2)
report['error'] = ('line %d: keyset %d has no usable KIC/KID '
'value - the file is invalid' % (row_no, n))
return {'presets': [], 'report': report}
if len(kic_key) != len(kid_key):
skip('line %d: keyset %d KIC/KID sizes differ' % (row_no, n))
continue
+8 -1
View File
@@ -37,7 +37,7 @@ from osmocom.tlv import BER_TLV_IE
from osmocom.utils import rpad
VERSION = '3.29.1'
VERSION = '3.29.2'
MAX_ENVELOPE_SEGMENTS = 5 # max SMS segments for outgoing C-APDU in ENVELOPE
@@ -11360,6 +11360,13 @@ class PysimHandler(BaseHTTPRequestHandler):
self._send_json(resp)
self._log_resp(resp)
return
if parsed['report'].get('error'):
# A structurally invalid file (v3.29.2) is never partially
# imported - the preview shows the error, the import refuses.
resp = {'error': parsed['report']['error']}
self._send_json(resp, 400)
self._log_resp(resp)
return
try:
result = store.import_presets(parsed['presets'], mode)
except OSError as e: