List of ip addresses that can use an API key (2) #138
Merged
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
…ddresses. These two fields work together. If the key is private a list of IP addresses can be associated with the API key, If the API key is private and no valid address if found, the request is rejected. IP addresses need to be separated by a line break n. This is an alternative to the ip-whitelist, but it is tight to the API key.
…ip addresses are coma separated.
|
Hey, could you update this and remove any conflicts? |
|
This is done. let me know if you find any other issues. |
philsturgeon
pushed a commit
that referenced
this pull request
Dec 11, 2012
List of ip addresses that can use an API key (2)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Added two new fields to the keys table: 1) is_private_key and 2) ip_addresses. These two fields work together. If the key is private a list of IP addresses must be associated with the API key, the request is rejected if no valid IP address is found. IP addresses need to be separated by a line break "\n".
This is an alternative to the ip-whitelist, but it is tight to the API key.
This merge request is in response to the this: #72 (comment) to added this feature to the latest code of the ci-restserver. I changed the name is_public_key to is_private_key as it makes more sense.