-
-
Notifications
You must be signed in to change notification settings - Fork 12
feat: allow providing a Prefix for paths to validate #40
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
jamietanna
wants to merge
4
commits into
main
Choose a base branch
from
feat/prefix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -103,6 +103,9 @@ type Options struct { | |
SilenceServersWarning bool | ||
// DoNotValidateServers ensures that there is no Host validation performed (see `SilenceServersWarning` and https://github.com/deepmap/oapi-codegen/issues/882 for more details) | ||
DoNotValidateServers bool | ||
// Prefix allows (optionally) trimming a prefix from the API path. | ||
// This may be useful if your API is routed to an internal path that is different from the OpenAPI specification. | ||
Prefix string | ||
} | ||
|
||
// OapiRequestValidator Creates the middleware to validate that incoming requests match the given OpenAPI 3.x spec, with a default set of configuration. | ||
|
@@ -159,6 +162,11 @@ func performRequestValidationForErrorHandler(next http.Handler, w http.ResponseW | |
// Note that this is an inline-and-modified version of `validateRequest`, with a simplified control flow and providing full access to the `error` for the `ErrorHandlerWithOpts` function. | ||
func performRequestValidationForErrorHandlerWithOpts(next http.Handler, w http.ResponseWriter, r *http.Request, router routers.Router, options *Options) { | ||
// Find route | ||
|
||
r.RequestURI = strings.TrimPrefix(r.RequestURI, options.Prefix) | ||
r.URL.Path = strings.TrimPrefix(r.URL.Path, options.Prefix) | ||
r.URL.RawPath = strings.TrimPrefix(r.URL.RawPath, options.Prefix) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. may not be needed |
||
|
||
route, pathParams, err := router.FindRoute(r) | ||
if err != nil { | ||
errOpts := ErrorHandlerOpts{ | ||
|
@@ -223,6 +231,9 @@ func performRequestValidationForErrorHandlerWithOpts(next http.Handler, w http.R | |
// of validating a request. | ||
func validateRequest(r *http.Request, router routers.Router, options *Options) (int, error) { | ||
|
||
r.RequestURI = strings.TrimPrefix(r.RequestURI, options.Prefix) | ||
r.URL.Path = strings.TrimPrefix(r.URL.Path, options.Prefix) | ||
Comment on lines
+234
to
+235
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ideally this should be a copy not the existing |
||
|
||
// Find route | ||
route, pathParams, err := router.FindRoute(r) | ||
if err != nil { | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ideally this should be a copy not the existing
r
, so we don't manipulate it before it goes into i.e. the error handler