Merged revisions 3803-3844 from stable branch.

tbrehm

2013-02-22 526b997c9891a796b152cdbab8e329b356b1f596

 server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -71,6 +71,7 @@
      global $app, $conf;
      
      $app->uses('system');
      $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$data['new']['parent_domain_id']);
      
      if($app->system->is_user($data['new']['username'])) {
      
@@ -79,6 +80,8 @@
          */
         if ($data['new']['chroot'] == "jailkit")
         {
				
				
            // load the server configuration options
            $app->uses("getconf");
            $this->data = $data;
@@ -86,13 +89,26 @@
            $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
            
            $this->_update_website_security_level();
				
            $app->system->web_folder_protection($web['document_root'],false);
         
            $this->_setup_jailkit_chroot();
            
            $command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
            $this->_add_jailkit_user();
				
            //* call the ssh-rsa update function
            $this->_setup_ssh_rsa();
				
            //$command .= 'usermod -s /usr/sbin/jk_chrootsh -U '.escapeshellcmd($data['new']['username']);
            //exec($command);
            $app->system->usermod($data['new']['username'], 0, 0, '', '/usr/sbin/jk_chrootsh', '', '');
				
            //* Unlock user
            $command = 'usermod -U '.escapeshellcmd($data['new']['username']).' 2>/dev/null';
            exec($command);
            
            $this->_add_jailkit_user();
            $this->_update_website_security_level();
            $app->system->web_folder_protection($web['document_root'],true);
         }
      
         $app->log("Jailkit Plugin -> insert username:".$data['new']['username'],LOGLEVEL_DEBUG);
@@ -108,6 +124,7 @@
      global $app, $conf;
      
      $app->uses('system');
      $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$data['new']['parent_domain_id']);
      
      if($app->system->is_user($data['new']['username'])) {
      
@@ -116,6 +133,7 @@
          */
         if ($data['new']['chroot'] == "jailkit")
         {
				
            // load the server configuration options
            $app->uses("getconf");
            $this->data = $data;
@@ -123,9 +141,18 @@
            $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
            
            $this->_update_website_security_level();
				
            $app->system->web_folder_protection($web['document_root'],false);
         
            $this->_setup_jailkit_chroot();
            $this->_add_jailkit_user();
				
            //* call the ssh-rsa update function
            $this->_setup_ssh_rsa();
				
            $this->_update_website_security_level();
				
            $app->system->web_folder_protection($web['document_root'],true);
         }
      
         $app->log("Jailkit Plugin -> update username:".$data['new']['username'],LOGLEVEL_DEBUG);
@@ -145,6 +172,8 @@
      
      $app->uses('system');
      
      $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$data['old']['parent_domain_id']);
		
      if ($data['old']['chroot'] == "jailkit")
      {
         $app->uses("getconf");
@@ -155,12 +184,17 @@
         //commented out proved to be dangerous on config errors
         //exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
         
         $app->system->web_folder_protection($web['document_root'],false);
			
         if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
            $command = 'userdel -f -r';
            $command .= ' '.escapeshellcmd($data['old']['username']);
            $command = 'userdel -f';
            $command .= ' '.escapeshellcmd($data['old']['username']).' &> /dev/null';
            exec($command);
            $app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
         }
			
         $app->system->web_folder_protection($web['document_root'],true);
			
      }
      
      $app->log("Jailkit Plugin -> delete username:".$data['old']['username'],LOGLEVEL_DEBUG);
@@ -170,13 +204,15 @@
   
   function _setup_jailkit_chroot()
   {
         global $app;
			
         //check if the chroot environment is created yet if not create it with a list of program sections from the config
         if (!is_dir($this->data['new']['dir'].'/etc/jailkit'))
         {
            $command = '/usr/local/ispconfig/server/scripts/create_jailkit_chroot.sh';
            $command .= ' '.escapeshellcmd($this->data['new']['dir']);
            $command .= ' \''.$this->jailkit_config['jailkit_chroot_app_sections'].'\'';
            exec($command);
            exec($command.' 2>/dev/null');
            
            $this->app->log("Added jailkit chroot with command: ".$command,LOGLEVEL_DEBUG);
            
@@ -196,12 +232,12 @@
            $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) || @is_link($bashrc)) unlink($bashrc);
            
            file_put_contents($bashrc,$tpl->grab());
            unset($tpl);
            
            $this->app->log("Added bashrc scrpt : ".$bashrc,LOGLEVEL_DEBUG);
            $this->app->log("Added bashrc script : ".$bashrc,LOGLEVEL_DEBUG);
            
            $tpl = new tpl();
            $tpl->newTemplate("motd.master");
@@ -209,9 +245,9 @@
            $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) || @is_link($motd)) unlink($motd);
            
            file_put_contents($motd,$tpl->grab());
            $app->system->file_put_contents($motd,$tpl->grab());
            
         }
   }
@@ -222,24 +258,26 @@
      $command = '/usr/local/ispconfig/server/scripts/create_jailkit_programs.sh';
      $command .= ' '.escapeshellcmd($this->data['new']['dir']);
      $command .= ' \''.$this->jailkit_config['jailkit_chroot_app_programs'].'\'';
      exec($command);
      exec($command.' 2>/dev/null');
      
      $this->app->log("Added programs to jailkit chroot with command: ".$command,LOGLEVEL_DEBUG);
   }
   
   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()
   {
         global $app;
			
         //add the user to the chroot
         $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
@@ -252,19 +290,48 @@
         $command .= ' '.escapeshellcmd($this->data['new']['shell']);
         $command .= ' '.$this->data['new']['puser'];
         $command .= ' '.$jailkit_chroot_puserhome;
         exec($command);
         exec($command.' 2>/dev/null');
			
         //* Change the homedir of the shell user and parent user
         //* We have to do this manually as the usermod command fails 
         //* when the user is logged in or a command is running under that user
         /*
         $passwd_file_array = file('/etc/passwd');
         $passwd_out = '';
         if(is_array($passwd_file_array)) {
            foreach($passwd_file_array as $line) {
               $line = trim($line);
               $parts = explode(':',$line);
               if($parts[0] == $this->data['new']['username']) {
                  $parts[5] = escapeshellcmd($this->data['new']['dir'].'/.'.$jailkit_chroot_userhome);
                  $parts[6] = escapeshellcmd('/usr/sbin/jk_chrootsh');
                  $new_line = implode(':',$parts);
                  copy('/etc/passwd','/etc/passwd~');
                  chmod('/etc/passwd~',0600);
                  $app->uses('system');
                  $app->system->replaceLine('/etc/passwd',$line,$new_line,1,0);
               }
            }
         }*/
			
         $app->system->usermod($this->data['new']['username'], 0, 0, $this->data['new']['dir'].'/.'.$jailkit_chroot_userhome, '/usr/sbin/jk_chrootsh');
         $app->system->usermod($this->data['new']['puser'], 0, 0, $this->data['new']['dir'].'/.'.$jailkit_chroot_userhome, '/usr/sbin/jk_chrootsh');
            
         $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));
						
         if(!is_dir($this->data['new']['dir'].$jailkit_chroot_userhome)) mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), 0755, true);
         $app->system->chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['username']);
         $app->system->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));
         if(!is_dir($this->data['new']['dir'].$jailkit_chroot_puserhome)) mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), 0755, true);
         $app->system->chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['puser']);
         $app->system->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 jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome,LOGLEVEL_DEBUG);
			

   }
   
   //* Update the website root directory permissions depending on the security level
@@ -279,15 +346,123 @@
      $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$this->data['new']['parent_domain_id']);
      
      //* If the security level is set to high
      if($web_config['security_level'] == 20) {
         exec("chmod 755 ".escapeshellcmd($web["document_root"]."/"));
         exec("chown root:root ".escapeshellcmd($web["document_root"]."/"));
      if($web_config['security_level'] == 20 && is_array($web)) {
         $app->system->web_folder_protection($web["document_root"],false);
         $app->system->chmod($web["document_root"],0755);
         $app->system->chown($web["document_root"],'root');
         $app->system->chgrp($web["document_root"],'root');
         $app->system->web_folder_protection($web["document_root"],true);
      }
      
   }
   
	
   //* Wrapper for exec function for easier debugging
   private function _exec($command) {
      global $app;
      $app->log('exec: '.$command,LOGLEVEL_DEBUG);
      exec($command);
   }

   private function _setup_ssh_rsa() {
      global $app;
      $this->app->log("ssh-rsa setup shelluser_jailkit",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 = $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';
			
      $app->uses('file');
      $sshrsa = $app->file->unix_nl($sshrsa);
      $sshrsa = $app->file->remove_blank_lines($sshrsa,0);
		
      // 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 ""');
			
         // use the public key that has been generated
         $userkey = $app->system->file_get_contents('/tmp/id_rsa.pub');
			
         // save keypair in client table
         $this->app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".$app->db->quote($app->system->file_get_contents('/tmp/id_rsa'))."', ssh_rsa = '".$app->db->quote($userkey)."' WHERE client_id = ".$id);

         $app->system->unlink('/tmp/id_rsa');
         $app->system->unlink('/tmp/id_rsa.pub');
         $this->app->log("ssh-rsa keypair generated for ".$username,LOGLEVEL_DEBUG);
      };
		
      if (!file_exists($sshkeys)){
         // add root's key
         $app->file->mkdirs($sshdir, '0755');
         if(is_file('/root/.ssh/authorized_keys')) $app->system->file_put_contents($sshkeys, $app->system->file_get_contents('/root/.ssh/authorized_keys'));
		
         // Remove duplicate keys
         $existing_keys = @file($sshkeys);
         $new_keys = explode("\n", $userkey);
         $final_keys_arr = @array_merge($existing_keys, $new_keys);
         $new_final_keys_arr = array();
         if(is_array($final_keys_arr) && !empty($final_keys_arr)){
            foreach($final_keys_arr as $key => $val){
               $new_final_keys_arr[$key] = trim($val);
            }
         }
         $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));
			
         // add the user's key
         file_put_contents($sshkeys, $final_keys);
         $app->file->remove_blank_lines($sshkeys);
         $this->app->log("ssh-rsa authorisation keyfile created in ".$sshkeys,LOGLEVEL_DEBUG);
      }
      //* Get the keys
      $existing_keys = file($sshkeys);
      $new_keys = explode("\n", $sshrsa);
      $old_keys = explode("\n",$this->data['old']['ssh_rsa']);
			
      //* Remove all old keys
      if(is_array($old_keys)) {
         foreach($old_keys as $key => $val) {
            $k = array_search(trim($val),$existing_keys);
            unset($existing_keys[$k]);
         }
      }
			
      //* merge the remaining keys and the ones fom the ispconfig database.
      if(is_array($new_keys)) {
         $final_keys_arr = array_merge($existing_keys, $new_keys);
      } else {
         $final_keys_arr = $existing_keys;
      }
			
      $new_final_keys_arr = array();
      if(is_array($final_keys_arr) && !empty($final_keys_arr)){
         foreach($final_keys_arr as $key => $val){
            $new_final_keys_arr[$key] = trim($val);
         }
      }
      $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));
			
      // add the custom key 
      $app->system->file_put_contents($sshkeys, $final_keys);
      $app->file->remove_blank_lines($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'])." ".$sshdir);
      exec("chmod 700 ".$sshdir);
      exec("chmod 600 '$sshkeys'");
		
   }
} // end class

?>
?>