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

Merge pull request #1179 from JackDanger/jack/supporting-signed-urls-for-private-keys

Browse Source 
supporting signed urls for private keys
This commit is contained in:
Jack Danger 2017-09-22 11:09:40 -07:00 committed by GitHub
commit e19be52851
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moto/s3/responses.py
View File

@ -547,8 +547,14 @@ class ResponseObject(_TemplateEnvironmentMixin):
# ACL and checking for the mere presence of an Authorization # ACL and checking for the mere presence of an Authorization
# header. # header.
if 'Authorization' not in request.headers: if 'Authorization' not in request.headers:
if hasattr(request, 'url'):
signed_url = 'Signature=' in request.url
elif hasattr(request, 'requestline'):
signed_url = 'Signature=' in request.path
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:
if key:
if not key.acl.public_read and not signed_url:
return 403, {}, "" return 403, {}, ""
if hasattr(request, 'body'): if hasattr(request, 'body'):

4
tests/test_s3/test_s3.py
View File

@ -884,6 +884,10 @@ def test_s3_object_in_public_bucket():
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():