bf6730f028
Two boundary flaws found reviewing v3.20.0: - /api/send-ota decoded the PoR with the request's `cntr`, not the counter the packet was actually built with. With the new seeding an omitted counter is the normal case, so a warning ENVELOPE's verdict - notably the live card's cntr_low PoR - could fail its RC/CC check and be lost (the success and the failure path are both fixed). Tests pin the decode counter on both paths; the failure path also echoes the effective `cntr`. - the PWA's effective counter (preview / verify / the older-server fallback) fell back to the preset's first keyset and then 1, while the server's empty seed builds counter 0 (no preset / kvn 0 / an unknown keyset). A manual form or a keyless packet then produced a spurious "Verify vs pySim" MISMATCH and a preview that differed from the delivered packet. spPresetCounterValue()/spCntrEffective() now mirror _preset_counter_seed() exactly: the packet's matched keyset, else 0. - the `OTA SEND: counter not tracked` line reflects the effective counter (a seeded value is logged too); docs/api.md records that the seed uses the packet's keyset whatever SPI1.b5b4 says. Tests: 823 frontend + 737 Python; sw cache simple-v394.
174 lines
7.7 KiB
JavaScript
174 lines
7.7 KiB
JavaScript
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 extractConst(src, name) {
|
|
const m = new RegExp('const\\s+' + name + '\\s*=\\s*([^;]+);').exec(src);
|
|
if (!m) throw new Error('const ' + name + ' not found');
|
|
return 'var ' + name + ' = ' + m[1] + ';\n';
|
|
}
|
|
|
|
function extractFunc(src, name) {
|
|
const re = new RegExp('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 ['cardsTarList', 'cardsRoleDefault', 'cardsRoleTar',
|
|
'cardsTarEntry', 'cardsTarMsl', 'cardsApplyFields', 'cardsApply',
|
|
'spRefreshFromPreset', 'spPorAccepted', 'spNextCntr', 'spPresetIdx',
|
|
'spPresetCounterValue', 'spCntrPlaceholder', 'spCntrEffective', 'spCntrAhead',
|
|
'spCntrAdjust',
|
|
'spKeysetKvnOf', 'spKeysetList', 'spKeysetFor', 'spKeysetCheck',
|
|
'spKeysetOptionsHtml', 'cardsKeysetRowHtml', 'cardsKeysetRowsRender',
|
|
'cardsKeysetAdd', 'cardsKeysetRemove', 'cardsKeysetKvnUpdate',
|
|
'cardsKeysetsFromForm', 'spKeysetSync', 'spKeysetApply',
|
|
'spKeysetChanged', 'ramKeysetChanged', 'ramPresetIdx', 'tarPresetIdx', 'spKeysetGuard',
|
|
'spTarListRender',
|
|
'ramKeysetGuard',
|
|
]) {
|
|
code += extractFunc(html, fn) + '\n';
|
|
}
|
|
code = extractConst(html, 'CARDS_TAR_DEFAULTS') + extractConst(html, 'CARDS_TAR_ROLES')
|
|
+ extractConst(html, 'CARDS_MSL_DEFAULT') + code;
|
|
code = 'var _cardsKeysetCount = 0;\nglobalThis.spPresetWarningRender = function() {};\n'
|
|
+ 'globalThis.spMslWarningRender = function() {};\n'
|
|
+ 'globalThis.pysimApplyAvailability = function() {};\n' + code;
|
|
code = 'var _genSpBuildStub = function() {};\n' + code;
|
|
eval(code);
|
|
globalThis._genSpBuild = () => {};
|
|
globalThis.spShowSizeInfo = () => {};
|
|
globalThis.spKeysetSync = globalThis.spKeysetSync || (() => {});
|
|
globalThis.t = s => s;
|
|
|
|
// The SP form is a working copy: the preset is the source of truth, and
|
|
// every SCP80/RAM operation re-reads it before starting (v3.6.3). The plain
|
|
// SCP80 send keeps a hand-edited packet TAR (v3.6.21).
|
|
function fakeEnv(selValue, selId, presetCntr) {
|
|
const els = {};
|
|
for (const id of ['sp-spi1', 'sp-spi2-hex', 'sp-kic-idx', 'sp-kic-alg',
|
|
'sp-kid-idx', 'sp-kid-alg', 'sp-tar', 'sp-cntr', 'sp-kic-key', 'sp-kid-key']) {
|
|
els[id] = { value: '' };
|
|
}
|
|
// the combined key bytes the server reads (updateSpKic maintains them in
|
|
// the real form): the fake preset's keyset resolves to kvn 1
|
|
els['sp-kic-hex'] = { value: '15' };
|
|
els['sp-kid-hex'] = { value: '15' };
|
|
els[selId || 'sp-card-sel'] = { value: selValue };
|
|
globalThis.document = { getElementById: id => els[id] || null };
|
|
globalThis.cards = [{ name: 'C', cntr: presetCntr,
|
|
kic: '15', kid: '15', kicKey: 'AA', kidKey: 'BB',
|
|
tars: [{ role: 'isd', tar: '000000', msl: '16' },
|
|
{ role: 'uiccRfm', tar: 'B00000', msl: '16' },
|
|
{ role: 'usimRfm', tar: 'B00001', msl: '16' }] }];
|
|
globalThis._spTarKey = 'uiccRfm';
|
|
globalThis.updateSpKic = () => {};
|
|
globalThis.updateSpKid = () => {};
|
|
globalThis.spInvalidate = () => {};
|
|
globalThis.updateSp = () => {};
|
|
let gen = 0;
|
|
globalThis.genSp = () => { gen++; };
|
|
// cardsApply refreshes the preview directly (the guarded genSp() is the
|
|
// Generate button's path), so the counter stub is _genSpBuild
|
|
globalThis._genSpBuild = () => { gen++; };
|
|
return { els, gen: () => gen };
|
|
}
|
|
|
|
test('spRefreshFromPreset keeps an explicit counter override, empty = auto', () => {
|
|
const env = fakeEnv('0', 'sp-card-sel', '00000000AA');
|
|
env.els['sp-cntr'].value = '0000000001'; // explicit override
|
|
assert.strictEqual(spRefreshFromPreset('sp-card-sel'), '00000000AA');
|
|
assert.strictEqual(env.els['sp-cntr'].value, '0000000001',
|
|
'a typed counter survives the pre-send refresh');
|
|
assert.ok(env.gen() > 0, 'the packet must be regenerated from the preset');
|
|
// an empty field means "auto": the server seeds the counter, and the
|
|
// preset's next value is shown as the placeholder (v3.20.0)
|
|
env.els['sp-cntr'].value = '';
|
|
spRefreshFromPreset('sp-card-sel');
|
|
assert.strictEqual(env.els['sp-cntr'].value, '');
|
|
assert.match(env.els['sp-cntr'].placeholder, /00000000AA/);
|
|
// no preset selected: the manual form is left alone
|
|
globalThis.cards = [];
|
|
assert.strictEqual(spRefreshFromPreset('sp-card-sel'), '');
|
|
assert.strictEqual(env.els['sp-cntr'].value, '');
|
|
});
|
|
|
|
test('spRefreshFromPreset for the RAM selector targets the ISD TAR', () => {
|
|
const env = fakeEnv('0', 'ram-card-sel', '0000000010');
|
|
assert.strictEqual(spRefreshFromPreset('ram-card-sel'), '0000000010');
|
|
assert.strictEqual(_spTarKey, 'isd');
|
|
assert.strictEqual(env.els['sp-tar'].value, '000000');
|
|
});
|
|
|
|
test('the pre-send refresh keeps a hand-edited packet TAR (v3.6.21)', () => {
|
|
const env = fakeEnv('0', 'sp-card-sel', '0000000020');
|
|
env.els['sp-tar'].value = 'AF4D01'; // e.g. a push/link trigger target
|
|
assert.strictEqual(spRefreshFromPreset('sp-card-sel', true), '0000000020');
|
|
assert.strictEqual(env.els['sp-tar'].value, 'AF4D01', 'the typed TAR must survive the send');
|
|
assert.strictEqual(env.els['sp-cntr'].value, '', 'the counter field stays an override');
|
|
assert.match(env.els['sp-cntr'].placeholder, /0000000020/);
|
|
// an explicit preset apply (or a pack) still sets the TAR
|
|
cardsApplyFields(0);
|
|
assert.strictEqual(env.els['sp-tar'].value, 'B00000');
|
|
});
|
|
|
|
test('cardsApplyFields leaves the counter to the server (auto) and shows it as a placeholder', () => {
|
|
const env = fakeEnv('0', 'sp-card-sel', '0000000007');
|
|
env.els['sp-cntr'].value = 'nonsense'; // an old override
|
|
assert.strictEqual(cardsApplyFields(0), true);
|
|
assert.strictEqual(env.els['sp-cntr'].value, '',
|
|
'applying a preset clears the override (empty = the server seeds it)');
|
|
assert.match(env.els['sp-cntr'].placeholder, /0000000007/);
|
|
assert.strictEqual(env.gen(), 0, 'a plain field refresh must not rebuild the packet');
|
|
cardsApply(0);
|
|
assert.strictEqual(env.gen(), 1);
|
|
assert.strictEqual(cardsApplyFields(3), false);
|
|
});
|
|
|
|
test('the counter +/- buttons start from the preset value and create an override', () => {
|
|
const env = fakeEnv('0', 'sp-card-sel', '0000000020');
|
|
spCntrAdjust(1);
|
|
assert.strictEqual(env.els['sp-cntr'].value, '0000000021');
|
|
spCntrAdjust(-1);
|
|
assert.strictEqual(env.els['sp-cntr'].value, '0000000020');
|
|
});
|
|
|
|
test('spCntrEffective mirrors the server seed: matched keyset, else 0', () => {
|
|
const env = fakeEnv('0', 'sp-card-sel', '0000000020');
|
|
assert.strictEqual(spCntrEffective(), '0000000020');
|
|
env.els['sp-cntr'].value = '0000000042'; // a typed override wins
|
|
assert.strictEqual(spCntrEffective(), '0000000042');
|
|
env.els['sp-cntr'].value = '';
|
|
env.els['sp-kic-hex'].value = '00'; // keyless: no keyset
|
|
env.els['sp-kid-hex'].value = '00';
|
|
assert.strictEqual(spCntrEffective(), '0000000000',
|
|
'the server seeds nothing for kvn 0 - the packet carries 0');
|
|
env.els['sp-kic-hex'].value = '15';
|
|
env.els['sp-kid-hex'].value = '15';
|
|
globalThis.cards = []; // no preset: no seed
|
|
assert.strictEqual(spCntrEffective(), '0000000000');
|
|
});
|
|
|
|
test('spPorAccepted treats a missing PoR and por_ok as accepted', () => {
|
|
assert.strictEqual(spPorAccepted(undefined), true);
|
|
assert.strictEqual(spPorAccepted({ response_status: 'por_ok' }), true);
|
|
// 0x0B: the real response follows as an SMS-SUBMIT - the packet was consumed
|
|
assert.strictEqual(spPorAccepted({ response_status: 'actual_response_sms_submit' }), true);
|
|
assert.strictEqual(spPorAccepted({ response_status: 'cntr_low' }), false);
|
|
assert.strictEqual(spPorAccepted({ response_status: 'rc_cc_ds_failed' }), false);
|
|
});
|