cqrenet/relay
4
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-20 12:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

dictproxy: make NOCREATE_FILE a constant; log warning if creating account fails

Browse Source
This commit is contained in:
missytake
2023-10-17 20:02:45 +02:00
parent 45fe8a668b
commit f333226abe
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
chatmaild/src/chatmaild/dictproxy.py
View File

@@ -1,3 +1,4 @@
import logging
import os import os
import sys import sys
import json import json
@@ -11,6 +12,8 @@ import subprocess
from .database import Database from .database import Database
NOCREATE_FILE = "/etc/chatmail-nocreate"
def encrypt_password(password: str): def encrypt_password(password: str):
password = password.encode("ascii") password = password.encode("ascii")
@@ -27,10 +30,12 @@ def encrypt_password(password: str):
def create_user(db, user, password): def create_user(db, user, password):
if not os.path.exists("/tmp/nocreate"): if os.path.exists(NOCREATE_FILE):
with db.write_transaction() as conn: logging.warning(f"Didn't create account: {NOCREATE_FILE} exists. Delete the file to enable account creation.")
conn.create_user(user, password) return
return dict(home=f"/home/vmail/{user}", uid="vmail", gid="vmail", password=password) with db.write_transaction() as conn:
conn.create_user(user, password)
return dict(home=f"/home/vmail/{user}", uid="vmail", gid="vmail", password=password)
def get_user_data(db, user): def get_user_data(db, user):

13
chatmaild/src/chatmaild/test_doveauth.py
View File

@@ -2,6 +2,7 @@ import os
import pytest import pytest
import chatmaild.dictproxy
from .dictproxy import get_user_data, lookup_passdb from .dictproxy import get_user_data, lookup_passdb
from .database import Database, DBError from .database import Database, DBError
@@ -14,8 +15,9 @@ def db(tmpdir):
def test_basic(db): def test_basic(db):
if os.path.exists("/tmp/nocreate"): chatmaild.dictproxy.NOCREATE_FILE = "/tmp/nocreate"
os.remove("/tmp/nocreate") if os.path.exists(chatmaild.dictproxy.NOCREATE_FILE):
os.remove(chatmaild.dictproxy.NOCREATE_FILE)
lookup_passdb(db, "link2xt@c1.testrun.org", "asdf") lookup_passdb(db, "link2xt@c1.testrun.org", "asdf")
data = get_user_data(db, "link2xt@c1.testrun.org") data = get_user_data(db, "link2xt@c1.testrun.org")
assert data assert data
@@ -31,12 +33,13 @@ def test_dont_overwrite_password_on_wrong_login(db):
def test_nocreate_file(db): def test_nocreate_file(db):
with open("/tmp/nocreate", "w+") as f: chatmaild.dictproxy.NOCREATE_FILE = "/tmp/nocreate"
with open(chatmaild.dictproxy.NOCREATE_FILE, "w+") as f:
f.write("") f.write("")
assert os.path.exists("/tmp/nocreate") assert os.path.exists(chatmaild.dictproxy.NOCREATE_FILE)
lookup_passdb(db, "newuser1@something.org", "kajdlqweqwe") lookup_passdb(db, "newuser1@something.org", "kajdlqweqwe")
assert not get_user_data(db, "newuser1@something.org") assert not get_user_data(db, "newuser1@something.org")
os.remove("/tmp/nocreate") os.remove(chatmaild.dictproxy.NOCREATE_FILE)
def test_db_version(db): def test_db_version(db):