mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-28 11:32:22 +00:00
fix(gateway): skip non-dict entries in session loading (#46994)
Corrupted sessions.json entries (e.g. a bare bool where a dict is expected) caused TypeError on 'origin' in data' which escaped the (ValueError, KeyError) inner except and aborted loading ALL remaining sessions, not just the corrupted one. Two-layer fix: - Loop level: isinstance(entry_data, dict) guard before from_dict - from_dict: isinstance(data['origin'], dict) instead of bare truthiness - Added TypeError to the inner except as defense-in-depth Closes #46994
This commit is contained in:
parent
ed1fdb5b61
commit
9c994377ed
2 changed files with 140 additions and 2 deletions
|
|
@ -577,7 +577,7 @@ class SessionEntry:
|
|||
@classmethod
|
||||
def from_dict(cls, data: Dict[str, Any]) -> "SessionEntry":
|
||||
origin = None
|
||||
if "origin" in data and data["origin"]:
|
||||
if "origin" in data and isinstance(data["origin"], dict):
|
||||
origin = SessionSource.from_dict(data["origin"])
|
||||
|
||||
platform = None
|
||||
|
|
@ -814,9 +814,21 @@ class SessionStore:
|
|||
# entries. Skip them so they never reach SessionEntry.from_dict.
|
||||
if key.startswith("_"):
|
||||
continue
|
||||
# Skip non-dict entries (corrupted sessions.json, e.g. a
|
||||
# bare bool or string where a dict is expected). Without
|
||||
# this, from_dict raises TypeError on `"origin" in data`
|
||||
# which escapes the inner except (ValueError, KeyError) and
|
||||
# aborts loading ALL remaining sessions (#46994).
|
||||
if not isinstance(entry_data, dict):
|
||||
logger.warning(
|
||||
"Skipping invalid session entry %r: "
|
||||
"expected dict, got %s",
|
||||
key, type(entry_data).__name__,
|
||||
)
|
||||
continue
|
||||
try:
|
||||
self._entries[key] = SessionEntry.from_dict(entry_data)
|
||||
except (ValueError, KeyError) as e:
|
||||
except (ValueError, KeyError, TypeError) as e:
|
||||
logger.warning("Skipping invalid session entry %r: %s", key, e)
|
||||
except Exception as e:
|
||||
print(f"[gateway] Warning: Failed to load sessions: {e}")
|
||||
|
|
|
|||
126
tests/gateway/test_session_load_bool.py
Normal file
126
tests/gateway/test_session_load_bool.py
Normal file
|
|
@ -0,0 +1,126 @@
|
|||
"""Regression tests for issue #46994.
|
||||
|
||||
Corrupted sessions.json entries (e.g. a bare bool where a dict is expected)
|
||||
must not crash the entire session loading loop. The TypeError from
|
||||
`"origin" in True` escaped the (ValueError, KeyError) except and aborted
|
||||
loading ALL remaining sessions, not just the corrupted one.
|
||||
"""
|
||||
|
||||
import json
|
||||
import threading
|
||||
from pathlib import Path
|
||||
|
||||
from gateway.session import SessionStore
|
||||
|
||||
|
||||
class TestSessionLoadBoolCorruption:
|
||||
"""Verify that non-dict entries in sessions.json are skipped, not fatal."""
|
||||
|
||||
def _make_store(self, tmp_path: Path, sessions_data: dict) -> SessionStore:
|
||||
"""Create a SessionStore with a pre-populated sessions.json."""
|
||||
sessions_dir = tmp_path / "sessions"
|
||||
sessions_dir.mkdir(parents=True)
|
||||
(sessions_dir / "sessions.json").write_text(
|
||||
json.dumps(sessions_data), encoding="utf-8"
|
||||
)
|
||||
# SessionStore requires a config object with session reset policy
|
||||
class FakeConfig:
|
||||
session_idle_ttl = 0
|
||||
session_daily_ttl = 0
|
||||
group_sessions_per_user = True
|
||||
thread_sessions_per_user = False
|
||||
multiplex_profiles = False
|
||||
def get_reset_policy(self, *a, **kw):
|
||||
return None
|
||||
|
||||
store = SessionStore.__new__(SessionStore)
|
||||
store.sessions_dir = sessions_dir
|
||||
store._entries = {}
|
||||
store._loaded = False
|
||||
store._lock = threading.RLock()
|
||||
store.config = FakeConfig()
|
||||
store._has_active_processes_fn = None
|
||||
return store
|
||||
|
||||
def _valid_entry(self, session_id: str = "20260101_120000_abc12345") -> dict:
|
||||
return {
|
||||
"session_key": "agent:main:telegram:dm:123456",
|
||||
"session_id": session_id,
|
||||
"created_at": "2026-01-01T12:00:00",
|
||||
"updated_at": "2026-01-01T12:30:00",
|
||||
"origin": {
|
||||
"platform": "telegram",
|
||||
"chat_id": "123456",
|
||||
"chat_type": "dm",
|
||||
},
|
||||
}
|
||||
|
||||
def test_bool_entry_skipped_not_fatal(self, tmp_path):
|
||||
"""A bool entry must not crash the loop or block other sessions."""
|
||||
data = {
|
||||
"_README": "test sentinel",
|
||||
"corrupted_key": True,
|
||||
"valid_key": self._valid_entry(),
|
||||
}
|
||||
store = self._make_store(tmp_path, data)
|
||||
store._ensure_loaded()
|
||||
|
||||
# The valid entry must still be loaded
|
||||
assert "valid_key" in store._entries
|
||||
assert store._entries["valid_key"].session_id == "20260101_120000_abc12345"
|
||||
# The corrupted entry must NOT be loaded
|
||||
assert "corrupted_key" not in store._entries
|
||||
|
||||
def test_string_entry_skipped(self, tmp_path):
|
||||
"""A string entry must also be skipped without crashing."""
|
||||
data = {
|
||||
"bad_string": "not a dict",
|
||||
"valid_key": self._valid_entry("20260101_130000_def67890"),
|
||||
}
|
||||
store = self._make_store(tmp_path, data)
|
||||
store._ensure_loaded()
|
||||
|
||||
assert "valid_key" in store._entries
|
||||
assert "bad_string" not in store._entries
|
||||
|
||||
def test_all_corrupted_entries_does_not_crash(self, tmp_path):
|
||||
"""Multiple corrupted entries must not produce an unhandled exception."""
|
||||
data = {
|
||||
"bad1": True,
|
||||
"bad2": 42,
|
||||
"bad3": "string",
|
||||
"bad4": [1, 2, 3],
|
||||
}
|
||||
store = self._make_store(tmp_path, data)
|
||||
store._ensure_loaded()
|
||||
|
||||
assert len(store._entries) == 0
|
||||
|
||||
def test_origin_not_dict_skipped(self, tmp_path):
|
||||
"""If origin is present but not a dict, from_dict must not crash."""
|
||||
entry = self._valid_entry()
|
||||
entry["origin"] = True # bool instead of dict
|
||||
data = {"key_with_bad_origin": entry}
|
||||
store = self._make_store(tmp_path, data)
|
||||
store._ensure_loaded()
|
||||
|
||||
# Entry should still load, just with origin=None
|
||||
assert "key_with_bad_origin" in store._entries
|
||||
assert store._entries["key_with_bad_origin"].origin is None
|
||||
|
||||
def test_typeerror_in_from_dict_caught(self, tmp_path):
|
||||
"""TypeError from from_dict must be caught, not escape to outer except."""
|
||||
# An entry with a non-dict, non-bool value that could trigger TypeError
|
||||
# in from_dict's datetime.fromisoformat or Platform() calls
|
||||
entry = self._valid_entry()
|
||||
entry["created_at"] = 12345 # int instead of ISO string
|
||||
data = {
|
||||
"bad_date": entry,
|
||||
"valid_key": self._valid_entry(),
|
||||
}
|
||||
store = self._make_store(tmp_path, data)
|
||||
store._ensure_loaded()
|
||||
|
||||
# The valid entry must still load despite the bad one
|
||||
assert "valid_key" in store._entries
|
||||
assert "bad_date" not in store._entries
|
||||
Loading…
Add table
Add a link
Reference in a new issue