Require the port field of SMTPSender to be non-negative

CHANGELOG.md

@@ -1,5 +1,6 @@
 v0.2.0 (in development)
 -----------------------
+- Require the `port` field of `SMTPSender` to be non-negative
 
 v0.1.0 (2021-03-06)
 -------------------

src/outgoing/senders/smtp.py

@@ -2,7 +2,7 @@
 import smtplib
 import sys
 from typing import Any, Dict, Optional
-from pydantic import PrivateAttr, validator
+from pydantic import Field, PrivateAttr, validator
 from ..config import NetrcConfig
 from ..util import OpenClosable
 
@@ -16,7 +16,7 @@
 
 class SMTPSender(NetrcConfig, OpenClosable):
     ssl: Literal[False, True, "starttls"] = False
-    port: int = 0
+    port: int = Field(0, ge=0)
     _client: Optional[smtplib.SMTP] = PrivateAttr(None)
 
     @validator("port", always=True)

test/test_senders/test_smtp.py

@@ -8,6 +8,7 @@
 from pytest_mock import MockerFixture
 from smtpdfix import SMTPDFix
 from outgoing import from_dict
+from outgoing.errors import InvalidConfigError
 from outgoing.senders.smtp import SMTPSender
 
 smtpdfix_headers = ["x-mailfrom", "x-peer", "x-rcptto"]
@@ -70,7 +71,7 @@ def test_smtp_construct_no_ssl(monkeypatch: pytest.MonkeyPatch, tmp_path: Path)
     assert sender._client is None
 
 
-def test_smtp_construct_ssl(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
+def test_smtp_construct_ssl(tmp_path: Path) -> None:
     (tmp_path / "secret").write_text("12345\n")
     sender = from_dict(
         {
@@ -124,9 +125,7 @@ def test_smtp_construct_starttls(
 
 
 @pytest.mark.parametrize("ssl", [False, True, "starttls"])
-def test_smtp_construct_explicit_port(
-    monkeypatch: pytest.MonkeyPatch, ssl: Union[bool, str], tmp_path: Path
-) -> None:
+def test_smtp_construct_explicit_port(ssl: Union[bool, str], tmp_path: Path) -> None:
     sender = from_dict(
         {
             "method": "smtp",
@@ -148,6 +147,18 @@ def test_smtp_construct_explicit_port(
     }
 
 
+def test_smtp_construct_negative_port(tmp_path: Path) -> None:
+    with pytest.raises(InvalidConfigError):
+        from_dict(
+            {
+                "method": "smtp",
+                "host": "mx.example.com",
+                "port": -1,
+            },
+            configpath=str(tmp_path / "foo.txt"),
+        )
+
+
 def test_smtp_send_no_ssl_no_auth(
     mocker: MockerFixture, test_email1: EmailMessage
 ) -> None: