Move parameter validation to middleware

connexion/apis/abstract.py

@@ -186,23 +186,18 @@ def __init__(
         resolver=None,
         debug=False,
         resolver_error_handler=None,
-        validator_map=None,
         pythonic_params=False,
         options=None,
         **kwargs,
     ):
         """
         :type validate_responses: bool
         :type strict_validation: bool
-        :param validator_map: Custom validators for the types "parameter", "body" and "response".
-        :type validator_map: dict
         :type resolver_error_handler: callable | None
         :param pythonic_params: When True CamelCase parameters are converted to snake_case and an underscore is appended
             to any shadowed built-ins
         :type pythonic_params: bool
         """
-        self.validator_map = validator_map
-
         logger.debug("Validate Responses: %s", str(validate_responses))
         self.validate_responses = validate_responses
 
@@ -245,7 +240,6 @@ def add_operation(self, path, method):
             method,
             self.resolver,
             validate_responses=self.validate_responses,
-            validator_map=self.validator_map,
             strict_validation=self.strict_validation,
             pythonic_params=self.pythonic_params,
             uri_parser_class=self.options.uri_parser_class,

connexion/apps/abstract.py

@@ -213,7 +213,6 @@ def add_api(
             strict_validation=strict_validation,
             auth_all_paths=auth_all_paths,
             debug=self.debug,
-            validator_map=validator_map,
             pythonic_params=pythonic_params,
             options=api_options.as_dict(),
         )

connexion/decorators/uri_parsing.py

@@ -8,8 +8,9 @@
 import logging
 import re
 
-from .. import utils
-from .decorator import BaseDecorator
+from connexion.decorators.decorator import BaseDecorator
+from connexion.exceptions import TypeValidationError
+from connexion.utils import all_json, coerce_type, deep_merge, is_null, is_nullable
 
 logger = logging.getLogger("connexion.decorators.uri_parsing")
 
@@ -119,6 +120,15 @@ def resolve_params(self, params, _in):
             else:
                 resolved_param[k] = values[-1]
 
+            if not (is_nullable(param_defn) and is_null(resolved_param[k])):
+                try:
+                    # TODO: coerce types in a single place
+                    resolved_param[k] = coerce_type(
+                        param_defn, resolved_param[k], "parameter", k
+                    )
+                except TypeValidationError:
+                    pass
+
         return resolved_param
 
     def __call__(self, function):
@@ -182,9 +192,7 @@ def resolve_form(self, form_data):
             )
             if defn and defn["type"] == "array":
                 form_data[k] = self._split(form_data[k], encoding, "form")
-            elif "contentType" in encoding and utils.all_json(
-                [encoding.get("contentType")]
-            ):
+            elif "contentType" in encoding and all_json([encoding.get("contentType")]):
                 form_data[k] = json.loads(form_data[k])
         return form_data
 
@@ -231,7 +239,7 @@ def _preprocess_deep_objects(self, query_data):
         ret = dict.fromkeys(root_keys, [{}])
         for k, v, is_deep_object in deep:
             if is_deep_object:
-                ret[k] = [utils.deep_merge(v[0], ret[k][0])]
+                ret[k] = [deep_merge(v[0], ret[k][0])]
             else:
                 ret[k] = v
         return ret

connexion/exceptions.py

@@ -206,3 +206,22 @@ def __init__(
                 )
 
         super().__init__(title=title, detail=detail, **kwargs)
+
+
+class TypeValidationError(Exception):
+    def __init__(self, schema_type, parameter_type, parameter_name):
+        """
+        Exception raise when type validation fails
+
+        :type schema_type: str
+        :type parameter_type: str
+        :type parameter_name: str
+        :return:
+        """
+        self.schema_type = schema_type
+        self.parameter_type = parameter_type
+        self.parameter_name = parameter_name
+
+    def __str__(self):
+        msg = "Wrong type, expected '{schema_type}' for {parameter_type} parameter '{parameter_name}'"
+        return msg.format(**vars(self))

connexion/middleware/request_validation.py

@@ -8,7 +8,6 @@
 
 from connexion import utils
 from connexion.datastructures import MediaTypeDict
-from connexion.decorators.uri_parsing import AbstractURIParser
 from connexion.exceptions import UnsupportedMediaTypeProblem
 from connexion.middleware.abstract import RoutedAPI, RoutedMiddleware
 from connexion.operations import AbstractOperation
@@ -25,14 +24,12 @@ def __init__(
         operation: AbstractOperation,
         strict_validation: bool = False,
         validator_map: t.Optional[dict] = None,
-        uri_parser_class: t.Optional[AbstractURIParser] = None,
     ) -> None:
         self.next_app = next_app
         self._operation = operation
         self.strict_validation = strict_validation
         self._validator_map = VALIDATOR_MAP.copy()
         self._validator_map.update(validator_map or {})
-        self.uri_parser_class = uri_parser_class
 
     def extract_content_type(
         self, headers: t.List[t.Tuple[bytes, bytes]]
@@ -73,12 +70,24 @@ def validate_mime_type(self, mime_type: str) -> None:
     async def __call__(self, scope: Scope, receive: Receive, send: Send):
         receive_fn = receive
 
+        # Validate parameters & headers
+        uri_parser_class = self._operation._uri_parser_class
+        uri_parser = uri_parser_class(
+            self._operation.parameters, self._operation.body_definition()
+        )
+        parameter_validator_cls = self._validator_map["parameter"]
+        parameter_validator = parameter_validator_cls(  # type: ignore
+            self._operation.parameters,
+            uri_parser=uri_parser,
+            strict_validation=self.strict_validation,
+        )
+        parameter_validator.validate(scope)
+
+        # Extract content type
         headers = scope["headers"]
         mime_type, encoding = self.extract_content_type(headers)
         self.validate_mime_type(mime_type)
 
-        # TODO: Validate parameters
-
         # Validate body
         schema = self._operation.body_schema(mime_type)
         if schema:
@@ -137,7 +146,6 @@ def make_operation(
             operation=operation,
             strict_validation=self.strict_validation,
             validator_map=self.validator_map,
-            uri_parser_class=self.uri_parser_class,
         )
 
 

connexion/middleware/routing.py

@@ -25,6 +25,10 @@ def from_operation(cls, operation: AbstractOperation, next_app: ASGIApp):
     async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
         """Attach operation to scope and pass it to the next app"""
         original_scope = _scope.get()
+        # Pass resolved path params along
+        original_scope.setdefault("path_params", {}).update(
+            scope.get("path_params", {})
+        )
 
         api_base_path = scope.get("root_path", "")[
             len(original_scope.get("root_path", "")) :