From 735c345de62dc391da471c1f9b784b8de5f8c623 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Sat, 14 Nov 2026 20:21:57 +0100 Subject: [PATCH] avoid changing Composer file ownership during container startup Grant Composer write access through a dedicated supplementary group that remains unchanged when PUID and PGID are remapped. Preserve supplementary groups in services and CLI wrappers so plugin installation still works without making the dependency tree world-writable. Skip redundant ownership and mode changes on runtime directories while preserving symlink handling and existing recursion boundaries. Document named-user execution and check service groups and Composer permissions. --- Dockerfile | 5 +++++ README.md | 6 ++++++ rootfs/etc/s6-overlay/s6-rc.d/dispatcher/run | 2 +- rootfs/etc/s6-overlay/s6-rc.d/nginx/run | 2 +- rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run | 2 +- rootfs/etc/s6-overlay/scripts/config | 9 ++++++--- rootfs/etc/snmp/snmptrapd.conf | 2 +- rootfs/etc/syslog-ng/syslog-ng.conf | 2 +- rootfs/usr/bin/lnms | 2 +- rootfs/usr/local/bin/artisan | 2 +- test/services.sh | 9 +++++++++ 11 files changed, 33 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index f747f622..71a63815 100644 --- a/Dockerfile +++ b/Dockerfile @@ -136,6 +136,11 @@ RUN apk --update --no-cache add -t build-dependencies \ && echo "foreach (glob(\"${LIBRENMS_PATH}/config.d/*.php\") as \$filename) include \$filename;" >> config.php \ && chown -R librenms:librenms ${LIBRENMS_PATH} \ && su librenms -s /bin/sh -c "COMPOSER_CACHE_DIR=/tmp composer install --no-dev --no-interaction --no-ansi" \ + && addgroup -S librenms-composer \ + && addgroup librenms librenms-composer \ + && chgrp -R librenms-composer vendor composer.json composer.lock \ + && chmod -R g+rwX,o-w vendor composer.json composer.lock \ + && find vendor -type d -exec chmod g+s {} + \ && apk del build-dependencies \ && rm -rf .git \ html/plugins/Test \ diff --git a/README.md b/README.md index a3162ee9..e960afd5 100644 --- a/README.md +++ b/README.md @@ -404,6 +404,12 @@ will be removed and yours will be used. > [!WARNING] > Container has to be restarted to propagate changes. +For Composer-based plugins, run `lnms plugin:add` through the container's `lnms` +wrapper. Composer files are writable through the `librenms-composer` supplementary +group, which is preserved when `PUID` and `PGID` change. When running Composer +directly with `docker exec`, use `--user librenms` rather than an explicit +`UID:GID` pair so that supplementary groups are retained. + ### Additional Monitoring plugins You can add a custom Monitoring plugin in `/data/monitoring-plugins/`. diff --git a/rootfs/etc/s6-overlay/s6-rc.d/dispatcher/run b/rootfs/etc/s6-overlay/s6-rc.d/dispatcher/run index 1283176a..746462a9 100755 --- a/rootfs/etc/s6-overlay/s6-rc.d/dispatcher/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/dispatcher/run @@ -1,4 +1,4 @@ #!/command/with-contenv sh cd /opt/librenms || exit 1 -exec s6-setuidgid "${PUID}:${PGID}" execlineb -c "./librenms-service.py ${DISPATCHER_ARGS}" +exec s6-setuidgid librenms execlineb -c "./librenms-service.py ${DISPATCHER_ARGS}" diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/run b/rootfs/etc/s6-overlay/s6-rc.d/nginx/run index fe538835..32c9442e 100755 --- a/rootfs/etc/s6-overlay/s6-rc.d/nginx/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/nginx/run @@ -1,3 +1,3 @@ #!/command/with-contenv sh -exec s6-setuidgid "${PUID}:${PGID}" nginx -g "daemon off;" +exec s6-setuidgid librenms nginx -g "daemon off;" diff --git a/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run b/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run index 8cb98bd2..1ba78aaf 100755 --- a/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run @@ -1,3 +1,3 @@ #!/command/with-contenv sh -exec s6-setuidgid "${PUID}:${PGID}" php-fpm84 -F +exec s6-setuidgid librenms php-fpm84 -F diff --git a/rootfs/etc/s6-overlay/scripts/config b/rootfs/etc/s6-overlay/scripts/config index f1458afd..22f43956 100755 --- a/rootfs/etc/s6-overlay/scripts/config +++ b/rootfs/etc/s6-overlay/scripts/config @@ -217,9 +217,12 @@ done # Fix perms echo "Fixing perms..." -chown librenms:librenms /data/config /data/monitoring-plugins /data/plugins /data/rrd /data/weathermap /data/alert-templates -find /data/logs ${LIBRENMS_PATH}/composer* ${LIBRENMS_PATH}/config.d ${LIBRENMS_PATH}/bootstrap ${LIBRENMS_PATH}/logs ${LIBRENMS_PATH}/storage ${LIBRENMS_PATH}/vendor \( ! -user librenms -o ! -group librenms \) -exec chown librenms:librenms {} + -chmod ug+rw /data/logs /data/rrd ${LIBRENMS_PATH}/bootstrap/cache ${LIBRENMS_PATH}/storage ${LIBRENMS_PATH}/storage/framework/* +find -H /data/config /data/monitoring-plugins /data/plugins /data/rrd /data/weathermap /data/alert-templates \ + -maxdepth 0 \( ! -user librenms -o ! -group librenms \) -exec chown librenms:librenms {} + +find /data/logs "${LIBRENMS_PATH}/config.d" "${LIBRENMS_PATH}/bootstrap" "${LIBRENMS_PATH}/storage" \ + \( ! -user librenms -o ! -group librenms \) -exec chown librenms:librenms {} + +find -H /data/logs /data/rrd "${LIBRENMS_PATH}/bootstrap/cache" "${LIBRENMS_PATH}/storage" "${LIBRENMS_PATH}"/storage/framework/* \ + -maxdepth 0 ! -perm -0660 -exec chmod ug+rw {} + # Check additional Monitoring plugins echo "Checking additional Monitoring plugins..." diff --git a/rootfs/etc/snmp/snmptrapd.conf b/rootfs/etc/snmp/snmptrapd.conf index 7e0332e9..9d1e2ce6 100644 --- a/rootfs/etc/snmp/snmptrapd.conf +++ b/rootfs/etc/snmp/snmptrapd.conf @@ -2,4 +2,4 @@ disableAuthorization @SNMP_DISABLE_AUTHORIZATION@ createUser -e 0x@SNMP_ENGINEID@ @SNMP_USER@ @SNMP_AUTH_PROTO@ @SNMP_AUTH@ @SNMP_PRIV_PROTO@ @SNMP_PRIV@ authUser @SNMP_PROCESSING_TYPE@ @SNMP_USER@ @SNMP_SECURITY_LEVEL@ authCommunity @SNMP_PROCESSING_TYPE@ @LIBRENMS_SNMP_COMMUNITY@ -traphandle default /usr/local/bin/gosu librenms:librenms /opt/librenms/snmptrap.php +traphandle default /usr/local/bin/gosu librenms /opt/librenms/snmptrap.php diff --git a/rootfs/etc/syslog-ng/syslog-ng.conf b/rootfs/etc/syslog-ng/syslog-ng.conf index 7d7527b7..c208ad31 100644 --- a/rootfs/etc/syslog-ng/syslog-ng.conf +++ b/rootfs/etc/syslog-ng/syslog-ng.conf @@ -24,7 +24,7 @@ source s_net { }; destination d_librenms { - program("/usr/local/bin/gosu librenms:librenms /opt/librenms/syslog.php" template ("$HOST||$FACILITY||$PRIORITY||$LEVEL||$TAG||$R_YEAR-$R_MONTH-$R_DAY $R_HOUR:$R_MIN:$R_SEC||$MSG||$PROGRAM\n") template-escape(yes)); + program("/usr/local/bin/gosu librenms /opt/librenms/syslog.php" template ("$HOST||$FACILITY||$PRIORITY||$LEVEL||$TAG||$R_YEAR-$R_MONTH-$R_DAY $R_HOUR:$R_MIN:$R_SEC||$MSG||$PROGRAM\n") template-escape(yes)); }; filter f_kernel { facility(kern); }; diff --git a/rootfs/usr/bin/lnms b/rootfs/usr/bin/lnms index 125ed55b..53506f74 100755 --- a/rootfs/usr/bin/lnms +++ b/rootfs/usr/bin/lnms @@ -3,5 +3,5 @@ if [ "$(id -u -n)" = "librenms" -a "$(id -g -n)" = "librenms" ]; then php -f /opt/librenms/lnms "$@" else - gosu librenms:librenms php -f /opt/librenms/lnms "$@" + gosu librenms php -f /opt/librenms/lnms "$@" fi diff --git a/rootfs/usr/local/bin/artisan b/rootfs/usr/local/bin/artisan index 59849ec6..97db4b3f 100755 --- a/rootfs/usr/local/bin/artisan +++ b/rootfs/usr/local/bin/artisan @@ -1,4 +1,4 @@ #!/usr/bin/env sh cd /opt/librenms || exit 1 -gosu librenms:librenms php artisan "$@" +gosu librenms php artisan "$@" diff --git a/test/services.sh b/test/services.sh index e9fc3831..a9c2aab6 100644 --- a/test/services.sh +++ b/test/services.sh @@ -25,12 +25,21 @@ for service in nginx php-fpm snmpd cron dispatcher syslogng snmptrapd; do *) test "$(s6-svstat -o up,wantedup /run/service/"$service")" = "false false" ;; esac done +composer_gid=$(getent group librenms-composer | cut -d: -f3) for service in $services; do case "$service" in nginx|php-fpm|dispatcher) pid=$(s6-svstat -o pid /run/service/"$service") grep -Eq "^Uid:[[:space:]]+${PUID}[[:space:]]" "/proc/${pid}/status" grep -Eq "^Gid:[[:space:]]+${PGID}[[:space:]]" "/proc/${pid}/status" + grep -Eq "^Groups:.*[[:space:]]${composer_gid}([[:space:]]|$)" "/proc/${pid}/status" ;; esac done + +gosu librenms sh -ec ' + for path in vendor vendor/autoload.php composer.json composer.lock; do + test -w "/opt/librenms/$path" + done +' +test -z "$(find /opt/librenms/vendor /opt/librenms/composer.json /opt/librenms/composer.lock ! -type l -perm -0002)"