saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #33681 from rallytime/bp-33599

Browse source 
Back-port #33599 to 2015.8
This commit is contained in:
Mike Place 2016-06-01 14:14:29 -07:00
commit 069ee15b7c
2 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/utils/aws.py
View file

@ -203,7 +203,8 @@ def assumed_creds(prov_dict, role_arn, location=None):
def sig4(method, endpoint, params, prov_dict,
aws_api_version=DEFAULT_AWS_API_VERSION, location=None,
product='ec2', uri='/', requesturl=None, data='', role_arn=None):
product='ec2', uri='/', requesturl=None, data='',
role_arn=None, payload_hash=None):
'''
Sign a query against AWS services using Signature Version 4 Signing
Process. This is documented at:
@ -250,7 +251,8 @@ def sig4(method, endpoint, params, prov_dict,
# Create payload hash (hash of the request body content). For GET
# requests, the payload is an empty string ('').
payload_hash = hashlib.sha256(data).hexdigest()
if not payload_hash:
payload_hash = hashlib.sha256(data).hexdigest()
# Combine elements to create create canonical request
canonical_request = '\n'.join((

44
salt/utils/s3.py
View file

@ -28,7 +28,8 @@ log = logging.getLogger(__name__)
def query(key, keyid, method='GET', params=None, headers=None,
requesturl=None, return_url=False, bucket=None, service_url=None,
path='', return_bin=False, action=None, local_file=None,
verify_ssl=True, location=None, full_headers=False, role_arn=None):
verify_ssl=True, location=None, full_headers=False, role_arn=None,
chunk_size=16384):
'''
Perform a query against an S3-like API. This function requires that a
secret key and the id for that key are passed in. For instance:
@ -92,10 +93,10 @@ def query(key, keyid, method='GET', params=None, headers=None,
keyid = salt.utils.aws.IROLE_CODE
data = ''
payload_hash = None
if method == 'PUT':
if local_file:
with salt.utils.fopen(local_file, 'r') as ifile:
data = ifile.read()
payload_hash = salt.utils.get_hash(local_file, form='sha256')
if not requesturl:
requesturl = 'https://{0}/{1}'.format(endpoint, path)
@ -110,6 +111,7 @@ def query(key, keyid, method='GET', params=None, headers=None,
location=location,
product='s3',
requesturl=requesturl,
payload_hash=payload_hash,
)
log.debug('S3 Request: {0}'.format(requesturl))
@ -119,12 +121,31 @@ def query(key, keyid, method='GET', params=None, headers=None,
if not data:
data = None
result = requests.request(method,
requesturl,
headers=headers,
data=data,
verify=verify_ssl)
response = result.content
response = None
if method == 'PUT':
if local_file:
with salt.utils.fopen(local_file, 'r') as data:
result = requests.request(method,
requesturl,
headers=headers,
data=data,
verify=verify_ssl,
stream=True)
response = result.content
elif method == 'GET' and not return_bin:
result = requests.request(method,
requesturl,
headers=headers,
data=data,
verify=verify_ssl,
stream=True)
else:
result = requests.request(method,
requesturl,
headers=headers,
data=data,
verify=verify_ssl)
response = result.content
if result.status_code >= 400:
# On error the S3 API response should contain error message
log.debug(' Response content: {0}'.format(response))
@ -168,8 +189,9 @@ def query(key, keyid, method='GET', params=None, headers=None,
# This can be used to save a binary object to disk
if local_file and method == 'GET':
log.debug('Saving to local file: {0}'.format(local_file))
with salt.utils.fopen(local_file, 'w') as out:
out.write(response)
with salt.utils.fopen(local_file, 'wb') as out:
for chunk in result.iter_content(chunk_size=chunk_size):
out.write(chunk)
return 'Saved to local file: {0}'.format(local_file)
# This can be used to return a binary object wholesale