From 862b09d26848b806034baad16f8029925a807c3d Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Sun, 15 Oct 2023 19:54:29 +0000
Subject: [PATCH] dovecot: enable authentication cache

---
 chatmaild/src/chatmaild/dictproxy.py                        | 4 ++--
 deploy-chatmail/src/deploy_chatmail/dovecot/auth.conf       | 4 ++--
 deploy-chatmail/src/deploy_chatmail/dovecot/dovecot.conf.j2 | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/chatmaild/src/chatmaild/dictproxy.py b/chatmaild/src/chatmaild/dictproxy.py
index c36894ef..b398778e 100644
--- a/chatmaild/src/chatmaild/dictproxy.py
+++ b/chatmaild/src/chatmaild/dictproxy.py
@@ -59,7 +59,7 @@ def handle_dovecot_request(msg, db):
     if short_command == "L":  # LOOKUP
         parts = msg[1:].split("\t")
         keyname, user = parts[:2]
-        namespace, type, arg = keyname.split("/", 3)
+        namespace, type, *args = keyname.split("/")
         reply_command = "F"
         res = ""
         if namespace == "shared":
@@ -70,7 +70,7 @@ def handle_dovecot_request(msg, db):
                 else:
                     reply_command = "N"
             elif type == "passdb":
-                res = lookup_passdb(db, user, password=arg)
+                res = lookup_passdb(db, user, password=args[0])
                 if res:
                     reply_command = "O"
                 else:
diff --git a/deploy-chatmail/src/deploy_chatmail/dovecot/auth.conf b/deploy-chatmail/src/deploy_chatmail/dovecot/auth.conf
index ecc36e91..0664f70b 100644
--- a/deploy-chatmail/src/deploy_chatmail/dovecot/auth.conf
+++ b/deploy-chatmail/src/deploy_chatmail/dovecot/auth.conf
@@ -1,5 +1,5 @@
 uri = proxy:/run/dovecot/doveauth.socket:auth
 iterate_disable = yes
 default_pass_scheme = plain
-password_key = passdb/%w
-user_key = userdb/%u
\ No newline at end of file
+password_key = passdb/%w/%u
+user_key = userdb/%u
diff --git a/deploy-chatmail/src/deploy_chatmail/dovecot/dovecot.conf.j2 b/deploy-chatmail/src/deploy_chatmail/dovecot/dovecot.conf.j2
index ddb59e84..6e1b9a05 100644
--- a/deploy-chatmail/src/deploy_chatmail/dovecot/dovecot.conf.j2
+++ b/deploy-chatmail/src/deploy_chatmail/dovecot/dovecot.conf.j2
@@ -8,6 +8,7 @@ auth_verbose = yes
 auth_debug = yes
 auth_debug_passwords = yes
 auth_verbose_passwords = plain
+auth_cache_size = 100M
 
 # Authentication for system users.
 passdb {