-
Notifications
You must be signed in to change notification settings - Fork 600
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
Fix infinite redirect loop with httpd collector, support HTTPS #567
Open
alexmv
wants to merge
2
commits into
python-diamond:master
Choose a base branch
from
alexmv:httpd-https
base: master
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.
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
Without an upper bound on the number of redirects, redirects loops (caused either by client- or server-side bugs) will lead to infinite loops in the collector, potentially preventing any statistics from being reported at all. Set a default of 5 redirects, maximum, with a configurable setting to adjust this.
Previously, HttpdCollector assumed all URLs on their default ports were requests to port 80. In the case of a `http://localhost/` -> `https://localhost/` redirect, the latter URL is parsed by `urlparse` as "Host localhost on the default port" (`parts.netloc` aka `parts[1]` did not contain a `:`), and a request is made to `http://localhost/`, which promptly re-redirects to HTTPS again. Transition to using the attribute names of `urlparse` for readability, and support both HTTP and HTTPS URLs, by examining the scheme and constructing the correct httplib class accordingly.
shortdudey123
requested changes
Feb 16, 2017
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.
docs/collectors/HttpdCollector.md
needs updating and possible to add tests for the new behavior?
Will do! |
Will merge once previous comment is handled and merge conflicts are fixed. |
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.
Without these, a status page which redirects HTTP to HTTPS causes an infinite loop and wedges the local collector.