Skip to content

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

fix(video): stop paid provider requests at redirects

Rudy Celeklic656a5139e99
diff --git a/app/services/metaso_minimax.py b/app/services/metaso_minimax.py
index c8958401..68916bc9 100644
--- a/app/services/metaso_minimax.py
+++ b/app/services/metaso_minimax.py
@@ -261,6 +261,7 @@ def generate_videos(
proxies=config.proxy,
verify=_tls_verify(),
timeout=(30, 60),
+ allow_redirects=False,
)
except Exception as exc:
raise MetasoMiniMaxUnconfirmedTaskError(
@@ -270,6 +271,11 @@ def generate_videos(
) from exc
status_code = _status_code(response)
+ if 300 <= status_code < 400:
+ raise MetasoMiniMaxUnconfirmedTaskError(
+ "Metaso MiniMax submission returned a redirect; the paid task state "
+ "is unknown and the request was not replayed"
+ )
if status_code >= 500:
raise MetasoMiniMaxUnconfirmedTaskError(
f"Metaso MiniMax submission failed with HTTP {status_code}; a paid "
@@ -378,6 +384,7 @@ def _wait_for_task(
proxies=config.proxy,
verify=_tls_verify(),
timeout=(phase_timeout, phase_timeout),
+ allow_redirects=False,
)
status_code = _status_code(response)
if status_code in RETRYABLE_STATUS_CODES:
diff --git a/app/services/ofox.py b/app/services/ofox.py
index c8ab66df..4c9858c8 100644
--- a/app/services/ofox.py
+++ b/app/services/ofox.py
@@ -268,6 +268,7 @@ def generate_videos(
proxies=config.proxy,
verify=_tls_verify(),
timeout=(30, 60),
+ allow_redirects=False,
)
except Exception as exc:
raise OFoxUnconfirmedTaskError(
@@ -277,6 +278,11 @@ def generate_videos(
) from exc
status_code = _status_code(response)
+ if 300 <= status_code < 400:
+ raise OFoxUnconfirmedTaskError(
+ "OFox submission returned a redirect; the paid task state is "
+ "unknown and the request was not replayed"
+ )
if status_code >= 500:
raise OFoxUnconfirmedTaskError(
f"OFox submission failed with HTTP {status_code}; a paid task may "
@@ -392,6 +398,7 @@ def _wait_for_task(
proxies=config.proxy,
verify=_tls_verify(),
timeout=(phase_timeout, phase_timeout),
+ allow_redirects=False,
)
status_code = _status_code(response)
if status_code in RETRYABLE_STATUS_CODES:
diff --git a/app/services/volcengine_seedance.py b/app/services/volcengine_seedance.py
index 94dbf28c..0d476564 100644
--- a/app/services/volcengine_seedance.py
+++ b/app/services/volcengine_seedance.py
@@ -270,6 +270,7 @@ def generate_videos(
proxies=config.proxy,
verify=_tls_verify(),
timeout=(30, 60),
+ allow_redirects=False,
)
except Exception as exc:
raise VolcEngineSeedanceUnconfirmedTaskError(
@@ -279,6 +280,11 @@ def generate_videos(
) from exc
status_code = _status_code(response)
+ if 300 <= status_code < 400:
+ raise VolcEngineSeedanceUnconfirmedTaskError(
+ "Seedance submission returned a redirect; the paid task state is "
+ "unknown and the request was not replayed"
+ )
if status_code >= 500:
raise VolcEngineSeedanceUnconfirmedTaskError(
f"Seedance submission failed with HTTP {status_code}; a paid task may "
@@ -379,6 +385,7 @@ def _wait_for_task(
proxies=config.proxy,
verify=_tls_verify(),
timeout=(phase_timeout, phase_timeout),
+ allow_redirects=False,
)
status_code = _status_code(response)
if status_code in RETRYABLE_STATUS_CODES:
diff --git a/test/services/test_paid_video_provider_redirects.py b/test/services/test_paid_video_provider_redirects.py
new file mode 100644
index 00000000..c23ebae9
--- /dev/null
+++ b/test/services/test_paid_video_provider_redirects.py
@@ -0,0 +1,119 @@
+"""Paid video submissions and polling must stop at the provider origin."""
+
+from contextlib import contextmanager
+from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
+from threading import Thread
+from unittest.mock import patch
+
+import pytest
+import requests
+
+from app.config import config
+from app.services import metaso_minimax, ofox, volcengine_seedance
+
+
+PROVIDERS = (
+ (
+ volcengine_seedance,
+ "volcengine_seedance",
+ "tasks_url",
+ volcengine_seedance.VolcEngineSeedanceUnconfirmedTaskError,
+ ),
+ (ofox, "ofox", "videos_url", ofox.OFoxUnconfirmedTaskError),
+ (
+ metaso_minimax,
+ "metaso_minimax",
+ "base_url",
+ metaso_minimax.MetasoMiniMaxUnconfirmedTaskError,
+ ),
+)
+
+
+@contextmanager
+def redirect_servers():
+ redirected_requests = []
+
+ class Destination(BaseHTTPRequestHandler):
+ def do_GET(self):
+ redirected_requests.append(("GET", 0))
+ self.send_error(400)
+
+ def do_POST(self):
+ body_size = int(self.headers.get("Content-Length", "0"))
+ self.rfile.read(body_size)
+ redirected_requests.append(("POST", body_size))
+ self.send_error(400)
+
+ def log_message(self, *_args):
+ pass
+
+ destination = ThreadingHTTPServer(("127.0.0.1", 0), Destination)
+ destination_thread = Thread(target=destination.serve_forever, daemon=True)
+ destination_thread.start()
+
+ class Source(BaseHTTPRequestHandler):
+ def do_GET(self):
+ self._redirect()
+
+ def do_POST(self):
+ self.rfile.read(int(self.headers.get("Content-Length", "0")))
+ self._redirect()
+
+ def _redirect(self):
+ self.send_response(307)
+ self.send_header(
+ "Location", f"http://127.0.0.1:{destination.server_port}/other"
+ )
+ self.send_header("Content-Length", "0")
+ self.end_headers()
+
+ def log_message(self, *_args):
+ pass
+
+ source = ThreadingHTTPServer(("127.0.0.1", 0), Source)
+ source_thread = Thread(target=source.serve_forever, daemon=True)
+ source_thread.start()
+ try:
+ yield source, redirected_requests
+ finally:
+ source.shutdown()
+ source.server_close()
+ source_thread.join(timeout=5)
+ destination.shutdown()
+ destination.server_close()
+ destination_thread.join(timeout=5)
+
+
[email protected]("provider,prefix,poll_url_key,error_type", PROVIDERS)
[email protected]("method", ["POST", "GET"])
+def test_paid_video_provider_rejects_redirect_without_replaying_request(
+ provider, prefix, poll_url_key, error_type, method
+):
+ with redirect_servers() as (source, redirected_requests):
+ base_url = f"http://127.0.0.1:{source.server_port}"
+ settings = {
+ f"{prefix}_api_key": "secret-key",
+ f"{prefix}_base_url": base_url,
+ }
+ with (
+ requests.Session() as session,
+ patch.object(config, "app", settings),
+ patch.object(config, "proxy", {}),
+ ):
+ session.trust_env = False
+ request = session.post if method == "POST" else session.get
+ with patch.object(provider.requests, method.lower(), side_effect=request):
+ if method == "POST":
+ with pytest.raises(error_type):
+ provider.generate_videos("cinematic sunrise", 5)
+ else:
+ poll_kwargs = {
+ "task_id": "remote-task",
+ "headers": {"Authorization": "Bearer secret-key"},
+ "api_key": "secret-key",
+ poll_url_key: base_url,
+ }
+ with pytest.raises(error_type):
+ provider._wait_for_task(**poll_kwargs)
+
+ assert redirected_requests == []