From 74c7ca770b0cc8ab70fa383fc85e534603f8fd62 Mon Sep 17 00:00:00 2001
From: laking <laking@ispconfig3>
Date: Mon, 04 Apr 2011 17:04:46 -0400
Subject: [PATCH] Update on certificte CA-signing. Moved config to control panel.
---
server/plugins-available/shelluser_jailkit_plugin.inc.php | 96 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 77 insertions(+), 19 deletions(-)
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index b915e9f..ca7b5ab 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -85,14 +85,14 @@
$this->app = $app;
$this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
- $command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
- exec($command);
-
$this->_update_website_security_level();
-
- $this->_add_jailkit_user();
$this->_setup_jailkit_chroot();
+
+ $this->_add_jailkit_user();
+
+ $command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
+ exec($command);
$this->_update_website_security_level();
}
@@ -160,7 +160,7 @@
//exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
- $command = 'userdel -f -r';
+ $command = 'userdel';
$command .= ' '.escapeshellcmd($data['old']['username']);
exec($command);
$app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
@@ -201,7 +201,7 @@
$tpl->setVar('home_dir',$this->_get_home_dir(""));
$bashrc = escapeshellcmd($this->data['new']['dir']).'/etc/bash.bashrc';
- if(@is_file($bashrc)) exec('rm '.$bashrc);
+ if(@is_file($bashrc)) unlink($bashrc);
file_put_contents($bashrc,$tpl->grab());
unset($tpl);
@@ -214,7 +214,7 @@
$tpl->setVar('domain',$web['domain']);
$motd = escapeshellcmd($this->data['new']['dir']).'/var/run/motd';
- if(@is_file($motd)) exec('rm '.$motd);
+ if(@is_file($motd)) unlink($motd);
file_put_contents($motd,$tpl->grab());
@@ -234,7 +234,7 @@
function _get_home_dir($username)
{
- return str_replace("[username]",escapeshellcmd($username),$this->jailkit_config["jailkit_chroot_home"]);
+ return str_replace("[username]",escapeshellcmd($username),$this->jailkit_config['jailkit_chroot_home']);
}
function _add_jailkit_user()
@@ -243,8 +243,8 @@
$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');
+ if(!is_dir($this->data['new']['dir'].'/etc')) mkdir($this->data['new']['dir'].'/etc', 0755);
+ if(!is_file($this->data['new']['dir'].'/etc/passwd')) touch($this->data['new']['dir'].'/etc/passwd', 0755);
// IMPORTANT!
// ALWAYS create the user. Even if the user was created before
@@ -261,15 +261,73 @@
$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));
+ mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), 0755, true);
+ chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['username']);
+ chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['pgroup']);
$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));
+ mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), 0755, true);
+ chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['puser']);
+ chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['pgroup']);
$this->app->log("Added created jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome,LOGLEVEL_DEBUG);
+
+ // ssh-rsa authentication variables
+ $sshrsa = escapeshellcmd($this->data['new']['ssh_rsa']);
+ $usrdir = escapeshellcmd($this->data['new']['dir']).'/'.$jailkit_chroot_userhome;
+ $sshdir = escapeshellcmd($this->data['new']['dir']).'/'.$jailkit_chroot_userhome.'/.ssh';
+ $sshkeys= escapeshellcmd($this->data['new']['dir']).'/'.$jailkit_chroot_userhome.'/.ssh/authorized_keys';
+ global $app;
+
+ // determine the client id
+ $id = $this->data['new']['sys_groupid'];
+ if ($id>0) $id = $id -1;
+
+ $user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE client_id = ".$id);
+ $userkey = $user['ssh_rsa'];
+ $username= $user['username'];
+
+ // If this user has no key yet, generate a pair
+ if ($userkey == '')
+ {
+ //Generate ssh-rsa-keys
+ exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""');
+
+ $privatekey = file_get_contents('/tmp/id_rsa');
+ $publickey = file_get_contents('/tmp/id_rsa.pub');
+
+ exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub');
+
+ // Set the missing keypair
+ $app->db->query("UPDATE sys_user SET id_rsa='$privatekey' ,ssh_rsa='$publickey' WHERE client_id = ".$id);
+ $userkey = $publickey;
+
+ $this->app->log("ssh-rsa keypair generated for ".$username,LOGLEVEL_DEBUG);
+
+ };
+
+ if (!file_exists($sshkeys))
+ {
+ // add root's key
+ exec("mkdir '$sshdir'");
+ exec("cat /root/.ssh/authorized_keys > '$sshkeys'");
+ exec("echo '' >> '$sshkeys'");
+
+ // add the user's key
+ exec("echo '$userkey' >> '$sshkeys'");
+ exec("echo '' >> '$sshkeys'");
+ }
+ // add the custom key
+ exec("echo '$sshrsa' >> '$sshkeys'");
+ exec("echo '' >> '$sshkeys'");
+
+ // set proper file permissions
+ exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir);
+ exec("chmod 600 '$sshkeys'");
+
+ $this->app->log("ssh-rsa key added to ".$sshkeys,LOGLEVEL_DEBUG);
+
}
//* Update the website root directory permissions depending on the security level
@@ -285,8 +343,8 @@
//* If the security level is set to high
if($web_config['security_level'] == 20) {
- $this->_exec("chmod 755 ".escapeshellcmd($web["document_root"]));
- $this->_exec("chown root:root ".escapeshellcmd($web["document_root"]));
+ $this->_exec('chmod 755 '.escapeshellcmd($web["document_root"]));
+ $this->_exec('chown root:root '.escapeshellcmd($web["document_root"]));
}
}
@@ -294,10 +352,10 @@
//* Wrapper for exec function for easier debugging
private function _exec($command) {
global $app;
- $app->log("exec: ".$command,LOGLEVEL_DEBUG);
+ $app->log('exec: '.$command,LOGLEVEL_DEBUG);
exec($command);
}
} // end class
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1