Merge pull request #1501 from proditis/master

Minor fixes from tests

Author: proditis

backend/commands/CronController.php

@@ -264,7 +264,7 @@ public function actionInstances($pfonly = false)
           // Check existing environment variables for ETSCTF_FLAG keys
           foreach ($dc->targetVariables as $key => $tv) {
             // Replace the old key with the encrypted treasure
-            if ($tv->key == 'ETSCTF_FLAG') {
+            if ($tv->key == 'ETSCTF_FLAG' && array_key_exists('env',$encryptedTreasures['fs'])) {
               $tv->val = str_replace($encryptedTreasures['fs']['env'][0]['src'], $encryptedTreasures['fs']['env'][0]['dest'], $tv->val);
               break;
             }

backend/modules/infrastructure/models/TargetInstance.php

@@ -123,7 +123,7 @@ public function getEncryptedTreasures()
       ->where(['target_id' => $this->target_id]);
     $treasures = [];
     foreach ($query->all() as $t) {
-      if ($t->category == 'env' && $t->location == 'environment') {
+      if ($t->category == 'env' && ($t->location == 'environment' || $t->location == '')) {
         $treasures['env'][] = ["src" => $t->code, 'dest' => $t->encrypted_code];
       } else if (str_contains($t->location, $t->code)) {
         $treasures['mv'][] = ["src" => $t->location, 'dest' => str_replace($t->code, $t->encrypted_code, $t->location)];

contrib/multi-ports.py

@@ -47,7 +47,7 @@ def main():
                     # Process full lines from the buffer
                     while '\n' in buffers[sock]:
                         line, buffers[sock] = buffers[sock].split('\n', 1)  # Split at the first newline
-                        eprint(f"{line}")
+                        print(f"{line}")
                 else:
                     # Connection closed by the server
                     eprint(f"Connection to {sock.getpeername()[0]}:{sock.getpeername()[1]} closed.")