Finder exception

Author: p1c2u

openapi_core/templating/paths/exceptions.py

@@ -0,0 +1,12 @@
+import attr
+
+from openapi_core.exceptions import OpenAPIError
+
+
+@attr.s(hash=True)
+class PathNotFound(OpenAPIError):
+    """Find path error"""
+    path_pattern = attr.ib()
+
+    def __str__(self):
+        return "Path not found for {0}".format(self.path_pattern)

openapi_core/templating/paths/finders.py

@@ -1,6 +1,9 @@
 from parse import parse
 from six.moves.urllib.parse import urljoin
 
+from openapi_core.schema.operations.exceptions import InvalidOperation
+from openapi_core.schema.paths.exceptions import InvalidPath
+from openapi_core.schema.servers.exceptions import InvalidServer
 from openapi_core.templating.paths.exceptions import PathNotFound
 from openapi_core.templating.paths.util import get_operation_pattern
 
@@ -11,16 +14,19 @@ def __init__(self, spec):
         self.spec = spec
 
     def find(self, request):
-        operation_pattern = self._get_operation_pattern(request)
-
-        path = self.spec[operation_pattern]
-        path_variables = {}
-        operation = self.spec.get_operation(operation_pattern, request.method)
-        servers = path.servers or operation.servers or self.spec.servers
-        server = servers[0]
-        server_variables = {}
-
-        return path, operation, server, path_variables, server_variables
+        try:
+            operation_pattern = self._get_operation_pattern(request)
+
+            path = self.spec[operation_pattern]
+            path_variables = {}
+            operation = self.spec.get_operation(operation_pattern, request.method)
+            servers = path.servers or operation.servers or self.spec.servers
+            server = servers[0]
+            server_variables = {}
+        except (InvalidServer, InvalidPath, InvalidOperation):
+            raise PathNotFound(request.path_pattern)
+        else:
+            return path, operation, server, path_variables, server_variables
 
     def _get_operation_pattern(self, request):
         server = self.spec.get_server(request.full_url_pattern)

openapi_core/templating/paths/finders2.py

@@ -0,0 +1,26 @@
+from parse import parse
+from six.moves.urllib.parse import urljoin
+
+from openapi_core.templating.paths.exceptions import PathNotFound
+
+
+class PathFinder(object):
+
+    def __init__(self, spec):
+        self.spec = spec
+
+    def find(self, request):
+        for path in self.spec.paths:
+            if request.method not in path.operations:
+                continue
+            operation = path.operations[request.method]
+            servers = path.servers or operations.servers or self.spec.servers
+            for server in servers:
+                path_pattern = urljoin(server.url, path.name)
+                if request.path_pattern == path_pattern:
+                    return path, operation, server, {}
+                parsed = parse(path_pattern, request.path_pattern)
+                if parsed:
+                    return path, operation, server, parsed.named
+
+        raise PathNotFound(request.path_pattern)

openapi_core/validation/request/validators.py

@@ -13,6 +13,7 @@
 from openapi_core.schema.request_bodies.exceptions import MissingRequestBody
 from openapi_core.schema.servers.exceptions import InvalidServer
 from openapi_core.security.exceptions import SecurityError
+from openapi_core.templating.paths.exceptions import PathNotFound
 from openapi_core.unmarshalling.schemas.enums import UnmarshalContext
 from openapi_core.unmarshalling.schemas.exceptions import (
     UnmarshalError, ValidateError,
@@ -30,7 +31,7 @@ def validate(self, request):
         try:
             path, operation, _, _, _ = self._find_path(request)
         # don't process if operation errors
-        except (InvalidServer, InvalidPath, InvalidOperation) as exc:
+        except PathNotFound as exc:
             return RequestValidationResult([exc, ], None, None, None)
 
         try:
@@ -53,7 +54,7 @@ def validate(self, request):
     def _validate_parameters(self, request):
         try:
             path, operation, _, _, _ = self._find_path(request)
-        except (InvalidServer, InvalidPath, InvalidOperation) as exc:
+        except PathNotFound as exc:
             return RequestValidationResult([exc, ], None, None)
 
         params, params_errors = self._get_parameters(
@@ -67,7 +68,7 @@ def _validate_parameters(self, request):
     def _validate_body(self, request):
         try:
             _, operation, _, _, _ = self._find_path(request)
-        except (InvalidServer, InvalidOperation) as exc:
+        except PathNotFound as exc:
             return RequestValidationResult([exc, ], None, None)
 
         body, body_errors = self._get_body(request, operation)

openapi_core/validation/response/validators.py

@@ -8,6 +8,7 @@
     InvalidResponse, MissingResponseContent,
 )
 from openapi_core.schema.servers.exceptions import InvalidServer
+from openapi_core.templating.paths.exceptions import PathNotFound
 from openapi_core.unmarshalling.schemas.enums import UnmarshalContext
 from openapi_core.unmarshalling.schemas.exceptions import (
     UnmarshalError, ValidateError,
@@ -22,7 +23,7 @@ def validate(self, request, response):
         try:
             _, operation, _, _, _ = self._find_path(request)
         # don't process if operation errors
-        except (InvalidServer, InvalidPath, InvalidOperation) as exc:
+        except PathNotFound as exc:
             return ResponseValidationResult([exc, ], None, None)
 
         try:
@@ -47,7 +48,7 @@ def _validate_data(self, request, response):
         try:
             _, operation, _, _, _ = self._find_path(request)
         # don't process if operation errors
-        except (InvalidServer, InvalidPath, InvalidOperation) as exc:
+        except PathNotFound as exc:
             return ResponseValidationResult([exc, ], None, None)
 
         try:

requirements.txt

@@ -4,3 +4,4 @@ lazy-object-proxy
 strict_rfc3339
 isodate
 attrs
+parse==1.14.0

setup.cfg

@@ -29,6 +29,7 @@ install_requires =
     strict_rfc3339
     isodate
     attrs
+    parse
     backports.functools-lru-cache; python_version<"3.0"
     backports.functools-partialmethod; python_version<"3.0"
 tests_require =