Skip to content

tolerate malformed SMS_WEBHOOK_PORT on adapter init #80182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aydnOktay wants to merge 1 commit into from
+25 −2
Closed

tolerate malformed SMS_WEBHOOK_PORT on adapter init #80182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions plugins/platforms/sms/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ def _get_scoped_secret(name, default=None):
_TWILIO_WEBHOOK_MAX_BODY_BYTES = 65_536 # 64 KiB — Twilio payloads are small


def _coerce_int(value: object, *, default: int) -> int:
"""Parse config ints; malformed values must not crash adapter init."""
try:
return int(value) # type: ignore[arg-type]
except (TypeError, ValueError):
return default


def check_sms_requirements() -> bool:
"""Check if SMS adapter dependencies are available."""
try:
Expand All @@ -93,8 +101,9 @@ def __init__(self, config: PlatformConfig):
self._account_sid: str = _get_scoped_secret("TWILIO_ACCOUNT_SID", "")
self._auth_token: str = _get_scoped_secret("TWILIO_AUTH_TOKEN", "")
self._from_number: str = os.getenv("TWILIO_PHONE_NUMBER", "")
self._webhook_port: int = int(
os.getenv("SMS_WEBHOOK_PORT", str(DEFAULT_WEBHOOK_PORT))
self._webhook_port: int = _coerce_int(
os.getenv("SMS_WEBHOOK_PORT", str(DEFAULT_WEBHOOK_PORT)),
default=DEFAULT_WEBHOOK_PORT,
)
self._webhook_host: str = os.getenv("SMS_WEBHOOK_HOST", DEFAULT_WEBHOOK_HOST)
self._webhook_url: str = os.getenv("SMS_WEBHOOK_URL", "").strip()
Expand Down
14 changes: 14 additions & 0 deletions tests/gateway/test_sms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,20 @@ def test_webhook_url_from_env(self):
adapter = SmsAdapter(pc)
assert adapter._webhook_url == "https://example.com/webhooks/twilio"

def test_invalid_webhook_port_falls_back_to_default(self):
from plugins.platforms.sms.adapter import DEFAULT_WEBHOOK_PORT, SmsAdapter

env = {
"TWILIO_ACCOUNT_SID": "ACtest",
"TWILIO_AUTH_TOKEN": "tok",
"TWILIO_PHONE_NUMBER": "+15550001111",
"SMS_WEBHOOK_PORT": "not-a-port",
}
with patch.dict(os.environ, env):
pc = PlatformConfig(enabled=True, api_key="tok")
adapter = SmsAdapter(pc)
assert adapter._webhook_port == DEFAULT_WEBHOOK_PORT


# ── Startup guard (fail-closed) ────────────────────────────────────

Expand Down
Loading