Remove authentication logs from dictproxy

They log the passwords and make it difficult to spot actual exceptions.
nginx: move config to own directory
2026-05-10 16:04:37 +00:00 · 2023-11-07 19:15:59 +00:00 · 2023-11-05 01:32:21 +01:00 · 2023-11-01 23:15:25 +01:00
8 changed files with 69 additions and 5 deletions
--- a/chatmaild/src/chatmaild/dictproxy.py
+++ b/chatmaild/src/chatmaild/dictproxy.py
@@ -82,7 +82,6 @@ def lookup_passdb(db, user, cleartext_password):


 def handle_dovecot_request(msg, db, mail_domain):
-    print(f"received msg: {msg!r}", file=sys.stderr)
    short_command = msg[0]
    if short_command == "L":  # LOOKUP
        parts = msg[1:].split("\t")
@@ -105,7 +104,6 @@ def handle_dovecot_request(msg, db, mail_domain):
                    reply_command = "O"
                else:
                    reply_command = "N"
-        print(f"res: {res!r}", file=sys.stderr)
        json_res = json.dumps(res) if res else ""
        return f"{reply_command}{json_res}\n"
    return None
@@ -130,7 +128,6 @@ def main():
                    break
                res = handle_dovecot_request(msg, db, mail_domain)
                if res:
-                    print(f"sending result: {res!r}", file=sys.stderr)
                    self.wfile.write(res.encode("ascii"))
                    self.wfile.flush()

--- a/deploy-chatmail/src/deploy_chatmail/init.py
+++ b/deploy-chatmail/src/deploy_chatmail/init.py
@@ -202,7 +202,7 @@ def _configure_nginx(domain: str, debug: bool = False) -> bool:
    need_restart = False

    main_config = files.template(
-        src=importlib.resources.files(__package__).joinpath("nginx.conf.j2"),
+        src=importlib.resources.files(__package__).joinpath("nginx/nginx.conf.j2"),
        dest="/etc/nginx/nginx.conf",
        user="root",
        group="root",
@@ -212,7 +212,7 @@ def _configure_nginx(domain: str, debug: bool = False) -> bool:
    need_restart |= main_config.changed

    autoconfig = files.template(
-        src=importlib.resources.files(__package__).joinpath("autoconfig.xml.j2"),
+        src=importlib.resources.files(__package__).joinpath("nginx/autoconfig.xml.j2"),
        dest="/var/www/html/.well-known/autoconfig/mail/config-v1.1.xml",
        user="root",
        group="root",
@@ -277,6 +277,12 @@ def deploy_chatmail(mail_domain: str, mail_server: str, dkim_selector: str) -> N
    opendkim_need_restart = _configure_opendkim(mail_domain, dkim_selector)
    nginx_need_restart = _configure_nginx(mail_domain)

+    # deploy web pages and info if we have them
+    pkg_root = importlib.resources.files(__package__)
+    www_path = pkg_root.joinpath(f"../../../www/{mail_domain}").resolve()
+    if www_path.is_dir():
+        files.rsync(f"{www_path}/", "/var/www/html", flags=["-avz"])
+
    systemd.service(
        name="Start and enable OpenDKIM",
        service="opendkim.service",
--- a/deploy-chatmail/src/deploy_chatmail/nginx/autoconfig.xml.j2
+++ b/deploy-chatmail/src/deploy_chatmail/nginx/autoconfig.xml.j2
--- a/deploy-chatmail/src/deploy_chatmail/nginx/nginx.conf.j2
+++ b/deploy-chatmail/src/deploy_chatmail/nginx/nginx.conf.j2
--- a/www/nine.testrun.org/collage-bg.png
+++ b/www/nine.testrun.org/collage-bg.png
--- a/www/nine.testrun.org/collage-down.png
+++ b/www/nine.testrun.org/collage-down.png
--- a/www/nine.testrun.org/collage-top.png
+++ b/www/nine.testrun.org/collage-top.png
--- a/www/nine.testrun.org/index.html
+++ b/www/nine.testrun.org/index.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>nine.testrun.org - Experimenting with the Future of Email</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style>
+        .wrapper {
+            width: 100%;
+            max-width: 596px;
+            margin: 0 auto;
+        }
+
+        .section {
+            width: 100%;
+            max-width: 596px;
+        }
+
+        .text {
+            box-sizing: border-box;
+            padding: 9px;
+            font-size: 18px;
+            font-family: "Courier New", monospace;
+            color: white;
+            background-position: left top;
+            background-image: url(collage-bg.png);
+            background-repeat: no-repeat;
+            background-size: 100% 100%;
+        }
+        h1, h2, h3 {
+            font-size: 16px;
+            font-weight: bold;
+        }
+    </style>
+</head>
+<body>
+    <div class="wrapper">
+        <img class="section" src="collage-top.png" />
+        <div class="section text">
+            <h1>welcome  to nine.testrun.org</h1>
+            <p>
+                to get an account,
+                invent a word with <i>exactly</i> nine characters
+                and append @nine.testrun.org to it.
+                eg. <b>hellofits@nine.testrun.org</b>
+            </p>
+            <p>
+                if the email address is not yet taken, you'll get that account.
+                the first login sets your password.
+                that's it.
+            </p>
+        </div>
+        <img class="section" src="collage-down.png" />
+        <div class="section text">
+            <h1>faq</h1>
+            <p><i>why are other email providers 1000 times more complicated?</i></p>
+            <p>because they want to for $reasons</p>
+        </div>
+    </div>
+</body>
+</html>
Author	SHA1	Message	Date
link2xt	4c9e8d40b4	Remove authentication logs from dictproxy They log the passwords and make it difficult to spot actual exceptions.	2023-11-07 19:15:59 +00:00
missytake	40a88c7fc6	nginx: move config to own directory	2023-11-05 01:32:21 +01:00
holger krekel	8791e7735d	simplify history of nine branch	2023-11-01 23:15:25 +01:00