Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: Python: Remove aws url validation #1254

Merged
merged 6 commits into from
Mar 24, 2023
Merged

fix: Python: Remove aws url validation #1254

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8461c7f
fix: Python: Remove awl url validation
BigTailWolf Mar 20, 2023
fe1b9b6
Merge branch 'main' into b270449772
BigTailWolf Mar 24, 2023
74d18d2
Merge branch 'main' into b270449772
BigTailWolf Mar 24, 2023
e739fca
Merge branch 'main' into b270449772
BigTailWolf Mar 24, 2023
250560e
fix: lint failed due to an unused import
BigTailWolf Mar 24, 2023
be4bcec
update token
BigTailWolf Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions google/auth/aws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,6 @@ def __init__(
self._request_signer = None
self._target_resource = audience

self.validate_metadata_server_urls()

# Get the environment ID. Currently, only one version supported (v1).
matches = re.match(r"^(aws)([\d]+)$", self._environment_id)
if matches:
Expand All @@ -418,22 +416,6 @@ def __init__(
)
)

def validate_metadata_server_urls(self):
self.validate_metadata_server_url_if_any(self._region_url, "region_url")
self.validate_metadata_server_url_if_any(self._security_credentials_url, "url")
self.validate_metadata_server_url_if_any(
self._imdsv2_session_token_url, "imdsv2_session_token_url"
)

@staticmethod
def validate_metadata_server_url_if_any(url_string, name_of_data):
if url_string:
url = urlparse(url_string)
if url.hostname != "169.254.169.254" and url.hostname != "fd00:ec2::254":
raise exceptions.InvalidResource(
"Invalid hostname '{}' for '{}'".format(url.hostname, name_of_data)
)

def retrieve_subject_token(self, request):
"""Retrieves the subject token using the credential_source object.
The subject token is a serialized `AWS GetCallerIdentity signed request`_.
Expand Down
33 changes: 0 additions & 33 deletions tests/test_aws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,39 +1495,6 @@ def test_retrieve_subject_token_success_temp_creds_idmsv2(self, utcnow):
credentials.retrieve_subject_token(request)
assert not request.called

def test_validate_metadata_server_url_if_any(self):
aws.Credentials.validate_metadata_server_url_if_any(
"http://[fd00:ec2::254]/latest/meta-data/placement/availability-zone", "url"
)
aws.Credentials.validate_metadata_server_url_if_any(
"http://169.254.169.254/latest/meta-data/placement/availability-zone", "url"
)

with pytest.raises(ValueError) as excinfo:
aws.Credentials.validate_metadata_server_url_if_any(
"http://fd00:ec2::254/latest/meta-data/placement/availability-zone",
"url",
)
assert excinfo.match("Invalid hostname 'fd00' for 'url'")

with pytest.raises(ValueError) as excinfo:
aws.Credentials.validate_metadata_server_url_if_any(
"http://abc.com/latest/meta-data/placement/availability-zone", "url"
)
assert excinfo.match("Invalid hostname 'abc.com' for 'url'")

def test_retrieve_subject_token_invalid_hosts(self):
keys = ["url", "region_url", "imdsv2_session_token_url"]
for key in keys:
credential_source = self.CREDENTIAL_SOURCE.copy()
credential_source[
key
] = "http://abc.com/latest/meta-data/iam/security-credentials"

with pytest.raises(ValueError) as excinfo:
self.make_credentials(credential_source=credential_source)
assert excinfo.match("Invalid hostname 'abc.com' for '{}'".format(key))

@mock.patch("google.auth._helpers.utcnow")
def test_retrieve_subject_token_success_ipv6(self, utcnow):
utcnow.return_value = datetime.datetime.strptime(
Expand Down