From 7f169c3896e31b1d36bf836e4a7cbe96b84c2c08 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Fri, 26 Apr 2024 22:08:09 +0200
Subject: [PATCH] can not disable plaintext auth yet, breaks sieve

---
 Containerfile                                 | 73 -------------------
 rootfs/etc/confd/templates/10-auth.conf.tmpl  |  2 +-
 .../confd/templates/20-managesieve.conf.tmpl  |  1 -
 3 files changed, 1 insertion(+), 75 deletions(-)

diff --git a/Containerfile b/Containerfile
index 2db4075..474d34c 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,71 +1,5 @@
-# FROM docker.io/alpine:3.19 as builder
-#
-# RUN apk --no-cache add \
-#   rpcgen \
-#   g++ \
-#   make \
-#   openssl \
-#   openssl-dev \
-#   lua5.1-dev \
-#   libsodium-dev \
-#   linux-pam-dev \
-#   zlib-dev \
-#   bzip2-dev \
-#   xz-dev \
-#   lz4-dev \
-#   icu-dev \
-#   inotify-tools-dev
-#
-# ENV SHA256_SUM_DOVECOT=05b11093a71c237c2ef309ad587510721cc93bbee6828251549fc1586c36502d
-# ENV DOVECOT_FILENAME=dovecot-2.3.21.tar.gz
-# RUN wget https://www.dovecot.org/releases/2.3/$DOVECOT_FILENAME
-# RUN echo "$SHA256_SUM_DOVECOT  $DOVECOT_FILENAME" | sha256sum -c - || exit 1
-# RUN mkdir /tmp/dovecot
-# RUN tar xzf $DOVECOT_FILENAME -C /tmp/dovecot --strip 1
-#
-# ENV SHA256_SUM_PIGEONHOLE=1ca71d2659076712058a72030288f150b2b076b0306453471c5261498d3ded27
-# ENV PIGEONHOLE_FILENAME=dovecot-2.3-pigeonhole-0.5.21.tar.gz
-# RUN wget https://pigeonhole.dovecot.org/releases/2.3/$PIGEONHOLE_FILENAME
-# RUN echo "$SHA256_SUM_PIGEONHOLE  $PIGEONHOLE_FILENAME" | sha256sum -c - || exit 1
-# RUN mkdir /tmp/pigeonhole
-# RUN tar xzf $PIGEONHOLE_FILENAME -C /tmp/pigeonhole --strip 1
-#
-# RUN cd /tmp/dovecot && \
-#   ./configure --prefix '' \
-#   --with-notify=inotify \
-#   --with-lua \
-#   --with-zlib \
-#   --with-bzlib \
-#   --with-pam \
-#   --with-ssl=openssl \
-#   --with-sodium \
-#   --without-sql \
-#   --with-lzma \
-#   --with-lz4 \
-#   --with-icu \
-#   --without-shadow \
-#   --with-ssldir=/etc/ssl/mail \
-#   --with-rundir=/run/dovecot \
-#   --disable-static && \
-#   make && \
-#   make install
-#
-# RUN cd /tmp/pigeonhole && \
-#   ./configure --prefix '' \
-#   --with-dovecot=/lib/dovecot \
-#   --disable-static && \
-#   make && make install
-
 FROM docker.io/thallian/confd-env:3.19-3.1.6.2
 
-# COPY --from=builder /lib/dovecot/ /lib/dovecot/
-# COPY --from=builder /libexec/dovecot/ /libexec/dovecot/
-# COPY --from=builder /bin/doveadm /bin/doveadm
-# COPY --from=builder /bin/doveconf /bin/doveconf
-# COPY --from=builder /bin/dsync /bin/dsync
-# COPY --from=builder /sbin/dovecot /sbin/dovecot
-# COPY --from=builder /bin/sieve* /bin/
-
 RUN apk --no-cache add \
   ssmtp \
   dovecot \
@@ -73,13 +7,6 @@ RUN apk --no-cache add \
   dovecot-lmtpd \
   dovecot-pigeonhole-plugin
 
-
-# RUN addgroup -g 150 dovecot
-# RUN adduser -u 140 -h /dev/null -H -s /sbin/nologin -D -G dovecot dovecot
-#
-# RUN addgroup -g 151 dovenull
-# RUN adduser -u 141 -h /dev/null -H -s /sbin/nologin -D -G dovenull dovenull
-
 RUN addgroup -g 2222 access
 RUN addgroup dovecot access
 
diff --git a/rootfs/etc/confd/templates/10-auth.conf.tmpl b/rootfs/etc/confd/templates/10-auth.conf.tmpl
index 3a0bd54..8d99a1f 100644
--- a/rootfs/etc/confd/templates/10-auth.conf.tmpl
+++ b/rootfs/etc/confd/templates/10-auth.conf.tmpl
@@ -1,5 +1,5 @@
 auth_username_chars = {{getenv "ALLOWED_USERNAME_CHARS" "äöüabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@"}}
 auth_username_format ="%Ln"
 auth_mechanisms = {{getenv "AUTH_MECHANISMS" "plain login oauthbearer xoauth2"}}
-disable_plaintext_auth = yes
+disable_plaintext_auth = no
 !include auth-oauth2.conf.ext
diff --git a/rootfs/etc/confd/templates/20-managesieve.conf.tmpl b/rootfs/etc/confd/templates/20-managesieve.conf.tmpl
index ae406c3..bfcce1c 100644
--- a/rootfs/etc/confd/templates/20-managesieve.conf.tmpl
+++ b/rootfs/etc/confd/templates/20-managesieve.conf.tmpl
@@ -5,7 +5,6 @@ protocols = $protocols sieve
 service managesieve-login {
   inet_listener sieve {
     port = 4190
-	  address = localhost
   }
 
   #inet_listener sieve_deprecated {