From 64415d2e60f6927055581b4aade262ee84d4a500 Mon Sep 17 00:00:00 2001 From: Mark Sailes Date: Fri, 26 Aug 2022 16:44:32 +0100 Subject: [PATCH 1/2] Adding the client cert attributes --- .../APIGatewayProxyRequestEvent.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/apigateway/APIGatewayProxyRequestEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/apigateway/APIGatewayProxyRequestEvent.java index 92ad919c..8d18f9f6 100644 --- a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/apigateway/APIGatewayProxyRequestEvent.java +++ b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/apigateway/APIGatewayProxyRequestEvent.java @@ -134,5 +134,32 @@ public static class RequestIdentity implements Serializable { private String user; private String accessKey; + + private String principalOrgId; + + private ClientCert clientCert; + } + + @AllArgsConstructor + @Builder(setterPrefix = "with") + @Data + @NoArgsConstructor + public static class ClientCert { + + private String clientCertPem; + private String issuerDN; + private String serialNumber; + private String subjectDN; + private Validity validity; + } + + @AllArgsConstructor + @Builder(setterPrefix = "with") + @Data + @NoArgsConstructor + public static class Validity { + + private String notAfter; + private String notBefore; } } From 5e930db30a76043a22f01d93754e15d7f9f934c3 Mon Sep 17 00:00:00 2001 From: Mark Sailes Date: Tue, 30 Aug 2022 20:32:57 +0100 Subject: [PATCH 2/2] adding tests --- .../api_gateway_proxy_request_event.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/aws-lambda-java-events/src/test/resources/event_models/api_gateway_proxy_request_event.json b/aws-lambda-java-events/src/test/resources/event_models/api_gateway_proxy_request_event.json index f0521aa8..eef27f46 100644 --- a/aws-lambda-java-events/src/test/resources/event_models/api_gateway_proxy_request_event.json +++ b/aws-lambda-java-events/src/test/resources/event_models/api_gateway_proxy_request_event.json @@ -41,7 +41,18 @@ "cognitoAuthenticationProvider": "", "userArn": "arn:aws:iam::123456789012:user/kdeding", "userAgent": "Apache-HttpClient/4.5.x (Java/1.8.0_131)", - "user": "AIDAJTIRKKKER4HCKVJZG" + "user": "AIDAJTIRKKKER4HCKVJZG", + "principalOrgId": "", + "clientCert": { + "clientCertPem": "CERT_CONTENT", + "subjectDN": "www.example.com", + "issuerDN": "Example issuer", + "serialNumber": "a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1:a1", + "validity": { + "notBefore": "May 28 12:30:02 2019 GMT", + "notAfter": "Aug 5 09:36:04 2021 GMT" + } + } }, "path": "/my/path", "protocol": "HTTP/1.1",