Allow custom verifyAccess implementations to inhect key/value pairs into the request context
#29
Conversation
This file contains 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
vasayxtx
reviewed
Dec 19, 2024
middleware.go
Outdated
| reqCtx = NewContextWithBearerToken(reqCtx, bearerToken) | ||
| reqCtx = NewContextWithJWTClaims(reqCtx, jwtClaims) | ||
| h.next.ServeHTTP(rw, r.WithContext(reqCtx)) | ||
| h.next.ServeHTTP(rw, r) | ||
| } | ||
|
|
||
| func (h *jwtAuthHandler) logger(ctx context.Context) log.FieldLogger { |
There was a problem hiding this comment.
Suggest removing logger() func. It looks redundant after your refactoring.
vasayxtx
reviewed
Dec 19, 2024
middleware.go
Outdated
|
|
||
| bearerToken := GetBearerTokenFromRequest(r) | ||
| if bearerToken == "" { | ||
| apiErr := restapi.NewError(h.errorDomain, ErrCodeBearerTokenMissing, ErrMessageBearerTokenMissing) | ||
| restapi.RespondError(rw, http.StatusUnauthorized, apiErr, h.logger(reqCtx)) | ||
| restapi.RespondError(rw, http.StatusUnauthorized, apiErr, h.logger(r.Context())) |
There was a problem hiding this comment.
h.logger(r.Context()) -> logger?
vasayxtx
reviewed
Dec 19, 2024
middleware_test.go
Outdated
| type mockJWTAuthMiddlewareNextHandler struct { | ||
| ctx context.Context | ||
| called int | ||
| jwtClaims jwt.Claims |
There was a problem hiding this comment.
There’s no need to have jwtClaims now since it can be derived from the ctx.
I suggest replacing the ctx field with a lastRequest field for the following reasons:
a) lastRequest is clearer and more intuitive to understand in this context.
b) Storing ctx in a struct is generally considered a poor practice. It may confuse other developers.
vasayxtx
reviewed
Dec 19, 2024
middleware_test.go
Outdated
| @@ -22,14 +23,21 @@ import ( | |||
| "github.com/acronis/go-authkit/jwt" | |||
| ) | |||
|
|
|||
| const ( | |||
| errDomain = "TestDomain" | |||
There was a problem hiding this comment.
[minor] How about renaming errDomain to testErrDomain to be consistent with testBearerToken?:)
ilmaruk
force-pushed
the
bugfix/VP-4039-migrations-wont-start
branch
from
2531d0b to
281d63d
Compare
…ff, to allow injecting key/value pairs by user defined functions, such as verifyAccess.
ilmaruk
force-pushed
the
bugfix/VP-4039-migrations-wont-start
branch
from
281d63d to
be2b2c6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In
jwtAuthHandler.ServeHTTP(), no using a copy of the request context, but always accessing it viar.Context(), to allow injecting key/value pairs by user defined functions, such asverifyAccess.Also moved tests to their own package
authkit_testto allow for the creation of test only utilities, such as functions and constants.