Commit 00a055c4 authored by laking's avatar laking
Browse files

Update on certificte ssh-rsa authentication - shell plugins.

parent 28a1b864
...@@ -194,59 +194,60 @@ class shelluser_base_plugin { ...@@ -194,59 +194,60 @@ class shelluser_base_plugin {
} }
function _setup_ssh_rsa() { private function _setup_ssh_rsa() {
//global $app, $conf; $this->app->log("ssh-rsa setup shelluser_base",LOGLEVEL_DEBUG);
//$app->uses('system'); // Get the client ID, username, and the key
// Okay, here we have a question, .. how to determine the client id $domain_data = $this->app->dbmaster->queryOneRecord('SELECT sys_groupid FROM web_domain WHERE web_domain.domain_id = '.intval($this->data['new']['parent_domain_id']));
//$var = "Var:".intval($this->app->system->getuid($this->data['new']['puser'])); $sys_group_data = $this->app->dbmaster->queryOneRecord('SELECT * FROM sys_group WHERE sys_group.groupid = '.intval($domain_data['sys_groupid']));
//exec("echo $var >> /tmp/debug"); $id = intval($sys_group_data['client_id']);
/* $username= $sys_group_data['name'];
// ssh-rsa authentication variables $client_data = $this->app->dbmaster->queryOneRecord('SELECT * FROM client WHERE client.client_id = '.$id);
$sshrsa = escapeshellcmd($this->data['new']['ssh_rsa']); $userkey = $client_data['ssh_rsa'];
$usrdir = escapeshellcmd($this->data['new']['dir']); unset($domain_data);
$sshdir = escapeshellcmd($this->data['new']['dir']).'/.ssh'; unset($client_data);
$sshkeys= escapeshellcmd($this->data['new']['dir']).'/.ssh/authorized_keys';
// ssh-rsa authentication variables
// determine the client id $sshrsa = escapeshellcmd($this->data['new']['ssh_rsa']);
$id = $this->data['new']['sys_groupid']; $usrdir = escapeshellcmd($this->data['new']['dir']);
if ($id>0) $id = $id -1; $sshdir = $usrdir.'/.ssh';
$sshkeys= $usrdir.'/.ssh/authorized_keys';
$user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE client_id = ".$id);
$userkey = $user['ssh_rsa']; // If this user has no key yet, generate a pair
$username= $user['username']; if ($userkey == '' && $id>0)
{
// If this user has no key yet, generate a pair //Generate ssh-rsa-keys
if ($userkey == '') exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""');
{ // save keypair in client table
//Generate ssh-rsa-keys $this->app->dbmaster->query("UPDATE client SET created_at = ".time().", id_rsa = '".file_get_contents('/tmp/id_rsa')."', ssh_rsa = '".file_get_contents('/tmp/id_rsa.pub')."' WHERE client_id = ".$id);
exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""'); // and use the public key that has been generated
$app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".file_get_contents('/tmp/id_rsa')."', ssh_rsa = '".file_get_contents('/tmp/id_rsa.pub')."' WHERE client_id = ".$this->id; $userkey = file_get_contents('/tmp/id_rsa.pub')
exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub'); ;
exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub');
$this->app->log("ssh-rsa keypair generated for ".$username,LOGLEVEL_DEBUG); $this->app->log("ssh-rsa keypair generated for ".$username,LOGLEVEL_DEBUG);
};
};
if (!file_exists($sshkeys))
if (!file_exists($sshkeys)) {
{ // add root's key
// add root's key exec("mkdir '$sshdir'");
exec("mkdir '$sshdir'"); exec("cat /root/.ssh/authorized_keys > '$sshkeys'");
exec("cat /root/.ssh/authorized_keys > '$sshkeys'"); exec("echo '' >> '$sshkeys'");
exec("echo '' >> '$sshkeys'");
// add the user's key
// add the user's key exec("echo '$userkey' >> '$sshkeys'");
exec("echo '$userkey' >> '$sshkeys'"); exec("echo '' >> '$sshkeys'");
exec("echo '' >> '$sshkeys'"); $this->app->log("ssh-rsa authorisation keyfile created in ".$sshkeys,LOGLEVEL_DEBUG);
} }
if ($sshrsa!=''){
// add the custom key // add the custom key
exec("echo '$sshrsa' >> '$sshkeys'"); exec("echo '$sshrsa' >> '$sshkeys'");
exec("echo '' >> '$sshkeys'"); exec("echo '' >> '$sshkeys'");
$this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG);
// set proper file permissions }
exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir); // set proper file permissions
exec("chmod 600 '$sshkeys'"); 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);
} }
......
...@@ -91,6 +91,9 @@ class shelluser_jailkit_plugin { ...@@ -91,6 +91,9 @@ class shelluser_jailkit_plugin {
$this->_add_jailkit_user(); $this->_add_jailkit_user();
// call the ssh-rsa update function
$this->_setup_ssh_rsa();
$command .= 'usermod -U '.escapeshellcmd($data['new']['username']); $command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
exec($command); exec($command);
...@@ -129,6 +132,9 @@ class shelluser_jailkit_plugin { ...@@ -129,6 +132,9 @@ class shelluser_jailkit_plugin {
$this->_setup_jailkit_chroot(); $this->_setup_jailkit_chroot();
$this->_add_jailkit_user(); $this->_add_jailkit_user();
// call the ssh-rsa update function
$this->_setup_ssh_rsa();
$this->_update_website_security_level(); $this->_update_website_security_level();
} }
...@@ -272,6 +278,7 @@ class shelluser_jailkit_plugin { ...@@ -272,6 +278,7 @@ class shelluser_jailkit_plugin {
chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['pgroup']); 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); $this->app->log("Added created jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome,LOGLEVEL_DEBUG);
/* /*
// ssh-rsa authentication variables // ssh-rsa authentication variables
$sshrsa = escapeshellcmd($this->data['new']['ssh_rsa']); $sshrsa = escapeshellcmd($this->data['new']['ssh_rsa']);
...@@ -356,6 +363,61 @@ class shelluser_jailkit_plugin { ...@@ -356,6 +363,61 @@ class shelluser_jailkit_plugin {
exec($command); exec($command);
} }
private function _setup_ssh_rsa() {
$this->app->log("ssh-rsa setup shelluser_jailkit",LOGLEVEL_DEBUG);
// Get the client ID, username, and the key
$domain_data = $this->app->dbmaster->queryOneRecord('SELECT sys_groupid FROM web_domain WHERE web_domain.domain_id = '.intval($this->data['new']['parent_domain_id']));
$sys_group_data = $this->app->dbmaster->queryOneRecord('SELECT * FROM sys_group WHERE sys_group.groupid = '.intval($domain_data['sys_groupid']));
$id = intval($sys_group_data['client_id']);
$username= $sys_group_data['name'];
$client_data = $this->app->dbmaster->queryOneRecord('SELECT * FROM client WHERE client.client_id = '.$id);
$userkey = $client_data['ssh_rsa'];
unset($domain_data);
unset($client_data);
// ssh-rsa authentication variables
$sshrsa = escapeshellcmd($this->data['new']['ssh_rsa']);
$usrdir = escapeshellcmd($this->data['new']['dir']).'/'.$this->_get_home_dir($this->data['new']['username']);
$sshdir = $usrdir.'/.ssh';
$sshkeys= $usrdir.'/.ssh/authorized_keys';
// If this user has no key yet, generate a pair
if ($userkey == '' && $id>0)
{
//Generate ssh-rsa-keys
exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""');
// save keypair in client table
$this->app->dbmaster->query("UPDATE client SET created_at = ".time().", id_rsa = '".file_get_contents('/tmp/id_rsa')."', ssh_rsa = '".file_get_contents('/tmp/id_rsa.pub')."' WHERE client_id = ".$id);
// and use the public key that has been generated
$userkey = file_get_contents('/tmp/id_rsa.pub')
;
exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub');
$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'");
$this->app->log("ssh-rsa authorisation keyfile created in ".$sshkeys,LOGLEVEL_DEBUG);
}
if ($sshrsa!=''){
// add the custom key
exec("echo '$sshrsa' >> '$sshkeys'");
exec("echo '' >> '$sshkeys'");
$this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG);
}
// set proper file permissions
exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir);
exec("chmod 600 '$sshkeys'");
}
} // end class } // end class
?> ?>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment