Compare commits

..

1 Commits

Author SHA1 Message Date
link2xt
d407c2ad6a Add NOTIFY capability
Delta Chat does not use it now,
but should: <https://github.com/deltachat/deltachat-core-rust/issues/4983>
Having no capability will confuse whoever develops it.
2023-11-12 04:30:52 +00:00
8 changed files with 31 additions and 56 deletions

View File

@@ -81,11 +81,10 @@ comprised of minimal setups of
as well as two custom services that are integrated with these two: as well as two custom services that are integrated with these two:
- `chatmaild/src/chatmaild/doveauth.py` implements - `chatmaild/src/chatmaild/dictproxy.py` implements
create-on-login account creation semantics and is used create-on-login account creation semantics and is used
by Dovecot during login authentication and by Postfix by Dovecot during login authentication and by Postfix
which in turn uses [Dovecot SASL](https://doc.dovecot.org/configuration_manual/authentication/dict/#complete-example-for-authenticating-via-a-unix-socket) which in turn uses Dovecot SASL to authenticate users
to authenticate users
to send mails for them. to send mails for them.
- `chatmaild/src/chatmaild/filtermail.py` prevents - `chatmaild/src/chatmaild/filtermail.py` prevents

View File

@@ -10,7 +10,7 @@ dependencies = [
] ]
[project.scripts] [project.scripts]
doveauth = "chatmaild.doveauth:main" doveauth-dictproxy = "chatmaild.dictproxy:main"
filtermail = "chatmaild.filtermail:main" filtermail = "chatmaild.filtermail:main"
[tool.pytest.ini_options] [tool.pytest.ini_options]

View File

@@ -2,7 +2,7 @@
Description=Dict authentication proxy for dovecot Description=Dict authentication proxy for dovecot
[Service] [Service]
ExecStart=/usr/local/bin/doveauth /run/dovecot/doveauth.socket vmail /home/vmail/passdb.sqlite ExecStart=/usr/local/bin/doveauth-dictproxy /run/dovecot/doveauth.socket vmail /home/vmail/passdb.sqlite
Restart=always Restart=always
RestartSec=30 RestartSec=30

View File

@@ -7,7 +7,6 @@ from pathlib import Path
from pyinfra import host from pyinfra import host
from pyinfra.operations import apt, files, server, systemd from pyinfra.operations import apt, files, server, systemd
from pyinfra.facts.files import File from pyinfra.facts.files import File
from pyinfra.facts.systemd import SystemdEnabled
from .acmetool import deploy_acmetool from .acmetool import deploy_acmetool
@@ -35,17 +34,8 @@ def _install_chatmaild() -> None:
commands=[f"pip install --break-system-packages {remote_path}"], commands=[f"pip install --break-system-packages {remote_path}"],
) )
# disable legacy doveauth-dictproxy.service
if host.get_fact(SystemdEnabled).get("doveauth-dictproxy.service"):
systemd.service(
name="Disable legacy doveauth-dictproxy.service",
service="doveauth-dictproxy.service",
running=False,
enabled=False,
)
for fn in ( for fn in (
"doveauth", "doveauth-dictproxy",
"filtermail", "filtermail",
): ):
files.put( files.put(

View File

@@ -15,6 +15,6 @@ _submission._tcp.$CHATMAIL_DOMAIN. SRV 0 1 587 $CHATMAIL_DOMAIN.
_submissions._tcp.$CHATMAIL_DOMAIN. SRV 0 1 465 $CHATMAIL_DOMAIN. _submissions._tcp.$CHATMAIL_DOMAIN. SRV 0 1 465 $CHATMAIL_DOMAIN.
_imap._tcp.$CHATMAIL_DOMAIN. SRV 0 1 143 $CHATMAIL_DOMAIN. _imap._tcp.$CHATMAIL_DOMAIN. SRV 0 1 143 $CHATMAIL_DOMAIN.
_imaps._tcp.$CHATMAIL_DOMAIN. SRV 0 1 993 $CHATMAIL_DOMAIN. _imaps._tcp.$CHATMAIL_DOMAIN. SRV 0 1 993 $CHATMAIL_DOMAIN.
$CHATMAIL_DOMAIN. IN CAA 128 issue "letsencrypt.org; accounturi=$ACME_ACCOUNT_URL" $CHATMAIL_DOMAIN. IN CAA 0 issue "letsencrypt.org; accounturi=$ACME_ACCOUNT_URL"
EOF EOF
$SSH opendkim-genzone -F | sed 's/^;.*$//;/^$/d' $SSH opendkim-genzone -F | sed 's/^;.*$//;/^$/d'

View File

@@ -5,8 +5,8 @@ import threading
import queue import queue
import traceback import traceback
import chatmaild.doveauth import chatmaild.dictproxy
from chatmaild.doveauth import get_user_data, lookup_passdb, handle_dovecot_request from chatmaild.dictproxy import get_user_data, lookup_passdb, handle_dovecot_request
from chatmaild.database import Database, DBError from chatmaild.database import Database, DBError
@@ -30,7 +30,7 @@ def test_dont_overwrite_password_on_wrong_login(db):
def test_nocreate_file(db, monkeypatch, tmpdir): def test_nocreate_file(db, monkeypatch, tmpdir):
p = tmpdir.join("nocreate") p = tmpdir.join("nocreate")
p.write("") p.write("")
monkeypatch.setattr(chatmaild.doveauth, "NOCREATE_FILE", str(p)) monkeypatch.setattr(chatmaild.dictproxy, "NOCREATE_FILE", str(p))
lookup_passdb(db, "newuser1@something.org", "zequ0Aimuchoodaechik") lookup_passdb(db, "newuser1@something.org", "zequ0Aimuchoodaechik")
assert not get_user_data(db, "newuser1@something.org") assert not get_user_data(db, "newuser1@something.org")

View File

@@ -20,14 +20,15 @@
box-sizing: border-box; box-sizing: border-box;
padding: 9px; padding: 9px;
font-size: 18px; font-size: 18px;
font-family: "Swansea", "Helvetica", sans-serif; font-family: "Courier New", monospace;
color: black; color: white;
} background-position: left top;
a { background-image: url(collage-bg.png);
color: black; background-repeat: no-repeat;
background-size: 100% 100%;
} }
h1, h2, h3 { h1, h2, h3 {
font-size: 18px; font-size: 16px;
font-weight: bold; font-weight: bold;
} }
</style> </style>
@@ -36,39 +37,24 @@
<div class="wrapper"> <div class="wrapper">
<img class="section" src="collage-top.png" /> <img class="section" src="collage-top.png" />
<div class="section text"> <div class="section text">
<h1>Dear Delta Chat users and newcomers,</h1> <h1>welcome to nine.testrun.org</h1>
<p> <p>
welcome to the first public "chat-mail instance", to get an account,
a small and lean e-mail provider for smooth chatting. invent a word with <i>exactly</i> nine characters
Install Delta Chat or add an account: and append @nine.testrun.org to it.
<ul> eg. <b>hellofits@nine.testrun.org</b>
<li>Tap "LOG INTO YOUR E-MAIL ACCOUNT".</li>
<li>Address: invent a word with <i>exactly</i> nine characters
and append @nine.testrun.org to it.</li>
<li>Password: invent at least 10 characters. The first login sets your password.</li>
</ul>
If the e-mail address is not yet taken, you'll get that account.
</p> </p>
<p> <p>
<img class="section" src="collage-down.png" /> if the email address is not yet taken, you'll get that account.
the first login sets your password.
<h2>What's behind it, how does it operate?</h2> that's it.
<p>nine.testrun.org is run </p>
by a small group of devs and sysadmins, reachable via root@. </div>
They want to keep this instance running at least until end 2024. <img class="section" src="collage-down.png" />
Current limits: <div class="section text">
<ul> <h1>faq</h1>
<li>Un-encrypted mails can not leave the chat-mail instance.</li> <p><i>why are other email providers 1000 times more complicated?</i></p>
<li>Use <a href="https://delta.chat/en/help#howtoe2ee"> <p>because they want to for $reasons</p>
guaranteed end-to-end encryption via QR code scans</a>
to setup contact with users outside of the chat-mail instance.
</li>
<li>You may send up to 60 messages per minute.</li>
<li>Messages are unconditionally removed 40 days after arrival.</li>
<li>Max storage per user is 100MB.</li>
</ul>
<h2>Why are other email providers 1000 times more complicated?</h2>
<p>¯\_(ツ)_/¯</p>
</div> </div>
</div> </div>
</body> </body>