Skip to content

Commit

Permalink
Merge pull request #7638 from andresailer/cherry-pick-2-bf44c17f0-int…
Browse files Browse the repository at this point in the history
…egration

[9.0] feat(HTCondorCE): add option to submit with SSL (sweep)
  • Loading branch information
fstagni committed Jun 5, 2024
2 parents b48aea6 + 4682809 commit 5ff14fc
Showing 1 changed file with 27 additions and 1 deletion.
28 changes: 27 additions & 1 deletion src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
then one does not need to run condor daemons on the submit machine.
If True requires the condor grid middleware (condor_submit, condor_history, condor_q, condor_rm)
UseSSLSubmission:
If 'True', use SSL via a DN configured at the given computing element to submit jobs.
This is a bridge feature until everyone is capable to use Tokens to submit to computing elements.
WorkingDirectory:
Location to store the pilot and condor log files locally. It should exist on the server and be accessible (both
readable and writeable). Also temporary files like condor submit files are kept here. This option is only read
Expand Down Expand Up @@ -54,7 +58,7 @@
import uuid

from DIRAC import S_ERROR, S_OK, gConfig
from DIRAC.Core.Security.Locations import getCAsLocation
from DIRAC.Core.Security.Locations import getCAsLocation, getCertificateAndKeyLocation
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 @@ -102,6 +106,7 @@ def __init__(self, ceUniqueID):
gConfig.getValue("Resources/Computing/HTCondorCE/WorkingDirectory", DEFAULT_WORKINGDIRECTORY),
)
self.useLocalSchedd = True
self.useSSLSubmission = False
self.remoteScheddOptions = ""
self.tokenFile = None

Expand Down Expand Up @@ -214,6 +219,10 @@ def _reset(self):
"" if self.useLocalSchedd else f"-pool {self.ceName}:{self.port} -name {self.ceName} "
)

self.useSSLSubmission = self.ceParameters.get("UseSSLSubmission", self.useSSLSubmission)
if self.useSSLSubmission == "True":
self.useSSLSubmission = True

self.log.debug("Using local schedd:", self.useLocalSchedd)
self.log.debug("Remote scheduler option:", self.remoteScheddOptions)
return S_OK()
Expand All @@ -236,6 +245,23 @@ def _executeCondorCommand(self, cmd, keepTokenFile=False):
htcEnv = {
"_CONDOR_SEC_CLIENT_AUTHENTICATION_METHODS": "GSI",
}

if self.useSSLSubmission:
if not (certAndKey := getCertificateAndKeyLocation()):
return S_ERROR("You want to use SSL Submission, but no certificate and key are present")
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_CADIR": caFiles,
"_condor_AUTH_SSL_SERVER_CADIR": caFiles,
"_condor_AUTH_SSL_USE_CLIENT_PROXY_ENV_VAR": "false",
"_condor_AUTH_SSL_SERVER_CAFILE": "",
"_condor_AUTH_SSL_CLIENT_CAFILE": "",
}

# If a token is present, then we use it (overriding htcEnv)
if self.token:
# Create a new token file if we do not keep it across several calls
Expand Down

0 comments on commit 5ff14fc

Please sign in to comment.