osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/36666?usp=email )

Change subject: .deb/.rpm: various fixes related to non-root ......................................................................

.deb/.rpm: various fixes related to non-root

* Explicitly chown /var/lib/osmocom to osmocom:osmocom, instead of relying on systemd to do it when the service starts up. This does not work with the systemd versions in debian 10 and almalinux 8. * deb: Use "useradd" instead of the interactive "adduser" perl script from Debian. This makes it consistent with how we do it in rpm, and avoids the dependency on "adduser". * deb: Consistently use tabs through the file, instead of mixing tabs and spaces. * deb: Remove support for the "dpkg-statoverride --list" logic. This seems to be a rather obscure feature to override permissions for certain files or directories, for which it does not seem to be a good idea to make the postinst script less maintainable. Something similar can be achieved by using your own Osmocom config file in a different path with different permissions.

Related: OS#4107 Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade --- M contrib/osmo-upf.spec.in M debian/control M debian/postinst 3 files changed, 50 insertions(+), 32 deletions(-)

Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve

diff --git a/contrib/osmo-upf.spec.in b/contrib/osmo-upf.spec.in index fb8438c..bc6c5ed 100644 --- a/contrib/osmo-upf.spec.in +++ b/contrib/osmo-upf.spec.in @@ -84,6 +84,8 @@ chmod 0660 /etc/osmocom/osmo-upf.cfg chown root:osmocom /etc/osmocom chmod 2775 /etc/osmocom +mkdir -p /var/lib/osmocom +chown -R osmocom:osmocom /var/lib/osmocom

%check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) diff --git a/debian/control b/debian/control index 7681c46..5c26faf 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Package: osmo-upf Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, adduser +Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoUPF: Osmocom User Plane Function

Package: osmo-upf-dbg diff --git a/debian/postinst b/debian/postinst index a84d9b2..4310e7e 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,28 @@ #!/bin/sh -e -# Create 'osmocom' user and group (if it doesn't exist yet) and adjust permissions -# of directories which are not automatically adjusted by systemd from previous (root-owned) -# install. - -# N. B: the user is intentionally NOT removed during package uninstall: -# see https://wiki.debian.org/AccountHandlingInMaintainerScripts for reasoning. -chperms() { - # chperms <user> <group> <perms> <file> - if ! OVERRIDE=`dpkg-statoverride --list $4 2>&1`; then - if [ -e $4 ]; then - chown $1:$2 $4 - chmod $3 $4 - fi - fi -} - case "$1" in - configure) - if ! getent passwd osmocom > /dev/null; then - adduser --quiet \ - --system \ - --group \ - --no-create-home \ - --disabled-password \ - --home /var/lib/osmocom \ - --gecos "Open Source Mobile Communications" \ - osmocom - fi -# Set permissions according to https://www.debian.org/doc/debian-policy/ch-files.html#s-permissions-owners - chperms osmocom osmocom 0660 /etc/osmocom/osmo-upf.cfg - chperms root osmocom 2775 /etc/osmocom + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi

- ;; + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo-upf.cfg + chmod 0660 /etc/osmocom/osmo-upf.cfg + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmocom + chown -R osmocom:osmocom /var/lib/osmocom + ;; esac

# dh_installdeb(1) will replace this with shell code automatically