Add force_ssl flag to Riak Control. #164
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
Separate out authentication type and forced SSL requirements. Specifically, a user should be able to force SSL when using no authentication, or force non-SSL when using authentication given they may already be on a protected network.
|
Discussed this in HipChat, but a third option would be to default to the old way when this setting was |
|
I just pushed an updated commit, 85378b7, which I believe addresses the upgrade concern correctly. |
|
Addressed by #164. |
|
Rather, addresses #156. |
| _ -> | ||
| case wrq:scheme(RD) of | ||
| https -> | ||
| case app_helper:get_env(riak_control, force_ssl, undefined) of |
|
This looks good at first glance, I'll give it a test tomorrow. |
|
Did you get a chance to test this? |
|
|
All possible combinations check out as expected. 👍 to merge |
|
Perfect; thanks. |
cmeiklejohn
added a commit
that referenced
this pull request
Oct 8, 2013
Add force_ssl flag to Riak Control.
|
basho/riak_test#412 covers a majority of the cases here, but is not exhaustive. |
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.
Separate out authentication type and forced SSL requirements.
Specifically, a user should be able to force SSL when using no
authentication, or force non-SSL when using authentication given they
may already be on a protected network.
@seancribbs @joedevivo