Enhance executor classes with environment handling and user login retrieval

Author: Vítězslav Dvořák

src/MultiFlexi/CommonExecutor.php

@@ -34,14 +34,15 @@ abstract class CommonExecutor extends \Ease\Sand
     public function __construct(Job &$job)
     {
         $this->setObjectName();
+        $this->environment = new ConfigFields('Executor'.\Ease\Functions::baseClassName($this));
         $this->setJob($job);
     }
 
     public function setJob(Job &$job): void
     {
         $this->job = &$job;
         $this->setObjectName($job->getMyKey().'@'.\Ease\Logger\Message::getCallerName($this));
-        $this->environment = $job->getEnvironment();
+        $this->environment->addFields($job->getEnvironment());
     }
 
     /**
@@ -73,4 +74,9 @@ public function getPid(): ?int
     {
         return $this->pid;
     }
+
+    public function getEnvironment(): ConfigFields
+    {
+        return $this->environment;
+    }
 }

src/MultiFlexi/Configuration.php

@@ -73,10 +73,10 @@ public function getConfigFields(): ConfigFields
     {
         $cnf = new ConfigFields('');
 
-        foreach ((array)$this->getData() as $cfgRaw) {
+        foreach ((array) $this->getData() as $cfgRaw) {
             $cnf->addField(new ConfigField($cfgRaw['name'], $cfgRaw['type'], $cfgRaw['name'], '', '', $cfgRaw['value']));
         }
-        
+
         return $cnf;
     }
 

src/MultiFlexi/Executor/Native.php

@@ -31,6 +31,15 @@ class Native extends \MultiFlexi\CommonExecutor implements \MultiFlexi\executor
     private string $commandline;
     private \MultiFlexi\ConfigFields $jobFiles;
 
+    public function __construct(\MultiFlexi\Job &$job)
+    {
+        parent::__construct($job);
+
+        foreach (getenv() as $key => $value) {
+            $this->environment->addField(new \MultiFlexi\ConfigField($key, 'string', $key, '', '', $value));
+        }
+    }
+
     public static function name(): string
     {
         return _('Native');

src/MultiFlexi/UnixUser.php

@@ -29,7 +29,7 @@ public function __construct($userID = null)
          * If the user does not exist in the 'user' table, create a new one.
          */
         /** @var string $unixUsername */
-        $unixUsername = $userID ?? get_current_user();
+        $unixUsername = $userID ?? $this->getUserLogin();
 
         parent::__construct($unixUsername);
 
@@ -51,4 +51,9 @@ public function __construct($userID = null)
             }
         }
     }
+
+    public function getUserLogin(): string
+    {
+        return get_current_user();
+    }
 }

src/MultiFlexi/User.php

@@ -74,6 +74,7 @@ public function __construct($userID = null)
         if ($userID) {
             $this->setKeyColumn(is_numeric($userID) ? 'id' : 'login');
             $this->loadFromSQL($userID);
+            $this->setKeyColumn('id');
         }
     }
 

src/MultiFlexi/executor.php

@@ -40,6 +40,8 @@ public function commandline(): string;
 
     public function getPid(): ?int;
 
+    public function getEnvironment(): ConfigFields;
+
     /**
      * Can this Executor execute given application ?
      *