From cd568a72940b3ea6766a83c1437ceb4bc3f575b7 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 09 Aug 2010 10:07:21 -0400
Subject: [PATCH] Fixed: FS#1277 - Empty server/conf/index/.htaccess
---
server/plugins-available/shelluser_base_plugin.inc.php | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index 151dfda..d279678 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -77,20 +77,26 @@
$uid = intval($app->system->getuid($data['new']['puser']));
if($uid > $this->min_uid) {
$command = 'useradd';
- $command .= ' --home '.escapeshellcmd($data['new']['dir']);
- $command .= ' --gid '.escapeshellcmd($data['new']['pgroup']);
- $command .= ' --non-unique ';
- $command .= ' --password '.escapeshellcmd($data['new']['password']);
- $command .= ' --shell '.escapeshellcmd($data['new']['shell']);
- $command .= ' --uid '.escapeshellcmd($uid);
+ $command .= ' -d '.escapeshellcmd($data['new']['dir']);
+ $command .= ' -g '.escapeshellcmd($data['new']['pgroup']);
+ $command .= ' -o '; // non unique
+ if($data['new']['password'] != '') $command .= ' -p '.escapeshellcmd($data['new']['password']);
+ $command .= ' -s '.escapeshellcmd($data['new']['shell']);
+ $command .= ' -u '.escapeshellcmd($uid);
$command .= ' '.escapeshellcmd($data['new']['username']);
exec($command);
+ $app->log("Executed command: ".$command,LOGLEVEL_DEBUG);
$app->log("Added shelluser: ".$data['new']['username'],LOGLEVEL_DEBUG);
+
+ //* Create .bash_history file
+ exec('touch '.escapeshellcmd($data['new']['dir']).'/.bash_history');
+ exec('chmod 755 '.escapeshellcmd($data['new']['dir']).'/.bash_history');
+ exec('chown '.escapeshellcmd($data['new']['username']).':'.escapeshellcmd($data['new']['pgroup']).' '.escapeshellcmd($data['new']['dir']).'/.bash_history');
//* Disable shell user temporarily if we use jailkit
if($data['new']['chroot'] == 'jailkit') {
- $command = 'usermod -L '.escapeshellcmd($data['new']['username']);
+ $command = 'usermod -s /bin/false -L '.escapeshellcmd($data['new']['username']);
exec($command);
$app->log("Disabling shelluser temporarily: ".$command,LOGLEVEL_DEBUG);
}
@@ -125,8 +131,17 @@
$command .= ' '.escapeshellcmd($data['old']['username']);
exec($command);
- // $app->log("Updated shelluser: $command ",LOGLEVEL_DEBUG);
+ $app->log("Executed command: $command ",LOGLEVEL_DEBUG);
$app->log("Updated shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
+
+
+ //* Create .bash_history file
+ if(!is_file($data['new']['dir']).'/.bash_history') {
+ exec('touch '.escapeshellcmd($data['new']['dir']).'/.bash_history');
+ exec('chmod 755 '.escapeshellcmd($data['new']['dir']).'/.bash_history');
+ exec('chown '.escapeshellcmd($data['new']['username']).':'.escapeshellcmd($data['new']['pgroup']).' '.escapeshellcmd($data['new']['dir']).'/.bash_history');
+ }
+
} else {
// The user does not exist, so we insert it now
$this->insert($event_name,$data);
--
Gitblit v1.9.1