From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pmg-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 3E5D61FF2F6
for <inbox@lore.proxmox.com>; Wed, 29 May 2024 16:13:16 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id B196C7EA8;
Wed, 29 May 2024 16:13:40 +0200 (CEST)
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
To: pmg-devel@lists.proxmox.com
Date: Wed, 29 May 2024 16:13:03 +0200
Message-Id: <20240529141303.553602-10-m.sandoval@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240529141303.553602-1-m.sandoval@proxmox.com>
References: <20240529141303.553602-1-m.sandoval@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.122 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
POISEN_SPAM_PILL 0.1 Meta: its spam
POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes
POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
T_SCC_BODY_TEXT_LINE -0.01 -
Subject: [pmg-devel] [PATCH pmg-api v2 9/9] fix #4926: run pmg-smtp-filter
and pmgpolicy without root rights
X-BeenThere: pmg-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Mail Gateway development discussion
<pmg-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/>
List-Post: <mailto:pmg-devel@lists.proxmox.com>
List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pmg-devel-bounces@lists.proxmox.com
Sender: "pmg-devel" <pmg-devel-bounces@lists.proxmox.com>
New users 'pmg-smpt-filter' and 'pmgpolicy' are created for their
respective processes and we set their systemd units to use them.
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
debian/pmg-smtp-filter.service | 2 ++
debian/pmgpolicy.service | 2 ++
debian/postinst | 28 ++++++++++++++++++++++++++++
3 files changed, 32 insertions(+)
diff --git a/debian/pmg-smtp-filter.service b/debian/pmg-smtp-filter.service
index c887dc2..c4d5e38 100644
--- a/debian/pmg-smtp-filter.service
+++ b/debian/pmg-smtp-filter.service
@@ -16,6 +16,8 @@ Type=forking
Restart=on-abort
RestartSec=10
RuntimeDirectory=pmg-smtp-filter
+User=pmg-smtp-filter
+Group=pmg-smtp-filter
[Install]
WantedBy=multi-user.target
diff --git a/debian/pmgpolicy.service b/debian/pmgpolicy.service
index 21a403f..cd8ee60 100644
--- a/debian/pmgpolicy.service
+++ b/debian/pmgpolicy.service
@@ -13,6 +13,8 @@ ExecReload=/bin/kill -HUP $MAINPID
PIDFile=/run/pmgpolicy/pmgpolicy.pid
Type=forking
RuntimeDirectory=pmgpolicy
+User=pmgpolicy
+Group=pmgpolicy
[Install]
WantedBy=multi-user.target
diff --git a/debian/postinst b/debian/postinst
index 716a5af..a00c99b 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -50,6 +50,8 @@ migrate_apt_auth_conf() {
migrate_pmg_smtp_filter() {
PMG_GROUP="pmg"
+ PMGPOLICY_USER="pmgpolicy"
+ PMG_SMTP_FILTER_USER="pmg-smtp-filter"
# Add shared pmg group for shared functionality, e.g. rrdcached
if ! getent group | grep -q "^$PMG_GROUP:" ; then
@@ -58,6 +60,32 @@ migrate_pmg_smtp_filter() {
echo "..done"
fi
+ for user in $PMGPOLICY_USER $PMG_SMTP_FILTER_USER; do
+ if ! getent passwd | grep -q "^$user:"; then
+ echo -n "Adding system user $user.."
+ adduser --quiet \
+ --system \
+ --no-create-home \
+ --disabled-password \
+ --home /nonexistent \
+ --group \
+ $user 2>/dev/null || true
+ echo "..done"
+ fi
+
+ if ! getent group $PMG_GROUP | grep -q "$user"; then
+ echo -n "Adding user $user to $PMG_GROUP group.."
+ adduser --quiet $user $PMG_GROUP 2>/dev/null ||true
+ echo "..done"
+ fi
+
+ if ! getent group systemd-journal | grep -q $user ; then
+ echo -n "Adding user $user to systemd-journal group.."
+ adduser --quiet $user systemd-journal 2>/dev/null ||true
+ echo "..done"
+ fi
+ done
+
chown :pmg /var/spool/pmg/active
chown :pmg /var/spool/pmg/virus
chown :pmg /var/spool/pmg/spam
--
2.39.2
_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel