fix: send the STK install parameters as entered (v3.6.9)
The RAM install form sent the `STK parameters (hex)` field, which was only regenerated when the toolkit checkbox or the mode select changed - editing the TAR (or any other toolkit field) afterwards was silently dropped. The live install therefore carried the form defaults (TAR B00001, textLen 0, menus 0, MSL 16, channels 0) instead of the entered AF4D01 / MSL 12 / channels 1, and the card rejected the install parameters with 6A80 (TS 102 226 8.2.1.3.2.7: a TAR already assigned on the card). - every `rc-tk-*` field regenerates the hex on input/change; the install recomputes it at send time unless the user hand-edited the hex (`dataset.manual`), so the edit order can no longer drop values; - one pure `stkParamsBuild` serves the RAM form (`buildRcToolkitParams`) and the RAM/GP chain rows (`buildTkParams`) - no drift between them (the chain row also gains the menu-ID <= 7F check); - applet TAR field: empty by default, no placeholder - B0 00 01 is the allocated ADF RFM TAR (TS 101 220 Annex D), not an applet TAR; an empty field is coded as TAR length 00 (the card may take a TAR from the AID only when the AID carries one, PIX hex digits 15-20); - the chain builder's INSTALL/LOAD rows drop the trailing Le (the v3.6.8 server form; a trailing Le made the card execute a phantom command); - tests: stk_params.test.js (the decrypted live parameters, empty-TAR coding, CA wrapper, long-form lengths, rejection cases, form wiring, and the form -> hex path with the real builders) and ram_counter_flow.test.js (the Explore delete persists the consumed counter through the real ramSaveCntr); STK fixtures no longer use B00001. 631 frontend / 496 Python green; version 3.6.9; sw simple-v282.
This commit is contained in:
@@ -0,0 +1,158 @@
|
||||
const { test } = require('node:test');
|
||||
const assert = require('node:assert');
|
||||
const fs = require('node:fs');
|
||||
const path = require('node:path');
|
||||
|
||||
const html = fs.readFileSync(path.join(__dirname, '..', 'index.html'), 'utf8');
|
||||
|
||||
function extractFunc(src, name) {
|
||||
const re = new RegExp('(?:async\\s+)?function\\s+' + name + '\\s*\\([^)]*\\)\\s*\\{');
|
||||
const m = re.exec(src);
|
||||
if (!m) throw new Error('function ' + name + ' not found');
|
||||
let i = m.index + m[0].length - 1;
|
||||
let depth = 0;
|
||||
for (; i < src.length; i++) {
|
||||
if (src[i] === '{') depth++;
|
||||
else if (src[i] === '}') {
|
||||
depth--;
|
||||
if (depth === 0) break;
|
||||
}
|
||||
}
|
||||
return src.slice(m.index, i + 1);
|
||||
}
|
||||
|
||||
let code = '';
|
||||
for (const fn of ['berLenStr', 'stkParamsBuild', 'buildRcToolkitParams',
|
||||
'updateStkParamsHex']) code += extractFunc(html, fn) + '\n';
|
||||
eval(code);
|
||||
|
||||
const base = { mode: 'ea', priority: '0', timers: '0', textLen: '0', menus: '0',
|
||||
firstPos: '0', firstId: '00', lastPos: '0', lastId: '00',
|
||||
channels: '0', msl: '00', tar: '', ad: '', services: '0' };
|
||||
function vals(over) { return Object.assign({}, base, over); }
|
||||
|
||||
// ===== install-parameter coding (TS 102 226 8.2.1.3.2.2.1) =====
|
||||
|
||||
test('UICC (EA) parameters match the decrypted live packet', () => {
|
||||
// The install parameters of the live CAP install (decrypted):
|
||||
// EA 0F | 80 0D <prio 0 timers 0 textLen 0 menus 0> <channels 1>
|
||||
// <MSL len 2 / 01 12> <TAR len 3 / AF 4D 01> <services 0>
|
||||
assert.strictEqual(
|
||||
stkParamsBuild(vals({ channels: '1', msl: '12', tar: 'AF4D01' })),
|
||||
'EA0F800D000000000102011203AF4D0100');
|
||||
});
|
||||
|
||||
test('empty TAR emits a zero-length TAR field, never a B00001 default', () => {
|
||||
// B0 00 01 is the allocated ADF RFM TAR (TS 101 220 Annex D), not an
|
||||
// applet TAR: the field stays empty and the TAR Value(s) length is 00
|
||||
// (TS 102 226 8.2.1.3.2.7 - the card may then use a TAR from the AID,
|
||||
// but only when the AID carries one).
|
||||
const out = stkParamsBuild(vals({}));
|
||||
assert.strictEqual(out, 'EA0A80080000000000000000');
|
||||
assert.ok(!out.includes('B00001'), out);
|
||||
});
|
||||
|
||||
test('SIM (CA) parameters carry the access domain first and no services byte', () => {
|
||||
assert.strictEqual(stkParamsBuild(vals({ mode: 'ca' })),
|
||||
'EF0ACA080000000000000000');
|
||||
assert.strictEqual(stkParamsBuild(vals({ mode: 'ca', ad: '00' })),
|
||||
'EF0BCA09010000000000000000');
|
||||
});
|
||||
|
||||
test('menu item pairs run first .. last with 0000 fillers between', () => {
|
||||
assert.strictEqual(stkParamsBuild(vals({ menus: '1', firstId: '7F' })),
|
||||
'EA0C800A00000001007F00000000');
|
||||
const out = stkParamsBuild(vals({ menus: '3', firstPos: '1', firstId: '01',
|
||||
lastPos: '3', lastId: '03' }));
|
||||
assert.ok(out.includes('010100000303'), out);
|
||||
});
|
||||
|
||||
test('long menu lists use BER long-form lengths', () => {
|
||||
const out = stkParamsBuild(vals({ menus: '60', firstPos: '1', firstId: '01',
|
||||
lastPos: '60', lastId: '3C', msl: '16', tar: 'AF4D01' }));
|
||||
assert.ok(out.startsWith('EA8188808185'), out);
|
||||
});
|
||||
|
||||
test('rejects a TAR that is not a whole number of 3-byte values', () => {
|
||||
assert.strictEqual(stkParamsBuild(vals({ tar: 'AF4D' })), null);
|
||||
assert.strictEqual(stkParamsBuild(vals({ tar: 'AF4D0' })), null);
|
||||
assert.strictEqual(stkParamsBuild(vals({ tar: 'AF4D0102' })), null);
|
||||
// several TAR values are allowed (3 bytes each)
|
||||
assert.ok(stkParamsBuild(vals({ tar: 'AF4D01AFFA01' })).includes('06AF4D01AFFA01'));
|
||||
});
|
||||
|
||||
test('rejects menu item identifiers above 7F (reserved for the toolkit framework)', () => {
|
||||
assert.strictEqual(stkParamsBuild(vals({ menus: '1', firstId: '80' })), null);
|
||||
assert.strictEqual(stkParamsBuild(vals({ menus: '1', lastId: 'FF' })), null);
|
||||
});
|
||||
|
||||
// ===== form wiring: the STK settings must reach the sent hex =====
|
||||
|
||||
test('every toolkit field regenerates the STK parameters hex on edit', () => {
|
||||
// v3.6.9: the install used to send the hex computed once when the
|
||||
// checkbox was ticked - edits to the fields afterwards were dropped
|
||||
// (the live install carried the defaults, not the entered TAR).
|
||||
const block = html.slice(html.indexOf('id="rc-toolkit-body"'),
|
||||
html.indexOf('id="ram-install-params-hex"'));
|
||||
const re = /<(?:input|select)\b[^>]*id="(rc-tk-[^"]+)"[^>]*>/g;
|
||||
const seen = [];
|
||||
let m;
|
||||
while ((m = re.exec(block))) {
|
||||
seen.push(m[1]);
|
||||
assert.ok(/on(?:input|change)="[^"]*updateStkParamsHex/.test(m[0]),
|
||||
m[1] + ' does not refresh the hex: ' + m[0]);
|
||||
}
|
||||
assert.strictEqual(seen.length, 14, 'expected 14 toolkit fields, got ' + seen.join(', '));
|
||||
});
|
||||
|
||||
test('the applet TAR field has no B00001 default or placeholder', () => {
|
||||
const m = /<input id="rc-tk-tar"[^>]*>/.exec(html);
|
||||
assert.ok(m, 'rc-tk-tar not found');
|
||||
assert.ok(!/value="B00001"/.test(m[0]), m[0]);
|
||||
assert.ok(!/placeholder="B00001"/.test(m[0]), m[0]);
|
||||
assert.ok(/oninput="updateStkParamsHex\(\)"/.test(m[0]), m[0]);
|
||||
assert.ok(!html.includes("f.tkTar || 'B00001'"), 'the chain toolkit default must stay empty');
|
||||
});
|
||||
|
||||
test('the RAM install recomputes the STK hex at send time unless hand-edited', () => {
|
||||
assert.ok(/oninput="this\.dataset\.manual='1'"/.test(html),
|
||||
'the hex field must flag manual edits');
|
||||
assert.ok(/rc-toolkit-enable'\)\.checked && !\(stkEl\.dataset && stkEl\.dataset\.manual\)/.test(html),
|
||||
'the send-time recompute guard is missing');
|
||||
});
|
||||
|
||||
// ===== form -> hex (the live regression) =====
|
||||
|
||||
function fakeForm(values) {
|
||||
const ids = ['rc-toolkit-enable', 'rc-tk-mode', 'rc-tk-priority', 'rc-tk-timers',
|
||||
'rc-tk-textlen', 'rc-tk-menus', 'rc-tk-firstpos', 'rc-tk-firstid',
|
||||
'rc-tk-lastpos', 'rc-tk-lastid', 'rc-tk-channels', 'rc-tk-msl',
|
||||
'rc-tk-tar', 'rc-tk-ad', 'rc-tk-services', 'ram-stk-params'];
|
||||
const els = {};
|
||||
for (const id of ids) els[id] = { value: '', checked: false, dataset: {} };
|
||||
for (const [id, v] of Object.entries(values || {})) {
|
||||
if (id === 'rc-toolkit-enable') els[id].checked = v;
|
||||
else els[id].value = v;
|
||||
}
|
||||
globalThis.document = { getElementById: id => els[id] || null };
|
||||
return els;
|
||||
}
|
||||
|
||||
test('the RAM form fields build the live install parameters end to end', () => {
|
||||
// The reported regression: the values were entered after the toolkit
|
||||
// checkbox was ticked and never reached the sent hex - the install
|
||||
// carried TAR B00001 / MSL 16 / channels 0 and the card answered 6A80.
|
||||
fakeForm({ 'rc-toolkit-enable': true, 'rc-tk-mode': 'ea', 'rc-tk-msl': '12',
|
||||
'rc-tk-tar': 'AF4D01', 'rc-tk-channels': '1' });
|
||||
assert.strictEqual(buildRcToolkitParams(), 'EA0F800D000000000102011203AF4D0100');
|
||||
});
|
||||
|
||||
test('updateStkParamsHex refreshes the field and clears the manual flag', () => {
|
||||
const els = fakeForm({ 'rc-toolkit-enable': true, 'rc-tk-mode': 'ea',
|
||||
'rc-tk-tar': 'AF4D01' });
|
||||
els['ram-stk-params'].dataset.manual = '1';
|
||||
updateStkParamsHex();
|
||||
assert.ok(els['ram-stk-params'].value.startsWith('EA'), els['ram-stk-params'].value);
|
||||
assert.ok(!els['ram-stk-params'].dataset.manual,
|
||||
'a regeneration supersedes a manual edit');
|
||||
});
|
||||
Reference in New Issue
Block a user