-
Notifications
You must be signed in to change notification settings - Fork 221
Validate region string format before use in URL construction #921
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| import os | ||
| import unittest | ||
| from unittest.mock import patch | ||
|
|
||
| from msal.region import _detect_region, _validate_region | ||
|
|
||
|
|
||
| class TestValidateRegion(unittest.TestCase): | ||
|
|
||
| def test_valid_simple_regions(self): | ||
| for region in ("eastus", "westus2", "centralindia", "northeurope"): | ||
| self.assertEqual(_validate_region(region), region) | ||
|
|
||
| def test_valid_hyphenated_regions(self): | ||
| for region in ("east-us", "west-us-2", "south-central-us"): | ||
| self.assertEqual(_validate_region(region), region) | ||
|
|
||
|
bgavrilMS marked this conversation as resolved.
|
||
| def test_rejects_dots(self): | ||
| self.assertIsNone(_validate_region("evil.com")) | ||
|
|
||
| def test_rejects_slashes(self): | ||
| self.assertIsNone(_validate_region("evil.com/path")) | ||
|
|
||
| def test_rejects_colons(self): | ||
| self.assertIsNone(_validate_region("evil:8080")) | ||
|
|
||
| def test_rejects_uppercase(self): | ||
| self.assertIsNone(_validate_region("EastUS")) | ||
|
|
||
| def test_rejects_leading_hyphen(self): | ||
| self.assertIsNone(_validate_region("-eastus")) | ||
|
|
||
| def test_rejects_leading_digit(self): | ||
| self.assertIsNone(_validate_region("2westus")) | ||
|
|
||
| def test_empty_string(self): | ||
| self.assertIsNone(_validate_region("")) | ||
|
|
||
| def test_none(self): | ||
| self.assertIsNone(_validate_region(None)) | ||
|
|
||
|
|
||
| class TestDetectRegion(unittest.TestCase): | ||
|
|
||
| @patch.dict(os.environ, {"REGION_NAME": "westus2"}) | ||
| def test_returns_valid_env_region(self): | ||
| self.assertEqual(_detect_region(), "westus2") | ||
|
|
||
| @patch.dict(os.environ, {"REGION_NAME": "evil.com/hijack"}) | ||
| def test_rejects_invalid_env_region(self): | ||
| self.assertIsNone(_detect_region()) | ||
|
|
||
| @patch.dict(os.environ, {"REGION_NAME": ""}) | ||
| def test_empty_env_returns_none(self): | ||
| self.assertIsNone(_detect_region()) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| unittest.main() | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.