Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sweep:integration] HTCondorCE: fix HOME for useSSL #7677

Merged
merged 1 commit into from
Jun 18, 2024
+15 −11
Merged

[sweep:integration] HTCondorCE: fix HOME for useSSL #7677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/DIRAC/Core/Security/Locations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ def getCertificateAndKeyLocation():
if "X509_USER_CERT" in os.environ:
if os.path.exists(os.environ["X509_USER_CERT"]):
certfile = os.environ["X509_USER_CERT"]
if not certfile:
if os.path.exists(os.environ["HOME"] + "/.globus/usercert.pem"):
certfile = os.environ["HOME"] + "/.globus/usercert.pem"
if not certfile and (home := os.environ.get("HOME")):
if os.path.exists(home + "/.globus/usercert.pem"):
certfile = home + "/.globus/usercert.pem"

if not certfile:
return False
Expand All @@ -161,9 +161,9 @@ def getCertificateAndKeyLocation():
if "X509_USER_KEY" in os.environ:
if os.path.exists(os.environ["X509_USER_KEY"]):
keyfile = os.environ["X509_USER_KEY"]
if not keyfile:
if os.path.exists(os.environ["HOME"] + "/.globus/userkey.pem"):
keyfile = os.environ["HOME"] + "/.globus/userkey.pem"
if not keyfile and (home := os.environ.get("HOME")):
if os.path.exists(home + "/.globus/userkey.pem"):
keyfile = home + "/.globus/userkey.pem"

if not keyfile:
return False
Expand Down
14 changes: 9 additions & 5 deletions src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
import uuid

from DIRAC import S_ERROR, S_OK, gConfig
from DIRAC.Core.Security.Locations import getCAsLocation, getCertificateAndKeyLocation
from DIRAC.Core.Security.Locations import getCAsLocation
from DIRAC.Core.Utilities.File import mkDir
from DIRAC.Core.Utilities.List import breakListIntoChunks
from DIRAC.Core.Utilities.Subprocess import systemCall
Expand Down Expand Up @@ -247,14 +247,18 @@ def _executeCondorCommand(self, cmd, keepTokenFile=False):
}

if self.useSSLSubmission:
if not (certAndKey := getCertificateAndKeyLocation()):
return S_ERROR("You want to use SSL Submission, but no certificate and key are present")
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/"
)
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": certAndKey[0],
"_condor_AUTH_SSL_CLIENT_KEYFILE": certAndKey[1],
"_condor_AUTH_SSL_CLIENT_CERTFILE": certFile,
"_condor_AUTH_SSL_CLIENT_KEYFILE": keyFile,
"_condor_AUTH_SSL_CLIENT_CADIR": caFiles,
"_condor_AUTH_SSL_SERVER_CADIR": caFiles,
"_condor_AUTH_SSL_USE_CLIENT_PROXY_ENV_VAR": "false",
Expand Down
Loading