Merge pull request #8063 from chrisburr/pilot-non-utf8

[8.0] Supress non-UTF8 variables from pilot environment

Author: fstagni

.github/workflows/pilotWrapper.yml

@@ -35,6 +35,7 @@ jobs:
         conda create -c conda-forge -c free -n python_${{ matrix.python }} python=${{ matrix.python }}
     - name: run pilot wrapper test
       run: |
+        export INVALID_UTF8_VAR=$'\xff'
         cp tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py .
         eval "$(conda shell.bash hook)" && conda activate python_${{ matrix.python }}
         # use github APIs to get the artifacts URLS from https://github.com/DIRACGrid/Pilot/, for those named Pilot_${{ matrix.pilot_branch }}

src/DIRAC/WorkloadManagementSystem/Utilities/PilotWrapper.py

@@ -68,7 +68,15 @@
 # just logging the environment as first thing
 logger.debug('===========================================================')
 logger.debug('Environment of execution host\\n')
-for key, val in os.environ.items():
+for key, val in getattr(os, "environb", os.environ).items():
+  # Clean the environment of non-utf-8 characters
+  try:
+    key = key.decode("utf-8")
+    val = val.decode("utf-8")
+  except UnicodeDecodeError as e:
+    logger.error("Dropping %%s=%%s due to: %%s", key, val, e)
+    del os.environ[key]
+    continue
   logger.debug(key + '=' + val)
 logger.debug('===========================================================\\n')