Skip to content

fix: bug fix for ProxyDB.logAction #8500

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
aldbr merged 1 commit into from
Apr 9, 2026
+4 −8
Merged

fix: bug fix for ProxyDB.logAction #8500

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
8 changes: 2 additions & 6 deletions src/DIRAC/FrameworkSystem/DB/ProxyDB.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,11 +473,7 @@ def __getPemAndTimeLeft(self, userDN, userGroup=None, vomsAttr=None, proxyProvid
return result
return S_OK((result["Value"], secondsRemaining))
return S_OK((pemData, secondsRemaining))
if userGroup:
userMask = f"{userDN}@{userGroup}"
else:
userMask = userDN
return S_ERROR(DErrno.EPROXYFIND, f"{userMask} has no proxy registered")
return S_ERROR(DErrno.EPROXYFIND, f"{userDN} has no proxy registered")

def __generateProxyFromProxyProvider(self, userDN, proxyProvider):
"""Get proxy from proxy provider
Expand Down Expand Up @@ -833,7 +829,7 @@ def logAction(self, action, issuerDN, targetDN):
except KeyError:
return S_ERROR("Can't escape from death")
cmd = "INSERT INTO `ProxyDB_Log` ( Action, IssuerDN, IssuerGroup, TargetDN, TargetGroup, Timestamp ) VALUES "
cmd += f"( {sAction}, {sIssuerDN}, 'IssuerGroup' {sTargetDN}, 'TargetGroup', UTC_TIMESTAMP() )"
cmd += f"( {sAction}, {sIssuerDN}, 'IssuerGroup', {sTargetDN}, 'TargetGroup', UTC_TIMESTAMP() )"
retVal = self._update(cmd)
if not retVal["OK"]:
self.log.error("Can't add a proxy action log: ", retVal["Message"])
Expand Down
4 changes: 2 additions & 2 deletions src/DIRAC/FrameworkSystem/Service/ProxyManagerHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def export_getProxy(self, userDN, userGroup, requestPem, requiredLifetime):
return result
forceLimited = result["Value"]

self.__proxyDB.logAction("download proxy", credDict["DN"], credDict["group"], userDN, userGroup)
self.__proxyDB.logAction("download proxy", credDict["DN"], userDN)
return self.__getProxy(userDN, userGroup, requestPem, requiredLifetime, forceLimited)

def __getProxy(self, userDN, userGroup, requestPem, requiredLifetime, forceLimited):
Expand Down Expand Up @@ -226,7 +226,7 @@ def export_getVOMSProxy(self, userDN, userGroup, requestPem, requiredLifetime, v
return result
forceLimited = result["Value"]

self.__proxyDB.logAction("download voms proxy", credDict["DN"], credDict["group"], userDN, userGroup)
self.__proxyDB.logAction("download voms proxy", credDict["DN"], userDN)
return self.__getVOMSProxy(userDN, userGroup, requestPem, requiredLifetime, vomsAttribute, forceLimited)

def __getVOMSProxy(self, userDN, userGroup, requestPem, requiredLifetime, vomsAttribute, forceLimited):
Expand Down
Loading