Database quota fix % lost in change

Pascal Dreissen

2016-07-08 f1193b43f4c9fd132741d30f03f0b35841011989

 server/plugins-available/shelluser_base_plugin.inc.php

@@ -29,104 +29,209 @@
*/

class shelluser_base_plugin {
	

   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;
      }
		

   }
	
		


   /*
       This function is called when the plugin is loaded
   */
	

   function onLoad() {
      global $app;
		

      /*
      Register for the events
      */
      
      $app->plugins->registerEvent('shell_user_insert',$this->plugin_name,'insert');
      $app->plugins->registerEvent('shell_user_update',$this->plugin_name,'update');
      $app->plugins->registerEvent('shell_user_delete',$this->plugin_name,'delete');

      $app->plugins->registerEvent('shell_user_insert', $this->plugin_name, 'insert');
      $app->plugins->registerEvent('shell_user_update', $this->plugin_name, 'update');
      $app->plugins->registerEvent('shell_user_delete', $this->plugin_name, 'delete');
      

   }
	
	
   function insert($event_name,$data) {


   function insert($event_name, $data) {
      global $app, $conf;
      
      $app->uses('system');
      $app->uses('system,getconf');
		
      $security_config = $app->getconf->get_security_config('permissions');
      if($security_config['allow_shell_user'] != 'yes') {
         $app->log('Shell user plugin disabled by security settings.',LOGLEVEL_WARN);
         return false;
      }

      //* Check if the resulting path is inside the docroot
      $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $data['new']['parent_domain_id']);
      if(substr($data['new']['dir'],0,strlen($web['document_root'])) != $web['document_root']) {
         $app->log('Directory of the shell user is outside of website docroot.',LOGLEVEL_WARN);
         return false;
      }
      if(strpos($data['new']['dir'], '/../') !== false || substr($data['new']['dir'],-3) == '/..') {
         $app->log('Directory of the shell user is not valid.',LOGLEVEL_WARN);
         return false;
      }
		
      if(!$app->system->is_allowed_user($data['new']['username'], false, false)
         || !$app->system->is_allowed_user($data['new']['puser'], true, true)
         || !$app->system->is_allowed_group($data['new']['pgroup'], true, true)) {
         $app->log('Shell user must not be root or in group root.',LOGLEVEL_WARN);
         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) {
            //* Remove webfolder protection
            $app->system->web_folder_protection($web['document_root'], false);
				
            //* 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']);
            $command .= ' -s '.escapeshellcmd($data['new']['shell']);
            $command .= ' -u '.escapeshellcmd($uid);
            $command .= ' '.escapeshellcmd($data['new']['username']);
			

            exec($command);
            $app->log("Executed command: ".$command,LOGLEVEL_DEBUG);
            $app->log("Added shelluser: ".$data['new']['username'],LOGLEVEL_DEBUG);
								
            $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");
            $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']));
				
            $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') {
               $command = 'usermod -s /bin/false -L '.escapeshellcmd($data['new']['username']);
               $command = 'usermod -s /bin/false -L '.escapeshellcmd($data['new']['username']).' 2>/dev/null';
               exec($command);
               $app->log("Disabling shelluser temporarily: ".$command,LOGLEVEL_DEBUG);
               $app->log("Disabling shelluser temporarily: ".$command, LOGLEVEL_DEBUG);
            }
			

            //* Add webfolder protection again
            $app->system->web_folder_protection($web['document_root'], true);
         } else {
            $app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.",LOGLEVEL_ERROR);
            $app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.", LOGLEVEL_ERROR);
         }
      } else {
         $app->log("Skipping insertion of user:".$data['new']['username'].", parent user ".$data['new']['puser']." does not exist.",LOGLEVEL_WARN);
         $app->log("Skipping insertion of user:".$data['new']['username'].", parent user ".$data['new']['puser']." does not exist.", LOGLEVEL_WARN);
      }
   }
	
   function update($event_name,$data) {

   function update($event_name, $data) {
      global $app, $conf;

      $app->uses('system,getconf');
      
      $app->uses('system');
      $security_config = $app->getconf->get_security_config('permissions');
      if($security_config['allow_shell_user'] != 'yes') {
         $app->log('Shell user plugin disabled by security settings.',LOGLEVEL_WARN);
         return false;
      }

      //* Check if the resulting path is inside the docroot
      $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $data['new']['parent_domain_id']);
      if(substr($data['new']['dir'],0,strlen($web['document_root'])) != $web['document_root']) {
         $app->log('Directory of the shell user is outside of website docroot.',LOGLEVEL_WARN);
         return false;
      }
		
      if(strpos($data['new']['dir'], '/../') !== false || substr($data['new']['dir'],-3) == '/..') {
         $app->log('Directory of the shell user is not valid.',LOGLEVEL_WARN);
         return false;
      }

      if(!$app->system->is_allowed_user($data['new']['username'], false, false)
         || !$app->system->is_allowed_user($data['new']['puser'], true, true)
         || !$app->system->is_allowed_group($data['new']['pgroup'], true, true)) {
         $app->log('Shell user must not be root or in group root.',LOGLEVEL_WARN);
         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']);
               $command .= ' --gid '.escapeshellcmd($data['new']['pgroup']);
@@ -136,111 +241,237 @@
               // $command .= ' --uid '.escapeshellcmd($uid);
               $command .= ' --login '.escapeshellcmd($data['new']['username']);
               $command .= ' '.escapeshellcmd($data['old']['username']);
			

               exec($command);
               $app->log("Executed command: $command ",LOGLEVEL_DEBUG);
               $app->log("Updated shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
									
               */
               //$groupinfo = $app->system->posix_getgrnam($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']), $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
               $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']));
                  $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);
               $this->insert($event_name, $data);
            }
         } else {
            $app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.",LOGLEVEL_ERROR);
            $app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.", LOGLEVEL_ERROR);
         }
      } else {
         $app->log("Skipping update for user:".$data['new']['username'].", parent user ".$data['new']['puser']." does not exist.",LOGLEVEL_WARN);
         $app->log("Skipping update for user:".$data['new']['username'].", parent user ".$data['new']['puser']." does not exist.", LOGLEVEL_WARN);
      }
   }
	
   function delete($event_name,$data) {

   function delete($event_name, $data) {
      global $app, $conf;

      $app->uses('system,getconf,services');
      
      $app->uses('system');
		
      $security_config = $app->getconf->get_security_config('permissions');
      if($security_config['allow_shell_user'] != 'yes') {
         $app->log('Shell user plugin disabled by security settings.',LOGLEVEL_WARN);
         return false;
      }

      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) {
            $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
               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');
               foreach($files as $delfile) {
                  if(is_file($homedir . $delfile) && fileowner($homedir . $delfile) == $userid) unlink($homedir . $delfile);
               }
               foreach($dirs as $deldir) {
                  if(is_dir($homedir . $deldir) && fileowner($homedir . $deldir) == $userid) exec('rm -rf ' . escapeshellarg($homedir . $deldir));
               }
               $empty = true;
               $dirres = opendir($homedir);
               if($dirres) {
                  while(($entry = readdir($dirres)) !== false) {
                     if($entry != '.' && $entry != '..') {
                        $empty = false;
                        break;
                     }
                  }
                  closedir($dirres);
               }
               if($empty == true) {
                  rmdir($homedir);
               }
               unset($files);
               unset($dirs);
					
               $app->system->web_folder_protection($web['document_root'], true);
            }
				
            // 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']);
			
               // 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);
               $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 {
            $app->log("UID = $userid for shelluser:".$data['old']['username']." not allowed.",LOGLEVEL_ERROR);
            $app->log("UID = $userid for shelluser:".$data['old']['username']." not allowed.", LOGLEVEL_ERROR);
         }
      } else {
         $app->log("User:".$data['new']['username']." does not exist in in /etc/passwd, skipping delete.",LOGLEVEL_WARN);
         $app->log("User:".$data['new']['username']." does not exist in in /etc/passwd, skipping delete.", LOGLEVEL_WARN);
      }
		

   }
	

   private function _setup_ssh_rsa() {
      global $app;
      $this->app->log("ssh-rsa setup shelluser_base",LOGLEVEL_DEBUG);
      $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']));
      $domain_data = $this->app->db->queryOneRecord('SELECT sys_groupid FROM web_domain WHERE web_domain.domain_id = ?', $this->data['new']['parent_domain_id']);
      $sys_group_data = $this->app->db->queryOneRecord('SELECT * FROM sys_group WHERE sys_group.groupid = ?', $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);
      $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'];
      //$sshrsa = $this->data['new']['ssh_rsa'];
      $sshrsa = '';
      $ssh_users = $app->db->queryAllRecords("SELECT ssh_rsa FROM shell_user WHERE parent_domain_id = ?", $this->data['new']['parent_domain_id']);
      if(is_array($ssh_users)) {
         foreach($ssh_users as $sshu) {
            if($sshu['ssh_rsa'] != '') $sshrsa .= "\n".$sshu['ssh_rsa'];
         }
      }
      $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';
		

      $app->uses('file');
      $sshrsa = $app->file->unix_nl($sshrsa);
      $sshrsa = $app->file->remove_blank_lines($sshrsa,0);
		
      $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 = file_get_contents('/tmp/id_rsa.pub');
			
         $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 = '".file_get_contents('/tmp/id_rsa')."', ssh_rsa = '".$userkey."' WHERE client_id = ".$id);
			
         exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub');
         $this->app->log("ssh-rsa keypair generated for ".$username,LOGLEVEL_DEBUG);
         $this->app->db->query("UPDATE client SET created_at = UNIX_TIMESTAMP(), id_rsa = ?, ssh_rsa = ? WHERE client_id = ?", $app->system->file_get_contents('/tmp/id_rsa'), $userkey, $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');
         file_put_contents($sshkeys, file_get_contents('/root/.ssh/authorized_keys'));
		
         $app->file->mkdirs($sshdir, '0700');
         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);
         $existing_keys = @file($sshkeys);
         $new_keys = explode("\n", $userkey);
         $final_keys_arr = array_merge($existing_keys, $new_keys);
         $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){
@@ -248,36 +479,52 @@
            }
         }
         $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));
			

         // add the user's key
         file_put_contents($sshkeys, $final_keys);
         $app->system->file_put_contents($sshkeys, $final_keys);
         $app->file->remove_blank_lines($sshkeys);
         $this->app->log("ssh-rsa authorisation keyfile created in ".$sshkeys,LOGLEVEL_DEBUG);
         $this->app->log("ssh-rsa authorisation keyfile created in ".$sshkeys, LOGLEVEL_DEBUG);
      }
      if ($sshrsa != ''){
         // Remove duplicate keys
         $existing_keys = file($sshkeys);
         $new_keys = explode("\n", $sshrsa);
         $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);
            }

      //* 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]);
         }
         $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));
			
         // add the custom key 
         file_put_contents($sshkeys, $final_keys);
         $app->file->remove_blank_lines($sshkeys);
         $this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG);
      }

      //* 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'])." ".$usrdir);
      exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$sshdir);
      exec("chmod 600 '$sshkeys'");
		

   }
	


} // end class