openstack
/
keystone
Code Issues Proposed changes

Merge "Fix host:port handling" into stable/train

This commit is contained in:
Zuul 2022-11-03 12:27:28 +00:00 committed by Gerrit Code Review
parent 8474416555 8d883f011c
commit 236be80331
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keystone/api/ec2tokens.py
View File

@ -12,6 +12,8 @@
# This file handles all flask-restful resources for /v3/ec2tokens
from six.moves.urllib import parse as urllib_parse
import flask
from keystoneclient.contrib.ec2 import utils as ec2_utils
from oslo_serialization import jsonutils
@ -42,8 +44,8 @@ class EC2TokensResource(EC2_S3_Resource.ResourceBase):
# NOTE(vish): Some client libraries don't use the port when
# signing requests, so try again without the port.
elif ':' in credentials['host']:
hostname, _port = credentials.split(':')
credentials['host'] = hostname
parsed = urllib_parse.urlsplit('//' + credentials['host'])
credentials['host'] = parsed.hostname
# NOTE(davechen): we need to reinitialize 'signer' to avoid
# contaminated status of signature, this is similar with
# other programming language libraries, JAVA for example.