mirror of
https://github.com/cnlimiter/codex-register.git
synced 2026-09-05 15:36:52 +08:00
feat(email): add configurable resend limits for non-OpenAI sender emails
This commit is contained in:
@@ -2,6 +2,7 @@ import src.core.register as register_module
|
||||
from src.core.register import (
|
||||
ERROR_OTP_TIMEOUT_SECONDARY,
|
||||
PhaseContext,
|
||||
PhaseResult,
|
||||
RegistrationEngine,
|
||||
)
|
||||
from src.services import EmailServiceType
|
||||
@@ -13,6 +14,10 @@ class DummySettings:
|
||||
openai_token_url = "https://token.example.test"
|
||||
openai_redirect_uri = "https://callback.example.test"
|
||||
openai_scope = "openid profile email"
|
||||
email_code_timeout = 120
|
||||
email_code_poll_interval = 3
|
||||
email_code_resend_max_retries = 2
|
||||
email_code_non_openai_sender_resend_max_retries = 1
|
||||
|
||||
|
||||
class FakeEmailService:
|
||||
@@ -26,6 +31,12 @@ class FakeEmailService:
|
||||
return self.code
|
||||
|
||||
|
||||
class FastResendEmailService(FakeEmailService):
|
||||
def get_verification_code(self, **kwargs):
|
||||
self.calls.append(kwargs)
|
||||
raise register_module.OTPNoOpenAISenderEmailServiceError()
|
||||
|
||||
|
||||
class FakeCookies:
|
||||
def __init__(self, values):
|
||||
self.values = values
|
||||
@@ -56,11 +67,67 @@ class FakeResponse:
|
||||
return self._json_payload
|
||||
|
||||
|
||||
def _build_engine(monkeypatch, email_service):
|
||||
monkeypatch.setattr(register_module, "get_settings", lambda: DummySettings())
|
||||
def _build_engine(monkeypatch, email_service, **setting_overrides):
|
||||
def _settings():
|
||||
settings = DummySettings()
|
||||
for key, value in setting_overrides.items():
|
||||
setattr(settings, key, value)
|
||||
return settings
|
||||
|
||||
monkeypatch.setattr(register_module, "get_settings", _settings)
|
||||
return RegistrationEngine(email_service=email_service)
|
||||
|
||||
|
||||
def _build_failed_phase(error_code: str, error_message: str) -> PhaseResult:
|
||||
return PhaseResult(
|
||||
phase=register_module.PHASE_OTP_SECONDARY,
|
||||
success=False,
|
||||
error_code=error_code,
|
||||
error_message=error_message,
|
||||
retryable=True,
|
||||
next_action="resend_otp",
|
||||
)
|
||||
|
||||
|
||||
def _prepare_engine_for_run(monkeypatch, phase_results, **setting_overrides):
|
||||
engine = _build_engine(
|
||||
monkeypatch,
|
||||
FakeEmailService(code=None),
|
||||
**setting_overrides,
|
||||
)
|
||||
monkeypatch.setattr(register_module.time, "time", lambda: 100.0)
|
||||
|
||||
send_calls = []
|
||||
phase_iter = iter(phase_results)
|
||||
|
||||
def fake_phase_email_prepare():
|
||||
engine.email = "tester@example.com"
|
||||
engine.email_info = {"service_id": "svc-1"}
|
||||
return True
|
||||
|
||||
monkeypatch.setattr(engine, "_phase_email_prepare", fake_phase_email_prepare)
|
||||
monkeypatch.setattr(engine, "_check_ip_location", lambda: (True, "US"))
|
||||
monkeypatch.setattr(engine, "_init_session", lambda: True)
|
||||
monkeypatch.setattr(engine, "_start_oauth", lambda: True)
|
||||
monkeypatch.setattr(engine, "_get_device_id", lambda: "did-1")
|
||||
monkeypatch.setattr(engine, "_check_sentinel", lambda _did: None)
|
||||
monkeypatch.setattr(
|
||||
engine,
|
||||
"_submit_signup_form",
|
||||
lambda _did, _sen_token: type("SignupResult", (), {"success": True, "error_message": ""})(),
|
||||
)
|
||||
monkeypatch.setattr(engine, "_register_password", lambda: (True, "pass-123"))
|
||||
|
||||
def fake_send_verification_code():
|
||||
send_calls.append("send")
|
||||
engine._otp_sent_at = 100.0
|
||||
return True
|
||||
|
||||
monkeypatch.setattr(engine, "_send_verification_code", fake_send_verification_code)
|
||||
monkeypatch.setattr(engine, "_phase_otp_secondary", lambda *_args, **_kwargs: (None, next(phase_iter)))
|
||||
return engine, send_calls
|
||||
|
||||
|
||||
def test_phase_otp_secondary_uses_remaining_budget_from_start_timestamp(monkeypatch):
|
||||
email_service = FakeEmailService(code="654321")
|
||||
engine = _build_engine(monkeypatch, email_service)
|
||||
@@ -101,6 +168,82 @@ def test_phase_otp_secondary_returns_dedicated_timeout_error_code(monkeypatch):
|
||||
assert engine.phase_history[0].error_code == ERROR_OTP_TIMEOUT_SECONDARY
|
||||
|
||||
|
||||
def test_phase_otp_secondary_maps_no_openai_sender_to_resend_action(monkeypatch):
|
||||
email_service = FastResendEmailService(code=None)
|
||||
engine = _build_engine(monkeypatch, email_service)
|
||||
engine.email = "tester@example.com"
|
||||
engine.email_info = {"service_id": "svc-1"}
|
||||
|
||||
monkeypatch.setattr(register_module.time, "time", lambda: 120.0)
|
||||
|
||||
code, phase_result = engine._phase_otp_secondary(
|
||||
PhaseContext(otp_sent_at=80.0),
|
||||
started_at=100.0,
|
||||
)
|
||||
|
||||
assert code is None
|
||||
assert phase_result.success is False
|
||||
assert phase_result.error_code == "OTP_NO_OPENAI_SENDER"
|
||||
assert phase_result.retryable is True
|
||||
assert phase_result.next_action == "resend_otp"
|
||||
|
||||
|
||||
def test_run_uses_dedicated_budget_for_non_openai_sender_resends(monkeypatch):
|
||||
engine, send_calls = _prepare_engine_for_run(
|
||||
monkeypatch,
|
||||
[
|
||||
_build_failed_phase("OTP_NO_OPENAI_SENDER", "detected non-openai sender"),
|
||||
_build_failed_phase(ERROR_OTP_TIMEOUT_SECONDARY, "timeout after dedicated resend"),
|
||||
],
|
||||
email_code_resend_max_retries=0,
|
||||
email_code_non_openai_sender_resend_max_retries=1,
|
||||
)
|
||||
|
||||
result = engine.run()
|
||||
|
||||
assert result.success is False
|
||||
assert result.error_code == ERROR_OTP_TIMEOUT_SECONDARY
|
||||
assert len(send_calls) == 2
|
||||
|
||||
|
||||
def test_run_stops_when_non_openai_sender_budget_is_exhausted(monkeypatch):
|
||||
engine, send_calls = _prepare_engine_for_run(
|
||||
monkeypatch,
|
||||
[
|
||||
_build_failed_phase("OTP_NO_OPENAI_SENDER", "detected non-openai sender"),
|
||||
_build_failed_phase("OTP_NO_OPENAI_SENDER", "detected non-openai sender again"),
|
||||
],
|
||||
email_code_resend_max_retries=2,
|
||||
email_code_non_openai_sender_resend_max_retries=1,
|
||||
)
|
||||
|
||||
result = engine.run()
|
||||
|
||||
assert result.success is False
|
||||
assert result.error_code == "OTP_NO_OPENAI_SENDER"
|
||||
assert len(send_calls) == 2
|
||||
|
||||
|
||||
def test_run_keeps_timeout_budget_after_non_openai_sender_resend(monkeypatch):
|
||||
engine, send_calls = _prepare_engine_for_run(
|
||||
monkeypatch,
|
||||
[
|
||||
_build_failed_phase(ERROR_OTP_TIMEOUT_SECONDARY, "timeout #1"),
|
||||
_build_failed_phase("OTP_NO_OPENAI_SENDER", "detected non-openai sender"),
|
||||
_build_failed_phase(ERROR_OTP_TIMEOUT_SECONDARY, "timeout #2"),
|
||||
_build_failed_phase(ERROR_OTP_TIMEOUT_SECONDARY, "timeout #3"),
|
||||
],
|
||||
email_code_resend_max_retries=2,
|
||||
email_code_non_openai_sender_resend_max_retries=1,
|
||||
)
|
||||
|
||||
result = engine.run()
|
||||
|
||||
assert result.success is False
|
||||
assert result.error_code == ERROR_OTP_TIMEOUT_SECONDARY
|
||||
assert len(send_calls) == 4
|
||||
|
||||
|
||||
def test_advance_login_authorization_sets_otp_anchor_before_password_submit(monkeypatch):
|
||||
email_service = FakeEmailService(code=None)
|
||||
engine = _build_engine(monkeypatch, email_service)
|
||||
|
||||
Reference in New Issue
Block a user