bug: Handle private networks as trusted proxies #53
Conversation
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
Local private networks should be automatically considered proxies and skipped for metadata lookup. Closes #51
pjenvey
reviewed
Nov 7, 2018
channelserver/src/main.rs
Outdated
| match fixed.parse::<ipnet::IpNet>() { | ||
| Ok(addr) => trusted_list.push(addr), | ||
| Err(err) => { | ||
| error!(logger.log, "Ignoring unparsable IP address \"{}\"", proxy); |
There was a problem hiding this comment.
nit: don't forget raw strings
Suggested change
| error!(logger.log, "Ignoring unparsable IP address \"{}\"", proxy); | |
| error!(logger.log, r#"Ignoring unparsable IP address "{}""#, proxy); |
There was a problem hiding this comment.
honestly, I do. Frequently. Thanks!
channelserver/src/meta.rs
Outdated
| @@ -127,14 +127,10 @@ fn get_ua( | |||
| None | |||
| } | |||
|
|
|||
| fn is_trusted_proxy(proxy_list: &[IpNet], host: &str) -> Result<bool, HandlerError> { | |||
| fn is_trusted_proxy(proxy_list: &[IpNet], host: &IpAddr) -> Result<bool, HandlerError> { | |||
There was a problem hiding this comment.
no need for a Result now, this can just return a bool (this could also be a one liner: proxy_list.iter().any(|range| range.contains(host)))
channelserver/src/meta.rs
Outdated
| @@ -127,14 +127,10 @@ fn get_ua( | |||
| None | |||
| } | |||
|
|
|||
| fn is_trusted_proxy(proxy_list: &[IpNet], host: &str) -> Result<bool, HandlerError> { | |||
| fn is_trusted_proxy(proxy_list: &[IpNet], host: &IpAddr) -> Result<bool, HandlerError> { | |||
| // Return if an address is NOT part of the allow list | |||
There was a problem hiding this comment.
did I read this comment wrong or is it describing the opposite of what's happening?
There was a problem hiding this comment.
Sigh, no, you read it right. It's wrong. Thanks!
pjenvey
approved these changes
Nov 7, 2018
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.
Local private networks should be automatically considered proxies and
skipped for metadata lookup.
Closes #51