From e47d46736d68ddd3000edd6bf2796cea7818c551 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Tue, 5 May 2009 13:53:30 +0000 Subject: [PATCH] Fixed problems with jailkit 2.7 --- .../shelluser_base_plugin.inc.php | 15 ++++++++------- .../shelluser_jailkit_plugin.inc.php | 3 +++ server/scripts/create_jailkit_user.sh | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php index 151dfda03..c3e112c7f 100755 --- a/server/plugins-available/shelluser_base_plugin.inc.php +++ b/server/plugins-available/shelluser_base_plugin.inc.php @@ -77,15 +77,16 @@ class shelluser_base_plugin { $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); //* Disable shell user temporarily if we use jailkit @@ -125,7 +126,7 @@ class shelluser_base_plugin { $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); } else { // The user does not exist, so we insert it now diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php index 666251b57..13705c09f 100755 --- a/server/plugins-available/shelluser_jailkit_plugin.inc.php +++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php @@ -234,6 +234,9 @@ class shelluser_jailkit_plugin { $jailkit_chroot_userhome = $this->_get_home_dir($this->data['new']['username']); $jailkit_chroot_puserhome = $this->_get_home_dir($this->data['new']['puser']); + if(!is_dir($this->data['new']['dir'].'/etc')) mkdir($this->data['new']['dir'].'/etc'); + if(!is_file($this->data['new']['dir'].'/etc/passwd')) exec('touch '.$this->data['new']['dir'].'/etc/passwd'); + // IMPORTANT! // ALWAYS create the user. Even if the user was created before // if we check if the user exists, then a update (no shell -> jailkit) will not work diff --git a/server/scripts/create_jailkit_user.sh b/server/scripts/create_jailkit_user.sh index 893046c52..efe06031c 100755 --- a/server/scripts/create_jailkit_user.sh +++ b/server/scripts/create_jailkit_user.sh @@ -22,7 +22,7 @@ CHROOT_P_USER=$5 CHROOT_P_USER_HOMEDIR=$6 ### Add the chroot user ### -jk_jailuser -s $CHROOT_SHELL -j $CHROOT_HOMEDIR $CHROOT_USERNAME +jk_jailuser -n -s $CHROOT_SHELL -j $CHROOT_HOMEDIR $CHROOT_USERNAME ### Reconfigure the chroot home directory for the user ### usermod --home=$CHROOT_HOMEDIR/.$CHROOT_USERHOMEDIR $CHROOT_USERNAME -- GitLab