mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-24 02:58:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve getUserShell() function for accuracy and consistency

Browse Source 
- Refine username matching to prevent partial matches
- Use English for syslog error message
This commit is contained in:
donbuehl
2024-08-19 21:49:31 +02:00
parent fb19a99ad4
commit 07fa790411
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emhttp/plugins/dynamix/include/OpenTerminal.php
+15 -12
View File
@@ -32,20 +32,23 @@ if (!empty($display['tty'])) exec("sed -ri 's/fontSize=[0-9]+/fontSize={$display
function getUserShell() {
$shell = 'bash';
try {
$username = posix_getpwuid(posix_geteuid())['name'];
$passwd = file_get_contents('/etc/passwd');
$lines = explode("\n", $passwd);
foreach ($lines as $line) {
if (strpos($line, $username) === 0) {
$parts = explode(':', $line);
$fullShellPath = end($parts);
$shell = basename(trim($fullShellPath));
break;
}
}
$username = posix_getpwuid(posix_geteuid())['name'];
$passwd = file_get_contents('/etc/passwd');
$lines = explode("\n", $passwd);
foreach ($lines as $line) {
$parts = explode(':', $line);
if ($parts[0] === $username) {
$fullShellPath = end($parts);
$shell = basename(trim($fullShellPath));
break;
}
}
} catch (Exception $e) {
syslog(LOG_ERR, "Fehler beim Ermitteln der User-Shell: " . $e->getMessage());
syslog(LOG_ERR, "Error determining user shell: " . $e->getMessage());
}
syslog(LOG_INFO, sprintf("User shell determined: %s %s", $username, $shell));
return $shell;
}