From 5cd7dfd924320f7a9b862d3572002b5707592d7e Mon Sep 17 00:00:00 2001 From: YokiiroBW Date: Sun, 5 Jul 2026 19:57:17 +0800 Subject: [PATCH] Normalize settings snapshot limits defensively --- backend/services/settings_service.py | 10 +++++++++- tests/test_s2_routes.py | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/backend/services/settings_service.py b/backend/services/settings_service.py index 5c0449d..4859b0b 100644 --- a/backend/services/settings_service.py +++ b/backend/services/settings_service.py @@ -216,7 +216,7 @@ class SettingsService: if not self.audit_service: return [] placeholder = self.audit_service.database._placeholder - normalized_limit = min(max(int(limit), 1), 100) + normalized_limit = _limit(limit, default=20, maximum=100) conn = self.audit_service.database.connect() try: rows = conn.execute( @@ -385,6 +385,14 @@ def _mask_sensitive(value: Any, path: str = "") -> Any: return value +def _limit(value: Any, *, default: int, maximum: int) -> int: + try: + limit = int(value) + except (TypeError, ValueError): + limit = default + return min(max(limit, 1), maximum) + + def _flatten(value: Mapping[str, Any], prefix: str = "") -> dict[str, Any]: flattened: dict[str, Any] = {} for key, child in value.items(): diff --git a/tests/test_s2_routes.py b/tests/test_s2_routes.py index 4facecb..f5d15d0 100644 --- a/tests/test_s2_routes.py +++ b/tests/test_s2_routes.py @@ -561,6 +561,11 @@ database: self.assertGreaterEqual(len(snapshots["data"]), 2) self.assertNotIn("secret", str(snapshots["data"])) + default_limited = self.settings_service.list_snapshots("bad") + self.assertGreaterEqual(len(default_limited), 2) + self.assertEqual(len(self.settings_service.list_snapshots(0)), 1) + self.assertGreaterEqual(len(self.settings_service.list_snapshots(999)), 2) + old_snapshot = next( item for item in snapshots["data"] if item["config"].get("plugin", {}).get("display_name") == "Old Name" )