Normalize settings snapshot limits defensively
这个提交存在于:
父节点
3a4eec6163
当前提交
5cd7dfd924
共有 2 个文件被更改,包括 14 次插入 和 1 次删除
|
|
@ -216,7 +216,7 @@ class SettingsService:
|
||||||
if not self.audit_service:
|
if not self.audit_service:
|
||||||
return []
|
return []
|
||||||
placeholder = self.audit_service.database._placeholder
|
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()
|
conn = self.audit_service.database.connect()
|
||||||
try:
|
try:
|
||||||
rows = conn.execute(
|
rows = conn.execute(
|
||||||
|
|
@ -385,6 +385,14 @@ def _mask_sensitive(value: Any, path: str = "") -> Any:
|
||||||
return value
|
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]:
|
def _flatten(value: Mapping[str, Any], prefix: str = "") -> dict[str, Any]:
|
||||||
flattened: dict[str, Any] = {}
|
flattened: dict[str, Any] = {}
|
||||||
for key, child in value.items():
|
for key, child in value.items():
|
||||||
|
|
|
||||||
|
|
@ -561,6 +561,11 @@ database:
|
||||||
self.assertGreaterEqual(len(snapshots["data"]), 2)
|
self.assertGreaterEqual(len(snapshots["data"]), 2)
|
||||||
self.assertNotIn("secret", str(snapshots["data"]))
|
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(
|
old_snapshot = next(
|
||||||
item for item in snapshots["data"] if item["config"].get("plugin", {}).get("display_name") == "Old Name"
|
item for item in snapshots["data"] if item["config"].get("plugin", {}).get("display_name") == "Old Name"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
正在加载…
添加表格
在新工单中引用