github/openapi-core
1
0
Fork 0
mirror of https://github.com/correl/openapi-core.git synced 2024-12-29 11:09:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bug: Prioritize concrete paths over template paths.

Browse source
This commit is contained in:
Sebastian Mainberger 2020-12-08 12:44:53 -08:00
parent 0aeb14477b
commit 44d3fd3927
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
openapi_core/templating/paths/finders.py
View file

@ -39,8 +39,9 @@ class PathFinder(object):
raise ServerNotFound(request.full_url_pattern) raise ServerNotFound(request.full_url_pattern)
def _get_paths_iter(self, full_url_pattern): def _get_paths_iter(self, full_url_pattern):
template_paths = []
for path_pattern, path in iteritems(self.spec.paths): for path_pattern, path in iteritems(self.spec.paths):
# simple path # simple path. Return right away since it is always the most concrete
if full_url_pattern.endswith(path_pattern): if full_url_pattern.endswith(path_pattern):
path_result = TemplateResult(path_pattern, {}) path_result = TemplateResult(path_pattern, {})
yield (path, path_result) yield (path, path_result)
@ -49,7 +50,11 @@ class PathFinder(object):
result = search(path_pattern, full_url_pattern) result = search(path_pattern, full_url_pattern)
if result: if result:
path_result = TemplateResult(path_pattern, result.named) path_result = TemplateResult(path_pattern, result.named)
yield (path, path_result) template_paths.append((path, path_result))
# Fewer variables -> more concrete path
for path in sorted(template_paths, key=lambda p: len(p[1].variables)):
yield path
def _get_operations_iter(self, request_method, paths_iter): def _get_operations_iter(self, request_method, paths_iter):
for path, path_result in paths_iter: for path, path_result in paths_iter: