Merge pull request #8500 from fstagni/fix_deleteProxy_2

fix: bug fix for ProxyDB.logAction

Author: aldbr

src/DIRAC/FrameworkSystem/DB/ProxyDB.py

@@ -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
@@ -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"])

src/DIRAC/FrameworkSystem/Service/ProxyManagerHandler.py

@@ -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):
@@ -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):