IPStrategy for selecting IP in whitelist #3778
Merged
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
mmatur
requested changes
Aug 17, 2018
| return false | ||
| } | ||
| err := x.ipChecker.IsAuthorized(ip) | ||
| return err == nil |
There was a problem hiding this comment.
Shoud be replaced by
return x.ipChecker.IsAuthorized(ip) == nil| if err != nil { | ||
| log.Fatalf("Error creating whitelist middleware: %s", err) | ||
| } | ||
| ipWhitelistMiddleware, err := middlewares.NewIPWhiteLister(globalConfiguration.EntryPoints[entryPointName].WhiteList.SourceRange, strategy) |
There was a problem hiding this comment.
Could you please add a new line before
| if globalConfiguration.EntryPoints[entryPointName].WhiteList.IPStrategy != nil { | ||
| ipStrategy = globalConfiguration.EntryPoints[entryPointName].WhiteList.IPStrategy | ||
| } | ||
| strategy, err := ipStrategy.Get() |
There was a problem hiding this comment.
Could you please add a new line before
integration/basic_test.go
Outdated
| req.Header.Set("X-Forwarded-For", test.xForwardedFor) | ||
| req.Host = test.host | ||
| req.RequestURI = "" | ||
| err = try.Request(req, 1*time.Second, try.StatusCodeIs(test.expectedStatusCode)) |
There was a problem hiding this comment.
Could you please add a new line before
| @@ -17,7 +17,8 @@ checkNewVersion = false | |||
| entryPoint = "http" | |||
| [entryPoints.httpWhitelistReject] | |||
| address = ":8002" | |||
| whiteListSourceRange = ["8.8.8.8/32"] | |||
| [entryPoints.httpWhitelistReject.whiteList] | |||
| SourceRange = ["8.8.8.8/32"] | |||
ip/checker_test.go
Outdated
| } | ||
|
|
||
| func TestNew(t *testing.T) { | ||
| cases := []struct { |
There was a problem hiding this comment.
Could you please rename cases by testCases
ip/checker_test.go
Outdated
| test := test | ||
| t.Run(test.desc, func(t *testing.T) { | ||
| t.Parallel() | ||
| ipChecker, err := NewChecker(test.trustedIPs) |
There was a problem hiding this comment.
Could you please add a new line before
ip/checker_test.go
Outdated
| } | ||
|
|
||
| func TestContainsIsAllowed(t *testing.T) { | ||
| cases := []struct { |
There was a problem hiding this comment.
Could you please rename cases by testCases
| return xffs[i] | ||
| } | ||
| } | ||
| return "" |
There was a problem hiding this comment.
Could you please add a new line before
server/server_middlewares.go
Outdated
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return middlewares.NewIPWhiteLister(whiteList.SourceRange, strategy) |
There was a problem hiding this comment.
Could you please add a new line before
juliens
force-pushed
the
feature/clientIP
branch
from
dab825a to
e31ce96
Compare
|
LGTM |
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.
What does this PR do?
Motivation
More secure way to handle forwarded headers and to handle the whitelist.
Related #3646
More