stk: never shadow a paused command with a new menu selection
The stuck-card pattern: after a Back TR the card re-issues the parent menu
as a new SELECT ITEM (91XX -> FETCH, paused, awaiting TR), but the UI's
back/timeout branch ignored that response and showed the cached top menu;
the next item click then sent ENVELOPE(Menu Selection) while the card was
waiting for the TR. The card answers such an ENVELOPE with 9000 (not the
usual 91XX), and menu-select cleared the pending command without a TR,
leaving an unfinished proactive session until reset/equip.
- server: _finish_pending_menu() answers a paused command with a cancel TR
(0x10) before /api/menu-select sends its ENVELOPE and drains a 91XX
follow-up, so a new selection can never shadow an unanswered FETCH
- frontend: stkMenuRespond('back'|'timeout') renders the follow-up command
from the server response (SELECT ITEM / DISPLAY TEXT) and shows the
cached top menu only when the TR answer carries no command (9000)
- tests: finish-pending cancel TR + chain drain (Python); stkMenuRespond
back/timeout/cancel/ok rendering (frontend); help/AGENTS updated;
SW cache v107 -> v108.
This commit is contained in:
@@ -87,3 +87,42 @@ class TestMenuSendResponse(unittest.TestCase):
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
|
||||
class TestFinishPendingMenu(unittest.TestCase):
|
||||
def make_server(self):
|
||||
return types.SimpleNamespace(
|
||||
stk_pending={'type': 'select_item', 'cmd_num': 1, 'cmd_type': 0x24,
|
||||
'dev_src': 0x81, 'dev_dst': 0x83, 'items': []},
|
||||
menu_active=True, scc=None)
|
||||
|
||||
def make_scc(self, sent, sw='9000'):
|
||||
return types.SimpleNamespace(
|
||||
cat_cla='80',
|
||||
_tp=types.SimpleNamespace(send_apdu=lambda h: (sent.append(h) or ('', sw))))
|
||||
|
||||
def test_no_pending_is_noop(self):
|
||||
sent = []
|
||||
S._finish_pending_menu(types.SimpleNamespace(stk_pending=None), self.make_scc(sent))
|
||||
self.assertEqual(sent, [])
|
||||
|
||||
def test_pending_finished_with_cancel_tr(self):
|
||||
server = self.make_server()
|
||||
sent = []
|
||||
scc = self.make_scc(sent)
|
||||
server.scc = scc
|
||||
S._finish_pending_menu(server, scc)
|
||||
self.assertEqual(len(sent), 1)
|
||||
tr = sent[0]
|
||||
self.assertTrue(tr.startswith('801400000d'), tr)
|
||||
self.assertIn('83021000', tr) # general result 0x10 = cancel
|
||||
self.assertIsNone(server.stk_pending)
|
||||
self.assertFalse(server.menu_active)
|
||||
|
||||
def test_91xx_answer_drains_chain(self):
|
||||
server = self.make_server()
|
||||
scc = self.make_scc([], sw='9120')
|
||||
server.scc = scc
|
||||
with mock.patch.object(S, '_handle_proactive_chain') as chain:
|
||||
S._finish_pending_menu(server, scc)
|
||||
chain.assert_called_once_with(scc, '9120')
|
||||
|
||||
Reference in New Issue
Block a user