Merge pull request #8136 from chaen/tokens_for_pilot

fix (proxy): pilot proxy are shipped with a token

Author: fstagni

src/DIRAC/Resources/Computing/PilotBundle.py

@@ -1,7 +1,8 @@
 """
-  Collection of Utilities to handle pilot jobs
+Collection of Utilities to handle pilot jobs
 
 """
+
 import os
 import base64
 import bz2
@@ -11,7 +12,16 @@
 def bundleProxy(executableFile, proxy):
     """Create a self extracting archive bundling together an executable script and a proxy"""
 
-    compressedAndEncodedProxy = base64.b64encode(bz2.compress(proxy.dumpAllToString()["Value"])).decode()
+    from pathlib import Path
+    from DIRAC.Core.Security.ProxyFile import writeChainToTemporaryFile
+
+    retVal = writeChainToTemporaryFile(proxy)
+    proxyLocation = Path(retVal["Value"])
+    proxy_string = proxyLocation.read_text()
+    proxyLocation.unlink()
+
+    # Note: I'd expect that to fail, as bz2.compress expects bytes, and not a string
+    compressedAndEncodedProxy = base64.b64encode(bz2.compress(proxy_string)).decode()
     with open(executableFile, "rb") as fp:
         compressedAndEncodedExecutable = base64.b64encode(bz2.compress(fp.read(), 9)).decode()
 

src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py

@@ -478,8 +478,6 @@ def _setupProxy(self, owner, ownerGroup):
 
         proxyChain = ret["Value"]["chain"]
         if "groupProperties" not in ret["Value"]:
-            print(ret["Value"])
-            print(proxyChain.dumpAllToString())
             self.log.error("Invalid Proxy", "Group has no properties defined")
             return S_ERROR("Proxy has no group properties defined")
 

src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py

@@ -695,6 +695,8 @@ def _writePilotScript(
         :returns: file name of the pilot wrapper created
         """
 
+        pilotFilesCompressedEncodedDict = None
+
         try:
             pilotFilesCompressedEncodedDict = getPilotFilesCompressedEncodedDict([], proxy)
         except Exception as be:

src/DIRAC/WorkloadManagementSystem/Utilities/PilotWrapper.py

@@ -1,23 +1,25 @@
-""" Module holding function(s) creating the pilot wrapper.
+"""Module holding function(s) creating the pilot wrapper.
 
-    This is a DIRAC-free module, so it could possibly be used also outside of DIRAC installations.
+This is a DIRAC-free module, so it could possibly be used also outside of DIRAC installations.
 
-    The main client of this module is the SiteDirector, that invokes the functions here more or less like this::
+The main client of this module is the SiteDirector, that invokes the functions here more or less like this::
 
-        pilotFilesCompressedEncodedDict = getPilotFilesCompressedEncodedDict(pilotFiles)
-        localPilot = pilotWrapperScript(pilotFilesCompressedEncodedDict,
-                                        pilotOptions,
-                                        pilotExecDir)
-       _writePilotWrapperFile(localPilot=localPilot)
+    pilotFilesCompressedEncodedDict = getPilotFilesCompressedEncodedDict(pilotFiles)
+    localPilot = pilotWrapperScript(pilotFilesCompressedEncodedDict,
+                                    pilotOptions,
+                                    pilotExecDir)
+   _writePilotWrapperFile(localPilot=localPilot)
 
 """
+
 from __future__ import absolute_import, division, print_function
 
 import base64
 import bz2
 import os
 import tempfile
 
+
 pilotWrapperContent = """#!/bin/bash
 # Reduce the maximum allowed number of open file descriptors as micromamba
 # gets stuck due to https://github.com/DaanDeMeyer/reproc/pull/103
@@ -411,7 +413,15 @@ def getPilotFilesCompressedEncodedDict(pilotFiles, proxy=None):
         pilotFilesCompressedEncodedDict[os.path.basename(pf)] = pfContentEncoded
 
     if proxy is not None:
-        compressedAndEncodedProxy = base64.b64encode(bz2.compress(proxy.dumpAllToString()["Value"].encode()))
+        from pathlib import Path  # pylint: disable=import-error
+        from DIRAC.Core.Security.ProxyFile import writeChainToTemporaryFile  # pylint: disable=import-error
+
+        retVal = writeChainToTemporaryFile(proxy)
+        proxyLocation = Path(retVal["Value"])
+        proxy_string = proxyLocation.read_text()
+        proxyLocation.unlink()
+
+        compressedAndEncodedProxy = base64.b64encode(bz2.compress(proxy_string.encode()))
         pilotFilesCompressedEncodedDict["proxy"] = compressedAndEncodedProxy
 
     return pilotFilesCompressedEncodedDict