Removed template selector from reseller limits as templates are for clients...

tbrehm

2011-09-26 ba3e3e48e6ec4523ae26dc6c206d5bfdfa08d332

 server/plugins-available/shelluser_base_plugin.inc.php

@@ -194,59 +194,60 @@
      
   }
   
   function _setup_ssh_rsa() {
         //global $app, $conf;
         //$app->uses('system');
         // Okay, here we have a question, .. how to determine the client id
         //$var = "Var:".intval($this->app->system->getuid($this->data['new']['puser']));
         //exec("echo $var >> /tmp/debug");
         /*
         // ssh-rsa authentication variables
         $sshrsa = escapeshellcmd($this->data['new']['ssh_rsa']);
         $usrdir = escapeshellcmd($this->data['new']['dir']);
         $sshdir = escapeshellcmd($this->data['new']['dir']).'/.ssh';
         $sshkeys= escapeshellcmd($this->data['new']['dir']).'/.ssh/authorized_keys';
			
         // 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 ""');
            $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 = ".$this->id;
            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'");
         }
   private function _setup_ssh_rsa() {
      $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']));
      $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']);
      $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'");
			
         // 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);
         $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'");
		
   }