Merge pull request DIRACGrid#7715 from DIRACGridBot/cherry-pick-2-8c8…

…1ca70c-integration [sweep:integration] fix(HTCondorCE): UseSSLSubmission: we can just use the proxy file for everything
aldbr · Jun 28, 2024 · d0c1662 · d0c1662
2 parents 8726697 + 637ae87
commit d0c1662
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py b/src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py
@@ -247,18 +247,14 @@ def _executeCondorCommand(self, cmd, keepTokenFile=False):
         }
 
         if self.useSSLSubmission:
-            certFile = "/home/dirac/.globus/usercert.pem"
-            keyFile = "/home/dirac/.globus/userkey.pem"
-            if not (os.path.exists(certFile) and os.path.exists(keyFile)):
-                return S_ERROR(
-                    "You want to use SSL Submission, but certificate and key are not present in /home/dirac/.globus/"
-                )
+            # this is guaranteed by _prepareProxy above
+            proxyFile = os.environ.get("X509_USER_PROXY")
             if not (caFiles := getCAsLocation()):
                 return S_ERROR("You want to use SSL Submission, but no CA files are present")
             htcEnv = {
                 "_condor_SEC_CLIENT_AUTHENTICATION_METHODS": "SSL",
-                "_condor_AUTH_SSL_CLIENT_CERTFILE": certFile,
-                "_condor_AUTH_SSL_CLIENT_KEYFILE": keyFile,
+                "_condor_AUTH_SSL_CLIENT_CERTFILE": proxyFile,
+                "_condor_AUTH_SSL_CLIENT_KEYFILE": proxyFile,
                 "_condor_AUTH_SSL_CLIENT_CADIR": caFiles,
                 "_condor_AUTH_SSL_SERVER_CADIR": caFiles,
                 "_condor_AUTH_SSL_USE_CLIENT_PROXY_ENV_VAR": "false",