Add the website user and group also to the passwd and group files in chroot...

tbrehm

2009-08-28 2bbc4c7761a6d0e97cc8f22bccbea94835fcbc7d

 server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -84,9 +84,17 @@
            $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();
				
            $command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
            exec($command);
				
            $this->_update_website_security_level();
         }
      
         $app->log("Jailkit Plugin -> insert username:".$data['new']['username'],LOGLEVEL_DEBUG);
@@ -115,9 +123,13 @@
            $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();
				
            $this->_update_website_security_level();
         }
      
         $app->log("Jailkit Plugin -> update username:".$data['new']['username'],LOGLEVEL_DEBUG);
@@ -147,8 +159,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 -f -r';
            $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);
@@ -184,7 +201,7 @@
            $tpl->setVar('home_dir',$this->_get_home_dir(""));
            
            $bashrc = escapeshellcmd($this->data['new']['dir']).'/etc/bash.bashrc';
            exec('rm '.$bashrc);
            if(@is_file($bashrc)) exec('rm '.$bashrc);
            
            file_put_contents($bashrc,$tpl->grab());
            unset($tpl);
@@ -197,7 +214,7 @@
            $tpl->setVar('domain',$web['domain']);
            
            $motd = escapeshellcmd($this->data['new']['dir']).'/var/run/motd';
            exec('rm '.$motd);
            if(@is_file($motd)) exec('rm '.$motd);
            
            file_put_contents($motd,$tpl->grab());
            
@@ -226,33 +243,60 @@
         $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'].$jailkit_chroot_userhome))
         {
            $command = '/usr/local/ispconfig/server/scripts/create_jailkit_user.sh';
            $command .= ' '.escapeshellcmd($this->data['new']['username']);
            $command .= ' '.escapeshellcmd($this->data['new']['dir']);
            $command .= ' '.$jailkit_chroot_userhome;
            $command .= ' '.escapeshellcmd($this->data['new']['shell']);
            $command .= ' '.$this->data['new']['puser'];
            $command .= ' '.$jailkit_chroot_puserhome;
            exec($command);
         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');
			
         // IMPORTANT!
         // ALWAYS create the user. Even if the user was created before
         // if we check if the user exists, then a update (no shell -> jailkit) will not work
         // and the user has FULL ACCESS to the root of the server!
         $command = '/usr/local/ispconfig/server/scripts/create_jailkit_user.sh';
         $command .= ' '.escapeshellcmd($this->data['new']['username']);
         $command .= ' '.escapeshellcmd($this->data['new']['dir']);
         $command .= ' '.$jailkit_chroot_userhome;
         $command .= ' '.escapeshellcmd($this->data['new']['shell']);
         $command .= ' '.$this->data['new']['puser'];
         $command .= ' '.$jailkit_chroot_puserhome;
         exec($command);
            
            $this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG);
         $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));
         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));
            
            $this->app->log("Added created jailkit user home in : ".$this->data['new']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
         $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));
            
            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));
				
            $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);
   }
   
   //* 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);
   }

} // end class