From 42b3854f7ca1d2877d717d8cb8cbb2d5b1a9a3cc Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Wed, 04 Mar 2009 13:06:19 -0500 Subject: [PATCH] Fixed jailkit scripts on fedora. --- server/plugins-available/shelluser_jailkit_plugin.inc.php | 48 ++++++++++++++++++++++++++---------------------- 1 files changed, 26 insertions(+), 22 deletions(-) diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php index 10217a4..308178f 100755 --- a/server/plugins-available/shelluser_jailkit_plugin.inc.php +++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php @@ -86,6 +86,10 @@ $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit'); $this->_setup_jailkit_chroot(); + + $command .= 'usermod --unlock '.escapeshellcmd($data['new']['username']); + exec($command); + $this->_add_jailkit_user(); } @@ -184,7 +188,7 @@ $tpl->setVar('home_dir',$this->_get_home_dir("")); $bashrc = escapeshellcmd($this->data['new']['dir']).'/etc/bash.bashrc'; - exec('rm '.$bashrc); + if(@is_file($bashrc)) exec('rm '.$bashrc); file_put_contents($bashrc,$tpl->grab()); unset($tpl); @@ -197,7 +201,7 @@ $tpl->setVar('domain',$web['domain']); $motd = escapeshellcmd($this->data['new']['dir']).'/var/run/motd'; - exec('rm '.$motd); + if(@is_file($motd)) exec('rm '.$motd); file_put_contents($motd,$tpl->grab()); @@ -226,30 +230,30 @@ $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'].$jailkit_chroot_userhome)) - { - $command = '/usr/local/ispconfig/server/scripts/create_jailkit_user.sh'; - $command .= ' '.escapeshellcmd($this->data['new']['username']); - $command .= ' '.escapeshellcmd($this->data['new']['dir']); - $command .= ' '.$jailkit_chroot_userhome; - $command .= ' '.escapeshellcmd($this->data['new']['shell']); - $command .= ' '.$this->data['new']['puser']; - $command .= ' '.$jailkit_chroot_puserhome; - exec($command); + // 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 + // and the user has FULL ACCESS to the root of the server! + $command = '/usr/local/ispconfig/server/scripts/create_jailkit_user.sh'; + $command .= ' '.escapeshellcmd($this->data['new']['username']); + $command .= ' '.escapeshellcmd($this->data['new']['dir']); + $command .= ' '.$jailkit_chroot_userhome; + $command .= ' '.escapeshellcmd($this->data['new']['shell']); + $command .= ' '.$this->data['new']['puser']; + $command .= ' '.$jailkit_chroot_puserhome; + exec($command); - $this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG); + $this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG); - exec("mkdir -p ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome)); - exec("chown ".$this->data['new']['username'].":".$this->data['new']['pgroup']." ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome)); + exec("mkdir -p ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome)); + exec("chown ".$this->data['new']['username'].":".$this->data['new']['pgroup']." ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome)); - $this->app->log("Added created jailkit user home in : ".$this->data['new']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG); + $this->app->log("Added created jailkit user home in : ".$this->data['new']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG); + + exec("mkdir -p ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome)); + exec("chown ".$this->data['new']['puser'].":".$this->data['new']['pgroup']." ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome)); - exec("mkdir -p ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome)); - exec("chown ".$this->data['new']['puser'].":".$this->data['new']['pgroup']." ".escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome)); - - $this->app->log("Added created jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome,LOGLEVEL_DEBUG); - - } + $this->app->log("Added created jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome,LOGLEVEL_DEBUG); } -- Gitblit v1.9.1