mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for when group doesnt exist (#12817)

Browse Source 
Previously this errored out the validation
This commit is contained in:
Jellyfrog
2021-04-30 05:44:31 +02:00
committed by GitHub
parent 49ec6aabd6
commit f7fbf9fe07
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
LibreNMS/Validations/User.php
View File

@@ -48,12 +48,18 @@ class User extends BaseValidation
if (! ($username === 'root' || $username === $lnms_username)) { if (! ($username === 'root' || $username === $lnms_username)) {
if (isCli()) { if (isCli()) {
$validator->fail("You need to run this script as $lnms_username or root"); $validator->fail("You need to run this script as '$lnms_username' or root");
} elseif (function_exists('posix_getgrnam')) { } elseif (function_exists('posix_getgrnam')) {
$lnms_group = posix_getgrnam($lnms_groupname); $lnms_group = posix_getgrnam($lnms_groupname);
if (! in_array($username, $lnms_group['members'])) {
if ($lnms_group === false) {
$validator->fail( $validator->fail(
"Your web server or php-fpm is not running as user '$lnms_username' or in the group '$lnms_groupname''", "The group '$lnms_groupname' does not exist",
"groupadd $lnms_groupname"
);
} elseif (! in_array($username, $lnms_group['members'])) {
$validator->fail(
"Your web server or php-fpm is not running as user '$lnms_username' or in the group '$lnms_groupname'",
"usermod -a -G $lnms_groupname $username" "usermod -a -G $lnms_groupname $username"
); );
} }
@@ -108,7 +114,7 @@ class User extends BaseValidation
if (! empty($files)) { if (! empty($files)) {
$result = ValidationResult::fail( $result = ValidationResult::fail(
"We have found some files that are owned by a different user than $lnms_username, this " . "We have found some files that are owned by a different user than '$lnms_username', this " .
'will stop you updating automatically and / or rrd files being updated causing graphs to fail.' 'will stop you updating automatically and / or rrd files being updated causing graphs to fail.'
) )
->setFix($fix) ->setFix($fix)
@@ -121,7 +127,7 @@ class User extends BaseValidation
} }
} }
} else { } else {
$validator->warn("You don't have LIBRENMS_USER set, this most likely needs to be set to librenms"); $validator->warn("You don't have LIBRENMS_USER set, this most likely needs to be set to 'librenms'");
} }
} }
} }