Skip to content

利用 AI 大模型和自动化工作流,根据主题或关键词一键生成高清短视频。Generate HD short videos from a topic or keyword with an automated AI workflow.

fix(redis): keep foreign hashes out of task API

Rudy Celekli4823d33671a4
diff --git a/app/services/state.py b/app/services/state.py
index 73a9c1fd..7ee25c22 100644
--- a/app/services/state.py
+++ b/app/services/state.py
@@ -139,7 +139,7 @@ class RedisState(BaseState):
return tasks, len(task_ids)
def list_task_ids(self, scan_count: int = 100) -> list[str]:
- """一次完整扫描中按任务键去重,避免 SCAN 重复返回同一条记录。"""
+ """Return only this application's task hashes from a possibly shared DB."""
task_keys = set()
cursor = 0
while True:
@@ -151,7 +151,20 @@ class RedisState(BaseState):
count=scan_count,
_type="HASH",
)
- task_keys.update(keys)
+ # Redis db 0 may also contain hashes belonging to other services.
+ # Check the task marker in one pipelined round trip per SCAN batch;
+ # exposing all HASH keys here can leak their fields through /tasks.
+ candidates = [key for key in dict.fromkeys(keys) if key not in task_keys]
+ if candidates:
+ with self._redis.pipeline(transaction=False) as pipeline:
+ for key in candidates:
+ pipeline.hget(key, "task_id")
+ embedded_ids = pipeline.execute()
+ task_keys.update(
+ key
+ for key, embedded_id in zip(candidates, embedded_ids)
+ if embedded_id == key
+ )
if cursor == 0:
break
# 按任务键排序不依赖 Hash 扫描顺序;不额外维护索引,也不改变旧任务。
@@ -185,7 +198,9 @@ class RedisState(BaseState):
def get_task(self, task_id: str):
task_data = self._redis.hgetall(task_id)
- if not task_data:
+ # An API caller may ask for any Redis key by name. Require the same
+ # marker as list_task_ids before returning a hash's contents.
+ if not task_data or task_data.get(b"task_id") != task_id.encode("utf-8"):
return None
task = {
diff --git a/test/services/test_state.py b/test/services/test_state.py
index a66a4635..67f8c935 100644
--- a/test/services/test_state.py
+++ b/test/services/test_state.py
@@ -13,6 +13,25 @@ from app.models import const
from app.services.state import MemoryState, RedisState
+class _FakeRedisPipeline:
+ def __init__(self, redis):
+ self.redis = redis
+ self.keys = []
+
+ def __enter__(self):
+ return self
+
+ def __exit__(self, *args):
+ return None
+
+ def hget(self, key, field):
+ self.keys.append((key, field))
+ return self
+
+ def execute(self):
+ return [self.redis.data.get(key, {}).get(field.encode("utf-8")) for key, field in self.keys]
+
+
class _FakeRedis:
def __init__(self, batches):
self.batches = batches
@@ -39,6 +58,9 @@ class _FakeRedis:
key = key.encode("utf-8")
return self.data[key]
+ def pipeline(self, transaction=False):
+ return _FakeRedisPipeline(self)
+
def exists(self, key):
if isinstance(key, str):
key = key.encode("utf-8")
@@ -251,6 +273,22 @@ class TestRedisState(unittest.TestCase):
)
self.assertEqual(state.list_task_ids(scan_count=1), ["task:0", "task:1", "task:2"])
+ def test_shared_redis_db_does_not_expose_unrelated_hashes(self):
+ """Only hashes whose embedded task_id matches the key belong to this app."""
+ state = self._build_state([3])
+ state._redis.data[b"task:1"] = {b"secret": b"another service's token"}
+ state._redis.data[b"task:2"] = {
+ b"task_id": b"different-task",
+ b"secret": b"another service's token",
+ }
+
+ self.assertIsNone(state.get_task("task:1"))
+ self.assertIsNone(state.get_task("task:2"))
+ self.assertEqual(state.list_task_ids(), ["task:0"])
+ tasks, total = state.get_all_tasks(page=1, page_size=10)
+ self.assertEqual(total, 1)
+ self.assertEqual([task["task_id"] for task in tasks], ["task:0"])
+
@unittest.skipUnless(
os.getenv("MPT_TEST_REDIS_HOST"),
"MPT_TEST_REDIS_HOST not set",