Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

supporting signed urls for private keys

Browse Source
This commit is contained in:
Jack Danger 2017-09-22 10:42:13 -07:00
parent 284c6e91b9
commit ea66a71765
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/s3/responses.py
View File

@ -548,8 +548,10 @@ class ResponseObject(_TemplateEnvironmentMixin):
# header. # header.
if 'Authorization' not in request.headers: if 'Authorization' not in request.headers:
key = self.backend.get_key(bucket_name, key_name) key = self.backend.get_key(bucket_name, key_name)
if key and not key.acl.public_read: signed_url = 'Signature=' in request.url
return 403, {}, "" if key:
if not key.acl.public_read and not signed_url:
return 403, {}, ""
if hasattr(request, 'body'): if hasattr(request, 'body'):
# Boto # Boto

14
tests/test_s3/test_s3.py
View File

@ -875,15 +875,19 @@ def test_s3_object_in_public_bucket():
s3_anonymous = boto3.resource('s3') s3_anonymous = boto3.resource('s3')
s3_anonymous.meta.client.meta.events.register('choose-signer.s3.*', disable_signing) s3_anonymous.meta.client.meta.events.register('choose-signer.s3.*', disable_signing)
contents = s3_anonymous.Object(key='file.txt', bucket_name='test-bucket').get()['Body'].read() # contents = s3_anonymous.Object(key='file.txt', bucket_name='test-bucket').get()['Body'].read()
contents.should.equal(b'ABCD') # contents.should.equal(b'ABCD')
bucket.put_object(ACL='private', Body=b'ABCD', Key='file.txt') bucket.put_object(ACL='private', Body=b'ABCD', Key='file.txt')
with assert_raises(ClientError) as exc: # with assert_raises(ClientError) as exc:
s3_anonymous.Object(key='file.txt', bucket_name='test-bucket').get() # s3_anonymous.Object(key='file.txt', bucket_name='test-bucket').get()
exc.exception.response['Error']['Code'].should.equal('403') # exc.exception.response['Error']['Code'].should.equal('403')
params = {'Bucket': 'test-bucket','Key': 'file.txt'}
presigned_url = boto3.client('s3').generate_presigned_url('get_object', params, ExpiresIn=900)
response = requests.get(presigned_url)
assert response.status_code == 200
@mock_s3 @mock_s3
def test_s3_object_in_private_bucket(): def test_s3_object_in_private_bucket():