Updated shell user scripts to be more fault tolerant.

tbrehm

2008-12-16 74ba4e9af03b0c2995039aaf8b4470872d38daeb

 server/plugins-available/shelluser_base_plugin.inc.php

@@ -72,6 +72,7 @@
      
      $app->uses('system');
      
      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) {
@@ -90,6 +91,9 @@
      } else {
         $app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.",LOGLEVEL_ERROR);
      }
      } else {
         $app->log("Skippung insert of user:".$data['new']['username'].", parent user ".$data['new']['puser']." does not exist.",LOGLEVEL_WARN);
      }
   }
   
   function update($event_name,$data) {
@@ -97,9 +101,12 @@
      
      $app->uses('system');
      
      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) {
            // Check if the user that we want to update exists, if not, we insert it
            if($app->system->is_user($data['old']['username'])) {
         $command = 'usermod';
         $command .= ' --home '.escapeshellcmd($data['new']['dir']);
         $command .= ' --gid '.escapeshellcmd($data['new']['pgroup']);
@@ -113,9 +120,15 @@
         exec($command);
         // $app->log("Updated shelluser: $command ",LOGLEVEL_DEBUG);
         $app->log("Updated shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
			
            } else {
               // The user does not exist, so we insert it now
               $this->insert($event_name,$data);
            }
      } else {
         $app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.",LOGLEVEL_ERROR);
         }
      } else {
         $app->log("Skippung update for user:".$data['new']['username'].", parent user ".$data['new']['puser']." does not exist.",LOGLEVEL_WARN);
      }
   }
   
@@ -124,6 +137,7 @@
      
      $app->uses('system');
      
      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) {
@@ -134,7 +148,10 @@
         $app->log("Deleted shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
         
      } else {
         $app->log("UID = $userid for shelluser:".$data['new']['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);
      }
      
   }