Skip to content

[9.0] fix: CEs should not submit pilots with a DiracX token #8149

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

Merged
chrisburr merged 1 commit into from
Apr 11, 2025
Merged

[9.0] fix: CEs should not submit pilots with a DiracX token #8149

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
7 changes: 5 additions & 2 deletions src/DIRAC/FrameworkSystem/Client/ProxyManagerClient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ def getPayloadProxyFromDIRACGroup(self, userDN, userGroup, requiredTimeLeft, pro
proxyToConnect=proxyToConnect,
)

def dumpProxyToFile(self, chain, destinationFile=None, requiredTimeLeft=600):
def dumpProxyToFile(self, chain, destinationFile=None, requiredTimeLeft=600, includeToken=True):
"""Dump a proxy to a file. It's cached so multiple calls won't generate extra files

:param X509Chain chain: proxy as a chain
Expand All @@ -442,7 +442,10 @@ def dumpProxyToFile(self, chain, destinationFile=None, requiredTimeLeft=600):
filename = retVal["Value"]
if not (result := chain.getDIRACGroup())["OK"]:
return result
if not (result := addTokenToPEM(filename, result["Value"]))["OK"]: # pylint: disable=unsubscriptable-object
if (
includeToken
and not (result := addTokenToPEM(filename, result["Value"]))["OK"] # pylint: disable=unsubscriptable-object
):
return result
self.__filesCache.add(cHash, chain.getRemainingSecs()["Value"], filename)
return S_OK(filename)
Expand Down
2 changes: 1 addition & 1 deletion src/DIRAC/Resources/Computing/ComputingElement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def setToken(self, token):
def _prepareProxy(self):
"""Set the environment variable X509_USER_PROXY"""
if self.proxy:
result = gProxyManager.dumpProxyToFile(self.proxy, requiredTimeLeft=self.minProxyTime)
result = gProxyManager.dumpProxyToFile(self.proxy, requiredTimeLeft=self.minProxyTime, includeToken=False)
if not result["OK"]:
return result
os.environ["X509_USER_PROXY"] = result["Value"]
Expand Down
Loading