Merge pull request #8206 from chaen/v9.0_feat_singularityMount

feat (singularity): allow to mount local path rw

Author: fstagni

docs/source/AdministratorGuide/Resources/storage.rst

@@ -282,6 +282,12 @@ If the local path follows the DIRAC convention (i.e. finishes with the LFN), the
       {
         Protocol = file
         Path = /mnt/lustre_3/storm_3/lhcbdisk/
+        # Note that rw is very dangerous
+        # as it allows the payload to delete
+        # anything in the mounted folder.
+        # You should use this option only in
+        # very controled environment (without user jobs as well)
+        MountOptions = rw # ro by default
         Host = localhost
         Access = local
       }

src/DIRAC/FrameworkSystem/private/authorization/AuthServer.py

@@ -333,13 +333,13 @@ def create_json_request(self, request):
         """Parse request. Rewrite authlib method."""
         return self.create_oauth2_request(request, JsonRequest, True)
 
-    def validate_requested_scope(self, scope, state=None):
+    def validate_requested_scope(self, scope):
         """See :func:`authlib.oauth2.rfc6749.authorization_server.validate_requested_scope`"""
         # We also consider parametric scope containing ":" charter
         extended_scope = list_to_scope(
             [re.sub(r":.*$", ":", s) for s in scope_to_list((scope or "").replace("+", " "))]
         )
-        super().validate_requested_scope(extended_scope, state)
+        super().validate_requested_scope(extended_scope)
 
     def handle_response(self, status_code=None, payload=None, headers=None, newSession=None, delSession=None):
         """Handle response

src/DIRAC/Resources/Computing/SingularityComputingElement.py

@@ -387,7 +387,12 @@ def submitJob(self, executableFile, proxy=None, **kwargs):
                     continue
 
                 mountedPath = se.getStorageParameters(protocol="file")["Value"]["Path"]
-                bindPaths.append(f"{mountedPath}:{mountedPath}:ro")
+                mountOptions = se.getStorageParameters(protocol="file")["Value"].get("MountOptions", "ro")
+                if mountOptions not in ("rw", "ro"):
+                    self.log.warn(f"Unknown mount mode: {mountOptions}")
+                    continue
+
+                bindPaths.append(f"{mountedPath}:{mountedPath}:{mountOptions}")
             except KeyError:
                 pass