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

Jump to bottom

[sweep:integration] fix(HTCondorCE): UseSSLSubmission: we can just use the proxy file for everything #7715

Merged
merged 1 commit into from
Jun 28, 2024
Merged

[sweep:integration] fix(HTCondorCE): UseSSLSubmission: we can just use the proxy file for everything #7715

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: 4 additions & 8 deletions src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading