Merge branch 'letsencrypt-alias' into 'stable-3.1'

Marius Burkard

2016-07-04 67f562d6772e032e72a6fe11a2cf2a90fd62b73b

 server/plugins-available/shelluser_base_plugin.inc.php

@@ -79,7 +79,7 @@
      }

      //* Check if the resulting path is inside the docroot
      $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id']));
      $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;
@@ -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
@@ -111,16 +113,20 @@
               $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'), '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($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']));
               $app->system->chgrp(escapeshellcmd($homedir),escapeshellcmd($data['new']['pgroup']));
               $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($homedir);
@@ -134,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");
@@ -143,9 +153,15 @@

            //* Create .bash_history file
            $app->system->touch(escapeshellcmd($homedir).'/.bash_history');
            $app->system->chmod(escapeshellcmd($homedir).'/.bash_history', 0755);
            $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') {
@@ -176,7 +192,7 @@
      }

      //* Check if the resulting path is inside the docroot
      $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id']));
      $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;
@@ -194,6 +210,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
         $uid = intval($app->system->getuid($data['new']['puser']));
@@ -210,6 +228,9 @@
            
            // 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']);
@@ -232,17 +253,17 @@
                     $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), '0750');
                  $app->system->chown(escapeshellcmd($homedir),escapeshellcmd($data['new']['puser']));
                  $app->system->chgrp(escapeshellcmd($homedir),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'), '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($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']));
@@ -262,11 +283,21 @@
               //* Create .bash_history file
               if(!is_file($data['new']['dir']).'/.bash_history') {
                  $app->system->touch(escapeshellcmd($homedir).'/.bash_history');
                  $app->system->chmod(escapeshellcmd($homedir).'/.bash_history', 0755);
                  $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);
@@ -297,9 +328,10 @@
            $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` = \'' . $app->db->quote($data['old']['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
@@ -382,11 +414,11 @@
      global $app;
      $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);
@@ -394,7 +426,7 @@
      // ssh-rsa authentication variables
      //$sshrsa = $this->data['new']['ssh_rsa'];
      $sshrsa = '';
      $ssh_users = $app->db->queryAllRecords("SELECT ssh_rsa FROM shell_user WHERE parent_domain_id = ".intval($this->data['new']['parent_domain_id']));
      $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'];
@@ -424,7 +456,7 @@
         $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);
         $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');