valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix ec2 cloud provider for endpoint URLs with paths

Browse Source
This commit is contained in:
Grischa Meyer 2014-12-18 17:31:30 +11:00
parent e7d95eed5a
commit e471e37e43
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/cloud/clouds/ec2.py
View File

@ -314,8 +314,11 @@ def query(params=None, setname=None, requesturl=None, location=None,
) )
requesturl = 'https://{0}/'.format(endpoint) requesturl = 'https://{0}/'.format(endpoint)
endpoint = urlparse.urlparse(requesturl).netloc
endpoint_path = urlparse.urlparse(requesturl).path
else: else:
endpoint = _urlparse(requesturl).netloc endpoint = _urlparse(requesturl).netloc
endpoint_path = urlparse.urlparse(requesturl).path
if endpoint == '': if endpoint == '':
endpoint_err = ( endpoint_err = (
'Could not find a valid endpoint in the ' 'Could not find a valid endpoint in the '
@ -347,9 +350,10 @@ def query(params=None, setname=None, requesturl=None, location=None,
# %20, however urlencode uses '+'. So replace pluses with %20. # %20, however urlencode uses '+'. So replace pluses with %20.
querystring = querystring.replace('+', '%20') querystring = querystring.replace('+', '%20')
uri = '{0}\n{1}\n/\n{2}'.format(method.encode('utf-8'), uri = '{0}\n{1}\n{2}\n{3}'.format(method.encode('utf-8'),
endpoint.encode('utf-8'), endpoint.encode('utf-8'),
querystring.encode('utf-8')) endpoint_path.encode('utf-8'),
querystring.encode('utf-8'))
hashed = hmac.new(provider['key'], uri, hashlib.sha256) hashed = hmac.new(provider['key'], uri, hashlib.sha256)
sig = binascii.b2a_base64(hashed.digest()) sig = binascii.b2a_base64(hashed.digest())