Fixed: FS#1619 - Add apache SNI / SAN support for SSL.

tbrehm

2011-09-26 b31bb1f27f066a2d49f5ab9ee0ca15e985efc788

 server/plugins-available/shelluser_base_plugin.inc.php

@@ -32,6 +32,20 @@
   
   var $plugin_name = 'shelluser_base_plugin';
   var $class_name = 'shelluser_base_plugin';
   var $min_uid = 499;
	
   //* This function is called during ispconfig installation to determine
   //  if a symlink shall be created for this plugin.
   function onInstall() {
      global $conf;
		
      if($conf['services']['web'] == true) {
         return true;
      } else {
         return false;
      }
		
   }
   
      
   /*
@@ -58,23 +72,47 @@
      
      $app->uses('system');
      
      // Get the UID of the parent user
      $uid = intval($app->system->getuid($data['new']['puser']));
      if($uid > 999) {
         $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);
      }
   }
   
@@ -83,24 +121,49 @@
      
      $app->uses('system');
      
      // Get the UID of the parent user
      $uid = intval($app->system->getuid($data['new']['puser']));
      if($uid > 999) {
         $command = 'usermod';
         $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 .= ' --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: ".$data['new']['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);
      }
   }
   
@@ -109,24 +172,85 @@
      
      $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);
      }
      
   }
   
	
   private function _setup_ssh_rsa() {
      $this->app->log("ssh-rsa setup shelluser_base",LOGLEVEL_DEBUG);
      // Get the client ID, username, and the key
      $domain_data = $this->app->db->queryOneRecord('SELECT sys_groupid FROM web_domain WHERE web_domain.domain_id = '.intval($this->data['new']['parent_domain_id']));
      $sys_group_data = $this->app->db->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->db->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']);
      $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->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 = ".$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

?>
?>