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

Merge pull request #1275 from WhileLoop/fix-acm-san-count-check

Browse Source 
Check if subject_alt_names is not none before checking length
This commit is contained in:
Jack Danger 2017-10-19 18:01:19 -07:00 committed by GitHub
commit 3b0afbb570
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/acm/responses.py
View File

@ -185,7 +185,7 @@ class AWSCertificateManagerResponse(BaseResponse):
idempotency_token = self._get_param('IdempotencyToken') idempotency_token = self._get_param('IdempotencyToken')
subject_alt_names = self._get_param('SubjectAlternativeNames') subject_alt_names = self._get_param('SubjectAlternativeNames')
if len(subject_alt_names) > 10: if subject_alt_names is not None and len(subject_alt_names) > 10:
# There is initial AWS limit of 10 # There is initial AWS limit of 10
msg = 'An ACM limit has been exceeded. Need to request SAN limit to be raised' msg = 'An ACM limit has been exceeded. Need to request SAN limit to be raised'
return json.dumps({'__type': 'LimitExceededException', 'message': msg}), dict(status=400) return json.dumps({'__type': 'LimitExceededException', 'message': msg}), dict(status=400)

13
tests/test_acm/test_acm.py
View File

@ -287,6 +287,19 @@ def test_request_certificate():
) )
resp.should.contain('CertificateArn') resp.should.contain('CertificateArn')
@mock_acm
def test_request_certificate_no_san():
client = boto3.client('acm', region_name='eu-central-1')
resp = client.request_certificate(
DomainName='google.com'
)
resp.should.contain('CertificateArn')
resp2 = client.describe_certificate(
CertificateArn=resp['CertificateArn']
)
resp2.should.contain('Certificate')
# # Also tests the SAN code # # Also tests the SAN code
# # requires Pull: https://github.com/spulec/freezegun/pull/210 # # requires Pull: https://github.com/spulec/freezegun/pull/210