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

tbrehm

2011-09-26 b31bb1f27f066a2d49f5ab9ee0ca15e985efc788

 server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -84,13 +84,20 @@
            $this->data = $data;
            $this->app = $app;
            $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
				
            $this->_update_website_security_level();
         
            $this->_setup_jailkit_chroot();
            
            $command .= 'usermod --unlock '.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);
            
            $this->_add_jailkit_user();
            $this->_update_website_security_level();
         }
      
         $app->log("Jailkit Plugin -> insert username:".$data['new']['username'],LOGLEVEL_DEBUG);
@@ -119,9 +126,16 @@
            $this->data = $data;
            $this->app = $app;
            $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
				
            $this->_update_website_security_level();
         
            $this->_setup_jailkit_chroot();
            $this->_add_jailkit_user();
				
            // call the ssh-rsa update function
            $this->_setup_ssh_rsa();
				
            $this->_update_website_security_level();
         }
      
         $app->log("Jailkit Plugin -> update username:".$data['new']['username'],LOGLEVEL_DEBUG);
@@ -151,8 +165,13 @@
         //commented out proved to be dangerous on config errors
         //exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
         
         if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
            $command = 'userdel';
            $command .= ' '.escapeshellcmd($data['old']['username']);
            exec($command);
            $app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
         }
         
         $app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
      }
      
      $app->log("Jailkit Plugin -> delete username:".$data['old']['username'],LOGLEVEL_DEBUG);
@@ -188,7 +207,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);
@@ -201,7 +220,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());
            
@@ -221,7 +240,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()
@@ -229,6 +248,9 @@
         //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', 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
@@ -245,19 +267,157 @@
            
         $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
   function _update_website_security_level() {
      global $app,$conf;
		
      // load the server configuration options
      $app->uses("getconf");
      $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
		
      // Get the parent website of this shell user
      $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) {
         $this->_exec('chmod 755 '.escapeshellcmd($web["document_root"]));
         $this->_exec('chown root:root '.escapeshellcmd($web["document_root"]));
      }
		
   }
   
   //* 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() {
      $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 = 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->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

?>
?>