sweep: DIRACGrid#7479 Download no-VOMS proxies for requests where VOM…

…S is not required
fstagni · Feb 23, 2024 · afe6e5f · afe6e5f
1 parent 4879509
commit afe6e5f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/DIRAC/RequestManagementSystem/private/RequestTask.py b/src/DIRAC/RequestManagementSystem/private/RequestTask.py
@@ -144,8 +144,13 @@ def setupProxy(self):
             os.environ["X509_USER_PROXY"] = proxyFile
             return S_OK({"Shifter": isShifter, "ProxyFile": proxyFile})
 
-        # # if we're here owner is not a shifter at all
-        ownerProxyFile = gProxyManager.downloadVOMSProxyToFile(ownerDN, ownerGroup)
+        # # if we're here, the owner is not a shifter at all
+        vomsAttr = Registry.getVOMSAttributeForGroup(ownerGroup)
+        if vomsAttr:
+            ownerProxyFile = gProxyManager.downloadVOMSProxyToFile(ownerDN, ownerGroup)
+        else:
+            ownerProxyFile = gProxyManager.downloadProxyToFile(ownerDN, ownerGroup)
+
         if not ownerProxyFile["OK"] or not ownerProxyFile["Value"]:
             reason = ownerProxyFile.get("Message", "No valid proxy found in ProxyManager.")
             return S_ERROR(f"Change proxy error for '{ownerDN}'@'{ownerGroup}': {reason}")