Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-07-30 16:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): a stale login reply for a different node could be accepted

Browse Source 
AdminScreen::onRoomLoginResult()'s only guard was "_phase == LOGIN" --
true for *any* node currently sat at the login screen, not specifically
_target. Combined with UITask::onRoomLoginResult()'s current-screen
dispatch (not requester-based), a slow reply for an earlier login
attempt (this screen's own previous target, or even MessagesScreen's)
arriving while the user has since opened Admin on a different,
password-less node -- still parked at the blank LOGIN keyboard, so
_phase == LOGIN here too -- was accepted as that new node's own login
result, flipping _admin_ok/_phase to COMMAND without ever actually
authenticating with it.

Root-caused by cancelUiPendingLogin() (previous commit): that fix
covers the "gave up, then it resolved late" path, but not "a reply for
a genuinely different pubkey arrives while merely _phase == LOGIN".
Checking pub_key against _target.id.pub_key closes that regardless of
which path let the reply through.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-07-24 18:24:59 +02:00
parent 5a5ebe9ff1
commit 96b444601f
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
examples/companion_radio/ui-new/AdminScreen.h
View File

@@ -357,7 +357,16 @@ public:
// Async result of the on-device login, routed here from UITask::onRoomLoginResult()
// only while this screen is current (see that routing for why).
void onRoomLoginResult(const uint8_t* pub_key, bool success, uint8_t permissions) {
if (_phase != LOGIN) return; // stale/unrelated result
// Being in LOGIN phase isn't enough on its own -- this only confirms *some*
// login is in flight for *this screen*, not that this particular reply is
// for _target. UITask::onRoomLoginResult() dispatches by whichever screen
// is current, not by who sent the request, so e.g. a slow MessagesScreen
// login reply arriving while the user has since opened Admin on a
// *different*, password-less node (still sat at the blank LOGIN keyboard,
// so _phase == LOGIN here too) would otherwise be accepted as if it were
// this node's own login -- flipping _admin_ok/_phase to COMMAND for
// _target without ever actually authenticating with it.
if (_phase != LOGIN || memcmp(_target.id.pub_key, pub_key, 4) != 0) return; // stale/unrelated result
_login_waiting = false;
if (success && (permissions & PERM_ACL_ROLE_MASK) == PERM_ACL_ADMIN) {
memcpy(_admin_ok_prefix, pub_key, 4);