[pbs-devel] [PATCH proxmox-backup] d/postinst: always fixup termproxy user id and for all users

[pbs-devel] [PATCH proxmox-backup] d/postinst: always fixup termproxy user id and for all users

[Stefan Reiter]

Anyone with a PAM account and Sys.Console access could have started a
termproxy session, adapt the regex.

Always test for broken entries and run the sed expression to make sure
eventually all occurences of the broken syntax are fixed.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
 debian/postinst | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/postinst b/debian/postinst
index 9ab78798..adf49da6 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -15,11 +15,10 @@ case "$1" in
 	fi
 	deb-systemd-invoke $_dh_action proxmox-backup.service proxmox-backup-proxy.service >/dev/null || true
 
-	if test -n "$2"; then
-		if dpkg --compare-versions "$2" 'le' '0.8.10-1'; then
-			echo "Fixing up termproxy user id in task log..."
-			flock -w 30 /var/log/proxmox-backup/tasks/active.lock sed -i 's/:termproxy::root: /:termproxy::root@pam: /' /var/log/proxmox-backup/tasks/active
-		fi
+	# FIXME: Remove in future version once we're sure no broken entries remain in anyone's files
+	if grep -q -e ':termproxy::[^@]\+: ' /var/log/proxmox-backup/tasks/active; then
+	    echo "Fixing up termproxy user id in task log..."
+	    flock -w 30 /var/log/proxmox-backup/tasks/active.lock sed -i 's/:termproxy::\([^@]\+\): /:termproxy::\1@pam: /' /var/log/proxmox-backup/tasks/active
 	fi
     ;;
 
-- 
2.20.1

[pbs-devel] applied: [PATCH proxmox-backup] d/postinst: always fixup termproxy user id and for all users

[Thomas Lamprecht]

On 01.09.20 16:50, Stefan Reiter wrote:
> Anyone with a PAM account and Sys.Console access could have started a
> termproxy session, adapt the regex.
> 
> Always test for broken entries and run the sed expression to make sure
> eventually all occurences of the broken syntax are fixed.
> 
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
>  debian/postinst | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
>

applied, thanks!