Database quota fix % lost in change

Pascal Dreissen

2016-07-08 f1193b43f4c9fd132741d30f03f0b35841011989

 server/plugins-available/shelluser_base_plugin.inc.php

@@ -96,6 +96,8 @@
         return false;
      }

      if($data['new']['active'] != 'y') $data['new']['shell'] = '/bin/false';
		
      if($app->system->is_user($data['new']['puser'])) {

         // Get the UID of the parent user
@@ -103,14 +105,31 @@
         if($uid > $this->min_uid) {
            //* Remove webfolder protection
            $app->system->web_folder_protection($web['document_root'], false);

            if(!is_dir($data['new']['dir'])){
               $app->file->mkdirs(escapeshellcmd($data['new']['dir']), '0700');
               $app->system->chown(escapeshellcmd($data['new']['dir']),escapeshellcmd($data['new']['username']));
               $app->system->chgrp(escapeshellcmd($data['new']['dir']),escapeshellcmd($data['new']['pgroup']));
				
            //* Home directory of the new shell user
            if($data['new']['chroot'] == 'jailkit') {
               $homedir = $data['new']['dir'];
            } else {
               $homedir = $data['new']['dir'].'/home/'.$data['new']['username'];
            }
				
            // Create home base directory if it does not exist
            if(!is_dir($data['new']['dir'].'/home')){
               $app->file->mkdirs(escapeshellcmd($data['new']['dir'].'/home'), '0755');
            }
				
            // Change ownership of home base dir to root user
            $app->system->chown(escapeshellcmd($data['new']['dir'].'/home'),'root');
            $app->system->chgrp(escapeshellcmd($data['new']['dir'].'/home'),'root');
            $app->system->chmod(escapeshellcmd($data['new']['dir'].'/home'),0755);
				
            if(!is_dir($homedir)){
               $app->file->mkdirs(escapeshellcmd($homedir), '0750');
               $app->system->chown(escapeshellcmd($homedir),escapeshellcmd($data['new']['puser']),false);
               $app->system->chgrp(escapeshellcmd($homedir),escapeshellcmd($data['new']['pgroup']),false);
            }
            $command = 'useradd';
            $command .= ' -d '.escapeshellcmd($data['new']['dir']);
            $command .= ' -d '.escapeshellcmd($homedir);
            $command .= ' -g '.escapeshellcmd($data['new']['pgroup']);
            $command .= ' -o '; // non unique
            if($data['new']['password'] != '') $command .= ' -p '.escapeshellcmd($data['new']['password']);
@@ -121,6 +140,10 @@
            exec($command);
            $app->log("Executed command: ".$command, LOGLEVEL_DEBUG);
            $app->log("Added shelluser: ".$data['new']['username'], LOGLEVEL_DEBUG);
				
            $app->system->chown(escapeshellcmd($data['new']['dir']),escapeshellcmd($data['new']['username']),false);
            $app->system->chgrp(escapeshellcmd($data['new']['dir']),escapeshellcmd($data['new']['pgroup']),false);
				

            // call the ssh-rsa update function
            $app->uses("getconf");
@@ -129,10 +152,16 @@
            $this->_setup_ssh_rsa();

            //* Create .bash_history file
            $app->system->touch(escapeshellcmd($data['new']['dir']).'/.bash_history');
            $app->system->chmod(escapeshellcmd($data['new']['dir']).'/.bash_history', 0755);
            $app->system->chown(escapeshellcmd($data['new']['dir']).'/.bash_history', $data['new']['username']);
            $app->system->chgrp(escapeshellcmd($data['new']['dir']).'/.bash_history', $data['new']['pgroup']);
            $app->system->touch(escapeshellcmd($homedir).'/.bash_history');
            $app->system->chmod(escapeshellcmd($homedir).'/.bash_history', 0750);
            $app->system->chown(escapeshellcmd($homedir).'/.bash_history', $data['new']['username']);
            $app->system->chgrp(escapeshellcmd($homedir).'/.bash_history', $data['new']['pgroup']);

            //* Create .profile file
            $app->system->touch(escapeshellcmd($homedir).'/.profile');
            $app->system->chmod(escapeshellcmd($homedir).'/.profile', 0644);
            $app->system->chown(escapeshellcmd($homedir).'/.profile', $data['new']['username']);
            $app->system->chgrp(escapeshellcmd($homedir).'/.profile', $data['new']['pgroup']);

            //* Disable shell user temporarily if we use jailkit
            if($data['new']['chroot'] == 'jailkit') {
@@ -181,12 +210,27 @@
         return false;
      }
      
      if($data['new']['active'] != 'y') $data['new']['shell'] = '/bin/false';
		
      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) {
				
            //* Home directory of the shell user
            if($data['new']['chroot'] == 'jailkit') {
               $homedir = $data['new']['dir'];
               $homedir_old = $data['old']['dir'];
            } else {
               $homedir = $data['new']['dir'].'/home/'.$data['new']['username'];
               $homedir_old = $data['old']['dir'].'/home/'.$data['old']['username'];
            }
				
            // Check if the user that we want to update exists, if not, we insert it
            if($app->system->is_user($data['old']['username'])) {
               //* Remove webfolder protection
               $app->system->web_folder_protection($web['document_root'], false);
					
               /*
               $command = 'usermod';
               $command .= ' --home '.escapeshellcmd($data['new']['dir']);
@@ -202,12 +246,32 @@
               $app->log("Executed command: $command ",LOGLEVEL_DEBUG);
               */
               //$groupinfo = $app->system->posix_getgrnam($data['new']['pgroup']);
               if($data['new']['dir'] != $data['old']['dir'] && !is_dir($data['new']['dir'])){
                  $app->file->mkdirs(escapeshellcmd($data['new']['dir']), '0700');
                  $app->system->chown(escapeshellcmd($data['new']['dir']),escapeshellcmd($data['new']['username']));
                  $app->system->chgrp(escapeshellcmd($data['new']['dir']),escapeshellcmd($data['new']['pgroup']));
               if($homedir != $homedir_old && !is_dir($homedir)){
                  $app->system->web_folder_protection($web['document_root'], false);
                  if(!is_dir($data['new']['dir'].'/home')){
                     $app->file->mkdirs(escapeshellcmd($data['new']['dir'].'/home'), '0750');
                     $app->system->chown(escapeshellcmd($data['new']['dir'].'/home'),escapeshellcmd($data['new']['puser']));
                     $app->system->chgrp(escapeshellcmd($data['new']['dir'].'/home'),escapeshellcmd($data['new']['pgroup']));
                  }
                  $app->file->mkdirs(escapeshellcmd($homedir), '0755');
                  $app->system->chown(escapeshellcmd($homedir),'root');
                  $app->system->chgrp(escapeshellcmd($homedir),'root');
                  $app->system->web_folder_protection($web['document_root'], true);
               } else {
                  if(!is_dir($homedir)){
                     $app->system->web_folder_protection($web['document_root'], false);
                     if(!is_dir($data['new']['dir'].'/home')){
                        $app->file->mkdirs(escapeshellcmd($data['new']['dir'].'/home'), '0755');
                        $app->system->chown(escapeshellcmd($data['new']['dir'].'/home'),'root');
                        $app->system->chgrp(escapeshellcmd($data['new']['dir'].'/home'),'root');
                     }
                     $app->file->mkdirs(escapeshellcmd($homedir), '0750');
                     $app->system->chown(escapeshellcmd($homedir),escapeshellcmd($data['new']['puser']));
                     $app->system->chgrp(escapeshellcmd($homedir),escapeshellcmd($data['new']['pgroup']));
                     $app->system->web_folder_protection($web['document_root'], true);
                  }
               }
               $app->system->usermod($data['old']['username'], 0, $app->system->getgid($data['new']['pgroup']), $data['new']['dir'], $data['new']['shell'], $data['new']['password'], $data['new']['username']);
               $app->system->usermod($data['old']['username'], 0, $app->system->getgid($data['new']['pgroup']), $homedir, $data['new']['shell'], $data['new']['password'], $data['new']['username']);
               $app->log("Updated shelluser: ".$data['old']['username'], LOGLEVEL_DEBUG);

               // call the ssh-rsa update function
@@ -218,12 +282,22 @@

               //* Create .bash_history file
               if(!is_file($data['new']['dir']).'/.bash_history') {
                  $app->system->touch(escapeshellcmd($data['new']['dir']).'/.bash_history');
                  $app->system->chmod(escapeshellcmd($data['new']['dir']).'/.bash_history', 0755);
                  $app->system->chown(escapeshellcmd($data['new']['dir']).'/.bash_history', escapeshellcmd($data['new']['username']));
                  $app->system->chgrp(escapeshellcmd($data['new']['dir']).'/.bash_history', escapeshellcmd($data['new']['pgroup']));
                  $app->system->touch(escapeshellcmd($homedir).'/.bash_history');
                  $app->system->chmod(escapeshellcmd($homedir).'/.bash_history', 0750);
                  $app->system->chown(escapeshellcmd($homedir).'/.bash_history', escapeshellcmd($data['new']['username']));
                  $app->system->chgrp(escapeshellcmd($homedir).'/.bash_history', escapeshellcmd($data['new']['pgroup']));
               }
					
               //* Create .profile file
               if(!is_file($data['new']['dir']).'/.profile') {
                  $app->system->touch(escapeshellcmd($homedir).'/.profile');
                  $app->system->chmod(escapeshellcmd($homedir).'/.profile', 0644);
                  $app->system->chown(escapeshellcmd($homedir).'/.profile', escapeshellcmd($data['new']['username']));
                  $app->system->chgrp(escapeshellcmd($homedir).'/.profile', escapeshellcmd($data['new']['pgroup']));
               }

               //* Add webfolder protection again
               $app->system->web_folder_protection($web['document_root'], true);
            } else {
               // The user does not exist, so we insert it now
               $this->insert($event_name, $data);
@@ -239,7 +313,7 @@
   function delete($event_name, $data) {
      global $app, $conf;

      $app->uses('system,getconf');
      $app->uses('system,getconf,services');
      
      $security_config = $app->getconf->get_security_config('permissions');
      if($security_config['allow_shell_user'] != 'yes') {
@@ -251,16 +325,22 @@
         // Get the UID of the user
         $userid = intval($app->system->getuid($data['old']['username']));
         if($userid > $this->min_uid) {
            $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['old']['parent_domain_id']));
					
            // check if we have to delete the dir
            $check = $app->db->queryOneRecord('SELECT shell_user_id FROM `shell_user` WHERE `dir` = ?', $data['old']['dir']);
            if(!$check && is_dir($data['old']['dir'])) {
               
               $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $data['old']['parent_domain_id']);
					
               $app->system->web_folder_protection($web['document_root'], false);
               
               // delete dir
               $homedir = $data['old']['dir'];
               if($data['new']['chroot'] == 'jailkit') {
                  $homedir = $data['old']['dir'];
               } else {
                  $homedir = $data['old']['dir'].'/home/'.$data['old']['username'];
               }
				
               if(substr($homedir, -1) !== '/') $homedir .= '/';
               $files = array('.bash_logout', '.bash_history', '.bashrc', '.profile');
               $dirs = array('.ssh', '.cache');
@@ -292,10 +372,33 @@
            
            // We delete only non jailkit users, jailkit users will be deleted by the jailkit plugin.
            if ($data['old']['chroot'] != "jailkit") {
               // if this web uses PHP-FPM, that PPH-FPM service must be stopped before we can delete this user
               if($web['php'] == 'php-fpm'){
                  if(trim($web['fastcgi_php_version']) != ''){
                     $default_php_fpm = false;
                     list($custom_php_fpm_name, $custom_php_fpm_init_script, $custom_php_fpm_ini_dir, $custom_php_fpm_pool_dir) = explode(':', trim($web['fastcgi_php_version']));
                  } else {
                     $default_php_fpm = true;
                  }
                  $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
                  if(!$default_php_fpm){
                     $app->services->restartService('php-fpm', 'stop:'.$custom_php_fpm_init_script);
                  } else {
                     $app->services->restartService('php-fpm', 'stop:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
                  }
               }
               $command = 'killall -u '.escapeshellcmd($data['old']['username']).' ; userdel -f';
               $command .= ' '.escapeshellcmd($data['old']['username']).' &> /dev/null';
               exec($command);
               $app->log("Deleted shelluser: ".$data['old']['username'], LOGLEVEL_DEBUG);
               // start PHP-FPM again
               if($web['php'] == 'php-fpm'){
                  if(!$default_php_fpm){
                     $app->services->restartService('php-fpm', 'start:'.$custom_php_fpm_init_script);
                  } else {
                     $app->services->restartService('php-fpm', 'start:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
                  }
               }
            }

         } else {
@@ -331,6 +434,12 @@
      }
      $sshrsa = trim($sshrsa);
      $usrdir = escapeshellcmd($this->data['new']['dir']);
      //* Home directory of the new shell user
      if($this->data['new']['chroot'] == 'jailkit') {
         $usrdir = escapeshellcmd($this->data['new']['dir']);
      } else {
         $usrdir = escapeshellcmd($this->data['new']['dir'].'/home/'.$this->data['new']['username']);
      }
      $sshdir = $usrdir.'/.ssh';
      $sshkeys= $usrdir.'/.ssh/authorized_keys';