Update on certificte ssh-rsa authentication. Under construction are the she...

laking

2011-04-04 28a1b864972e1f93aa57c88c0cce9ea97e61bea2

 server/plugins-available/shelluser_base_plugin.inc.php

@@ -72,23 +72,47 @@
      
      $app->uses('system');
      
      // Get the UID of the parent user
      $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 .= ' '.escapeshellcmd($data['new']['username']);
      if($app->system->is_user($data['new']['puser'])) {
         // Get the UID of the parent user
         $uid = intval($app->system->getuid($data['new']['puser']));
         if($uid > $this->min_uid) {
            $command = 'useradd';
            $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("Added shelluser: ".$data['new']['username'],LOGLEVEL_DEBUG);
            exec($command);
            $app->log("Executed command: ".$command,LOGLEVEL_DEBUG);
            $app->log("Added shelluser: ".$data['new']['username'],LOGLEVEL_DEBUG);
								
            // call the ssh-rsa update function
            $app->uses("getconf");
            $this->data = $data;
            $this->app = $app;
            $this->_setup_ssh_rsa();
				
            //* Create .bash_history file
            touch(escapeshellcmd($data['new']['dir']).'/.bash_history');
            chmod(escapeshellcmd($data['new']['dir']).'/.bash_history', 0755);
            chown(escapeshellcmd($data['new']['dir']).'/.bash_history', escapeshellcmd($data['new']['username']));
            chgrp(escapeshellcmd($data['new']['dir']).'/.bash_history', escapeshellcmd($data['new']['pgroup']));
				
            //* Disable shell user temporarily if we use jailkit
            if($data['new']['chroot'] == 'jailkit') {
               $command = 'usermod -s /bin/false -L '.escapeshellcmd($data['new']['username']);
               exec($command);
               $app->log("Disabling shelluser temporarily: ".$command,LOGLEVEL_DEBUG);
            }
         
         } else {
            $app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.",LOGLEVEL_ERROR);
         }
      } else {
         $app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.",LOGLEVEL_ERROR);
         $app->log("Skipping insertion of user:".$data['new']['username'].", parent user ".$data['new']['puser']." does not exist.",LOGLEVEL_WARN);
      }
   }
   
@@ -97,25 +121,49 @@
      
      $app->uses('system');
      
      // Get the UID of the parent user
      $uid = intval($app->system->getuid($data['new']['puser']));
      if($uid > $this->min_uid) {
         $command = 'usermod';
         $command .= ' --home '.escapeshellcmd($data['new']['dir']);
         $command .= ' --gid '.escapeshellcmd($data['new']['pgroup']);
         // $command .= ' --non-unique ';
         $command .= ' --password '.escapeshellcmd($data['new']['password']);
         if($data['new']['chroot'] != 'jailkit') $command .= ' --shell '.escapeshellcmd($data['new']['shell']);
         // $command .= ' --uid '.escapeshellcmd($uid);
         $command .= ' --login '.escapeshellcmd($data['new']['username']);
         $command .= ' '.escapeshellcmd($data['old']['username']);
      if($app->system->is_user($data['new']['puser'])) {
         // Get the UID of the parent user
         $uid = intval($app->system->getuid($data['new']['puser']));
         if($uid > $this->min_uid) {
            // Check if the user that we want to update exists, if not, we insert it
            if($app->system->is_user($data['old']['username'])) {
               $command = 'usermod';
               $command .= ' --home '.escapeshellcmd($data['new']['dir']);
               $command .= ' --gid '.escapeshellcmd($data['new']['pgroup']);
               // $command .= ' --non-unique ';
               $command .= ' --password '.escapeshellcmd($data['new']['password']);
               if($data['new']['chroot'] != 'jailkit') $command .= ' --shell '.escapeshellcmd($data['new']['shell']);
               // $command .= ' --uid '.escapeshellcmd($uid);
               $command .= ' --login '.escapeshellcmd($data['new']['username']);
               $command .= ' '.escapeshellcmd($data['old']['username']);
         
         exec($command);
         // $app->log("Updated shelluser: $command ",LOGLEVEL_DEBUG);
         $app->log("Updated shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
			
               exec($command);
               $app->log("Executed command: $command ",LOGLEVEL_DEBUG);
               $app->log("Updated shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
									
               // call the ssh-rsa update function
               $app->uses("getconf");
               $this->data = $data;
               $this->app = $app;
               $this->_setup_ssh_rsa();
					
               //* Create .bash_history file
               if(!is_file($data['new']['dir']).'/.bash_history') {
                  touch(escapeshellcmd($data['new']['dir']).'/.bash_history');
                  chmod(escapeshellcmd($data['new']['dir']).'/.bash_history', 0755);
                  chown(escapeshellcmd($data['new']['dir']).'/.bash_history',escapeshellcmd($data['new']['username']));
                  chgrp(escapeshellcmd($data['new']['dir']).'/.bash_history',escapeshellcmd($data['new']['pgroup']));
               }
					
            } else {
               // The user does not exist, so we insert it now
               $this->insert($event_name,$data);
            }
         } else {
            $app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.",LOGLEVEL_ERROR);
         }
      } else {
         $app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.",LOGLEVEL_ERROR);
         $app->log("Skipping update for user:".$data['new']['username'].", parent user ".$data['new']['puser']." does not exist.",LOGLEVEL_WARN);
      }
   }
   
@@ -124,24 +172,84 @@
      
      $app->uses('system');
      
      // Get the UID of the user
      $userid = intval($app->system->getuid($data['old']['username']));
      if($userid > 999) {
         $command = 'userdel';
         $command .= ' '.escapeshellcmd($data['old']['username']);
      if($app->system->is_user($data['old']['username'])) {
         // Get the UID of the user
         $userid = intval($app->system->getuid($data['old']['username']));
         if($userid > $this->min_uid) {
            // We delete only non jailkit users, jailkit users will be deleted by the jailkit plugin.
            if ($data['old']['chroot'] != "jailkit") {
               $command = 'userdel -f';
               $command .= ' '.escapeshellcmd($data['old']['username']);
         
         exec($command);
         $app->log("Deleted shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
               exec($command);
               $app->log("Deleted shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
            }
         
         } else {
            $app->log("UID = $userid for shelluser:".$data['old']['username']." not allowed.",LOGLEVEL_ERROR);
         }
      } else {
         $app->log("UID = $userid for shelluser:".$data['new']['username']." not allowed.",LOGLEVEL_ERROR);
         $app->log("User:".$data['new']['username']." does not exist in in /etc/passwd, skipping delete.",LOGLEVEL_WARN);
      }
      
   }
   
	
   function _setup_ssh_rsa() {
         //global $app, $conf;
         //$app->uses('system');
         // Okay, here we have a question, .. how to determine the client id
         //$var = "Var:".intval($this->app->system->getuid($this->data['new']['puser']));
         //exec("echo $var >> /tmp/debug");
         /*
         // ssh-rsa authentication variables
         $sshrsa = escapeshellcmd($this->data['new']['ssh_rsa']);
         $usrdir = escapeshellcmd($this->data['new']['dir']);
         $sshdir = escapeshellcmd($this->data['new']['dir']).'/.ssh';
         $sshkeys= escapeshellcmd($this->data['new']['dir']).'/.ssh/authorized_keys';
			
         // 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 ""');
            $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;
            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'");
         }
         // 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);
   }
   

} // end class

?>
?>