Merge pull request #7478 from atsareg/fix-ssl-proxy

[8.0] Fix DISET calls with proxy to be used passed as an argument
DIRACGrid · Feb 23, 2024 · 495785e · 495785e
2 parents 0941096 + 46584c1
commit 495785e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/DIRAC/Core/DISET/private/Transports/SSL/M2Utils.py b/src/DIRAC/Core/DISET/private/Transports/SSL/M2Utils.py
@@ -101,6 +101,8 @@ def getM2SSLContext(ctx=None, **kwargs):
             with tempfile.NamedTemporaryFile(mode="w") as tmpFile:
                 tmpFilePath = tmpFile.name
                 tmpFile.write(kwargs["proxyString"])
+                # Flush, otherwise the file is empty in the subsequent call
+                tmpFile.flush()
                 __loadM2SSLCTXProxy(ctx, proxyPath=tmpFilePath)
         else:
             # Use normal proxy

diff --git a/src/DIRAC/Core/DISET/private/Transports/SSLTransport.py b/src/DIRAC/Core/DISET/private/Transports/SSLTransport.py
@@ -48,7 +48,7 @@ def checkSanity(urlTuple, kwargs):
         certFile = certTuple[0]
         useCerts = True
     elif "proxyString" in kwargs:
-        if not isinstance(kwargs["proxyString"], bytes):
+        if not isinstance(kwargs["proxyString"], str):
             gLogger.error("proxyString parameter is not a valid type", str(type(kwargs["proxyString"])))
             return S_ERROR("proxyString parameter is not a valid type")
     else: