Skip to content

feat: allow to configure php.user #45307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
szaimen wants to merge 4 commits into
base: master
Choose a base branch
from
+25 −2
Draft

feat: allow to configure php.user #45307

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
087ba07
feat: allow to configure config.owner
szaimen May 14, 2024
a0d9dca
fix(posix_getpwuid): handle false return value
szaimen May 22, 2024
137986f
fix: address review
szaimen May 22, 2024
1afe55b
fix: address review 2
szaimen May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: address review 
Signed-off-by: Simon L <[email protected]>
  • Loading branch information
@szaimen
szaimen committed May 22, 2024
commit 137986f30d178cf15a4ded25e906df0e130560dd
5 changes: 4 additions & 1 deletion console.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ function exceptionHandler($exception) {
}

$user = posix_getuid();
$userName = posix_getpwuid($user) !== false ? posix_getpwuid($user)['name'] : '';
$userNameArray = posix_getpwuid($user);
if ($userNameArray !== false) {
$userName = $userNameArray['name'];
}
$configUser = fileowner(OC::$configDir . 'config.php');
$configuredUser = $config->getSystemValueString('php.user', '');
if ($user !== $configUser && $userName !== $configuredUser) {
Expand Down
5 changes: 4 additions & 1 deletion cron.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@
}

$user = posix_getuid();
$userName = posix_getpwuid($user) !== false ? posix_getpwuid($user)['name'] : '';
$userNameArray = posix_getpwuid($user);
if ($userNameArray !== false)) {
$userName = $userNameArray['name'];
}
$configUser = fileowner(OC::$configDir . 'config.php');
$configuredUser = $config->getSystemValueString('php.user', '');
if ($user !== $configUser && $userName !== $configuredUser) {
Expand Down