review updates

Author: mishaschwartz

docs/services.rst

@@ -324,7 +324,7 @@ by the below configuration.
     API entrypoint and `Tomcat` service running it. If this feature is not needed, it can be disabled by setting the
     parameter to ``null``.
 
-.. versionchanged:: 4.1.2
+.. versionchanged:: 4.2.0
     ``prefixes`` can now contain a ``/`` character. This allows `ServiceTHREDDS`_ to properly handle `THREDDS`_ services
     that have multiple path parts. For example, starting with `THREDDS`_ version 5, the ``ncss`` service contains two
     sub-services which are accessed using the path prefixes ``ncss/grid`` and ``ncss/point``.

magpie/services.py

@@ -1385,14 +1385,15 @@ def get_path_parts(self):
     def _get_path_prefix_permission(self, path_parts):
         # type: (List[str]) -> Tuple[Optional[Str], PermissionRequested]
         cfg = self.get_config()
+        # first to favor BROWSE over READ prefix conflicts
         for prefixes, permission in ((cfg["metadata_type"]["prefixes"], Permission.BROWSE),
                                      (cfg["data_type"]["prefixes"], Permission.READ)):
-            for prefix in prefixes:
-                if not path_parts and prefix is None:
-                    return prefix, permission
-                if prefix is not None:
-                    path_prefix = "/".join(path_parts[:prefix.count("/") + 1])
-                    if self.is_match(path_prefix, prefix) is not None:
+            for pattern_prefix in prefixes:
+                if not path_parts and pattern_prefix is None:
+                    return pattern_prefix, permission
+                if pattern_prefix is not None:
+                    path_prefix = "/".join(path_parts[:pattern_prefix.count("/") + 1])
+                    if self.is_match(path_prefix, pattern_prefix) is not None:
                         return path_prefix, permission
         return None, None
 

tests/test_services.py

@@ -582,7 +582,7 @@ def test_ServiceTHREDDS_custom_config(self):
 
         # using unknown prefixes, otherwise allowed file should always be denied
         # purposely take normally allowed THREDDS prefixes, validate active config
-        unknown_prefixes = ["ncml", "dap4", "ncss/point"]
+        unknown_prefixes = ["ncml", "dap4", "ncss/point", "ncss", "grid"]
         allowed_resources = [dir_name, "{}/{}".format(dir_name, file_name), "{}/{}".format(dir_name, file_html_name)]
         for prefix in unknown_prefixes:
             for target in allowed_resources: