diff --git a/aws_lambda_powertools/utilities/parser/models/__init__.py b/aws_lambda_powertools/utilities/parser/models/__init__.py index bdfa9bdf111..3a7ceba588f 100644 --- a/aws_lambda_powertools/utilities/parser/models/__init__.py +++ b/aws_lambda_powertools/utilities/parser/models/__init__.py @@ -27,10 +27,13 @@ ApiGatewayAuthorizerRequestV2, APIGatewayProxyEventV2Model, RequestContextV2, + RequestContextV2Authentication, RequestContextV2Authorizer, RequestContextV2AuthorizerIam, RequestContextV2AuthorizerIamCognito, RequestContextV2AuthorizerJwt, + RequestContextV2ClientCert, + RequestContextV2ClientCertValidity, RequestContextV2Http, ) from .appsync import AppSyncResolverEventModel @@ -176,10 +179,13 @@ "ApiGatewayAuthorizerRequestV2": "apigwv2", "APIGatewayProxyEventV2Model": "apigwv2", "RequestContextV2": "apigwv2", + "RequestContextV2Authentication": "apigwv2", "RequestContextV2Authorizer": "apigwv2", "RequestContextV2AuthorizerIam": "apigwv2", "RequestContextV2AuthorizerIamCognito": "apigwv2", "RequestContextV2AuthorizerJwt": "apigwv2", + "RequestContextV2ClientCert": "apigwv2", + "RequestContextV2ClientCertValidity": "apigwv2", "RequestContextV2Http": "apigwv2", "AppSyncResolverEventModel": "appsync", "AppSyncEventsModel": "appsync_events", @@ -317,6 +323,9 @@ def __dir__() -> list[str]: "RequestContextV2AuthorizerJwt", "RequestContextV2AuthorizerIam", "RequestContextV2AuthorizerIamCognito", + "RequestContextV2Authentication", + "RequestContextV2ClientCert", + "RequestContextV2ClientCertValidity", "CloudWatchLogsData", "CloudWatchLogsDecode", "CloudWatchLogsLogEvent", diff --git a/aws_lambda_powertools/utilities/parser/models/apigwv2.py b/aws_lambda_powertools/utilities/parser/models/apigwv2.py index ea43d94a557..8bea9f96592 100644 --- a/aws_lambda_powertools/utilities/parser/models/apigwv2.py +++ b/aws_lambda_powertools/utilities/parser/models/apigwv2.py @@ -47,9 +47,28 @@ def _validate_source_ip(cls, value): return _validate_source_ip(value=value) +class RequestContextV2ClientCertValidity(BaseModel): + notBefore: str + notAfter: str + + +class RequestContextV2ClientCert(BaseModel): + clientCertPem: str + subjectDN: str + issuerDN: str + serialNumber: str + validity: RequestContextV2ClientCertValidity + + +class RequestContextV2Authentication(BaseModel): + # Only sent when mutual TLS is enabled on the API's custom domain name + clientCert: RequestContextV2ClientCert | None = None + + class RequestContextV2(BaseModel): accountId: str apiId: str + authentication: RequestContextV2Authentication | None = None authorizer: RequestContextV2Authorizer | None = None domainName: str domainPrefix: str diff --git a/tests/unit/parser/_pydantic/test_apigwv2.py b/tests/unit/parser/_pydantic/test_apigwv2.py index a9c7a3ef9e1..df64ec79ad9 100644 --- a/tests/unit/parser/_pydantic/test_apigwv2.py +++ b/tests/unit/parser/_pydantic/test_apigwv2.py @@ -67,6 +67,27 @@ def test_apigw_v2_event_jwt_authorizer(): assert parsed_event.stageVariables == raw_event["stageVariables"] +def test_apigw_v2_event_with_client_cert(): + raw_event = load_event("apiGatewayProxyV2Event.json") + parsed_event: APIGatewayProxyEventV2Model = parse(event=raw_event, model=APIGatewayProxyEventV2Model) + + client_cert = parsed_event.requestContext.authentication.clientCert + raw_client_cert = raw_event["requestContext"]["authentication"]["clientCert"] + assert client_cert.clientCertPem == raw_client_cert["clientCertPem"] + assert client_cert.subjectDN == raw_client_cert["subjectDN"] + assert client_cert.issuerDN == raw_client_cert["issuerDN"] + assert client_cert.serialNumber == raw_client_cert["serialNumber"] + assert client_cert.validity.notBefore == raw_client_cert["validity"]["notBefore"] + assert client_cert.validity.notAfter == raw_client_cert["validity"]["notAfter"] + + +def test_apigw_v2_event_without_client_cert(): + raw_event = load_event("apiGatewayProxyV2IamEvent.json") + parsed_event: APIGatewayProxyEventV2Model = parse(event=raw_event, model=APIGatewayProxyEventV2Model) + + assert parsed_event.requestContext.authentication is None + + def test_apigw_v2_event_empty_jwt_scopes(): raw_event = load_event("apiGatewayProxyV2Event.json") raw_event["requestContext"]["authorizer"]["jwt"]["scopes"] = None @@ -164,6 +185,16 @@ def test_apigw_v2_request_authorizer(): assert parsed_event.routeArn == raw_event["routeArn"] +def test_apigw_v2_request_authorizer_with_client_cert(): + raw_event = load_event("apiGatewayAuthorizerV2Event.json") + parsed_event: ApiGatewayAuthorizerRequestV2 = parse(event=raw_event, model=ApiGatewayAuthorizerRequestV2) + + client_cert = parsed_event.requestContext.authentication.clientCert + raw_client_cert = raw_event["requestContext"]["authentication"]["clientCert"] + assert client_cert.subjectDN == raw_client_cert["subjectDN"] + assert client_cert.serialNumber == raw_client_cert["serialNumber"] + + def test_apigw_v2_request_authorizer_without_identity_source(): raw_event = load_event("apiGatewayAuthorizerV2Event.json") raw_event["identitySource"] = None