use match statement to remove peer port

Makefile

@@ -1,10 +1,8 @@
-# Needs python3 >= 3.9, sed, git for build, docker for tests
+# Needs python3 >= 3.9, sed, git for build
 build: clean
 	python3 -m pip install -r requirements.txt --no-compile --target build
 	cp -r mail4one/ build/
 	sed -i "s/DEVELOMENT/$(shell scripts/get_version.sh)/" build/mail4one/version.py
-	find build -name "*.pyi" -o -name "py.typed" | xargs -I typefile rm typefile
-	rm -rf build/bin
 	rm -rf build/mail4one/__pycache__
 	rm -rf build/*.dist-info
 	python3 -m zipapp \
@@ -20,13 +18,11 @@ clean:
 docker-tests:
 	docker run --pull=always -v `pwd`:/app -w /app --rm python:3.11-alpine sh scripts/runtests.sh
 	docker run --pull=always -v `pwd`:/app -w /app --rm python:3.10-alpine sh scripts/runtests.sh
-	docker run --pull=always -v `pwd`:/app -w /app --rm python:3.12        sh scripts/runtests.sh
 	docker run --pull=always -v `pwd`:/app -w /app --rm python:3.11        sh scripts/runtests.sh
 	docker run --pull=always -v `pwd`:/app -w /app --rm python:3.10        sh scripts/runtests.sh
 	docker run --pull=always -v `pwd`:/app -w /app --rm python:3.9         sh scripts/runtests.sh
 
 # ============================================================================
-# Below targets for devs. Need pipenv, black installed
 
 requirements.txt: Pipfile.lock
 	pipenv requirements > requirements.txt
@@ -42,11 +38,6 @@ setup:
 cleanup:
 	pipenv --rm
 
-update:
-	rm requirements.txt Pipfile.lock
-	pipenv update
-	pipenv requirements > requirements.txt
-
 shell:
 	MYPYPATH=`pipenv --venv`/lib/python3.11/site-packages pipenv shell
 	

Pipfile.lock

@@ -22,7 +22,6 @@
                 "sha256:f9243b7dfe00aaf567da8728d891752426b51392174a34d2cf5c18053b63dcbc"
             ],
             "index": "pypi",
-            "markers": "python_version ~= '3.7'",
             "version": "==1.4.4.post2"
         },
         "atpublic": {
@@ -35,11 +34,11 @@
         },
         "attrs": {
             "hashes": [
-                "sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30",
-                "sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1"
+                "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04",
+                "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==23.2.0"
+            "version": "==23.1.0"
         },
         "python-jata": {
             "hashes": [
@@ -47,7 +46,6 @@
                 "sha256:ff4cd7ca75c9a8306b69ef6e878c296a5602f3279c6f9a82b6105b8eba764760"
             ],
             "index": "pypi",
-            "markers": "python_version >= '3.8'",
             "version": "==1.2"
         }
     },

README.md

@@ -1,6 +1,6 @@
 # Mail4one
 
-Personal mail server for a single user or a small family. Written in pure python with [minimal dependencies](Pipfile).
+Personal mail server for a single user or a small family. Written in pure python with minimal dependencies.
 Designed for dynamic alias based workflow where a different alias is used for each purpose.
 
 # Getting started
@@ -23,7 +23,7 @@ Mail4one only takes care of receiving and serving email. For sending email, use
 
 Most of them have generous free tier which is more than enough for personal use.
 
-Sending email is tricky. Even if everything is correctly setup (DMARC, DKIM, SPF), popular email vendors like google, microsoft may mark emails sent from your IP as spam for no reason. Hence using a dedicated service is the only reliable way to send emails.
+Sending email is tricky. Even if everything is correctly setup (DMARC, DKIM, SPF), popular email vendors like google, microsoft may mark emails sent from your IP as spam for no reason.
 
 # Community
 
@@ -62,7 +62,7 @@ This should generate `mail4one.pyz` in current folder. This is a [executable pyt
 * Write dedicated documentation
 * Test with more email clients ([Thunderbird](https://www.thunderbird.net/) and [k9mail](https://k9mail.app/) are tested now)
 * IMAP support
-* Web UI for editing config ([WIP](https://github.com/mail4one/mail4one/tree/webform))
+* Web UI for editing config
 * Support email submission from client to forward to other senders or direct delivery
 * Optional SPAM filtering
 * Optional DMARC,SPF,DKIM verification

deploy_configs/mail4one_cert_copy.sh

@@ -2,11 +2,13 @@
 
 #  certbot deploy hook to copy certificates to mail4one when renewed.
 #  Initial setup, Install certbot(https://certbot.eff.org/) and run `certbot certonly` as root
-#  Doc: https://eff-certbot.readthedocs.io/en/latest/using.html#renewing-certificates
 #
 #  This file is supposed to be copied to /etc/letsencrypt/renewal-hooks/deploy/
 #  Change the mail domain to the one on MX record
 
+set -x
+
+
 if [ "$RENEWED_DOMAINS" = "mail.mydomain.com" ]
 then
 		mkdir -p /var/lib/mail4one/certs
@@ -15,5 +17,4 @@ then
 		cp "$RENEWED_LINEAGE/fullchain.pem" /var/lib/mail4one/certs/
 		cp "$RENEWED_LINEAGE/privkey.pem" /var/lib/mail4one/certs/
 		systemctl restart mail4one.service
-		echo "$(date) Renewed and deployed certificates for mail4one" >> /var/log/mail4one-cert-renew.log
 fi

mail4one/smtp.py

@@ -25,6 +25,8 @@ logger = logging.getLogger("smtp")
 
 
 class MyHandler(AsyncMessage):
+    peer_addr: Optional[str]
+
     def __init__(self, mails_path: Path, mbox_finder: Callable[[str], list[str]]):
         super().__init__()
         self.mails_path = mails_path
@@ -34,7 +36,11 @@ class MyHandler(AsyncMessage):
         self, server: SMTPServer, session: SMTPSession, envelope: SMTPEnvelope
     ) -> str:
         self.rcpt_tos = envelope.rcpt_tos
-        self.peer = session.peer
+        match session.peer:
+            case addr, port:
+                self.peer_addr = addr
+            case _:
+                self.peer_addr = session.peer
         return await super().handle_DATA(server, session, envelope)
 
     async def handle_message(self, m: Message):  # type: ignore[override]
@@ -43,7 +49,7 @@ class MyHandler(AsyncMessage):
             for mbox in self.mbox_finder(addr.lower()):
                 all_mboxes.add(mbox)
         if not all_mboxes:
-            logger.warning(f"dropping message from: {self.peer}")
+            logger.warning(f"dropping message from: {self.peer_addr}")
             return
         for mbox in all_mboxes:
             for sub in ("new", "tmp", "cur"):
@@ -58,7 +64,7 @@ class MyHandler(AsyncMessage):
             for mbox in all_mboxes:
                 shutil.copy(temp_email_path, self.mails_path / mbox / "new")
             logger.info(
-                f"Saved mail at {filename} addrs: {','.join(self.rcpt_tos)}, mboxes: {','.join(all_mboxes)} peer: {self.peer}"
+                f"Saved mail at {filename} addrs: {','.join(self.rcpt_tos)}, mboxes: {','.join(all_mboxes)} peer: {self.peer_addr}"
             )
 
 

requirements.txt

@@ -1,5 +1,5 @@
 -i https://pypi.org/simple
-aiosmtpd==1.4.4.post2; python_version ~= '3.7'
-atpublic==4.0; python_version >= '3.8'
-attrs==23.2.0; python_version >= '3.7'
-python-jata==1.2; python_version >= '3.8'
+aiosmtpd==1.4.4.post2
+atpublic==4.0 ; python_version >= '3.8'
+attrs==23.1.0 ; python_version >= '3.7'
+python-jata==1.2

scripts/get_version.sh

@@ -8,7 +8,7 @@ then
 		tag_val=$(git describe --dirty=DIRTY --exact-match)
 		case "$tag_val" in 
 				*DIRTY)
-						echo "git-$commit-changes"
+						echo "git=$commit-changes"
 						;;
 				v*) # Only consider tags starting with v
 						echo "$tag_val"