Skip to content

Commit 4cc4a3b

Browse files
committed
feat: support client cert properties (aws#469)
1 parent 98482d4 commit 4cc4a3b

File tree

3 files changed

+183
-0
lines changed

3 files changed

+183
-0
lines changed

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/model/ApiGatewayRequestIdentity.java

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ public class ApiGatewayRequestIdentity {
4646
private String accountId;
4747
private String accessKey;
4848

49+
private String principalOrgId;
50+
51+
private ClientCert clientCert;
4952

5053
//-------------------------------------------------------------
5154
// Methods - Getter/Setter
@@ -179,4 +182,91 @@ public String getAccessKey() {
179182
public void setAccessKey(String accessKey) {
180183
this.accessKey = accessKey;
181184
}
185+
186+
public String getPrincipalOrgId() {
187+
return principalOrgId;
188+
}
189+
190+
public void setPrincipalOrgId(String principalOrgId) {
191+
this.principalOrgId = principalOrgId;
192+
}
193+
194+
public ClientCert getClientCert() {
195+
return clientCert;
196+
}
197+
198+
public void setClientCert(ClientCert clientCert) {
199+
this.clientCert = clientCert;
200+
}
201+
202+
public static class ClientCert {
203+
204+
private String clientCertPem;
205+
private String issuerDN;
206+
private String serialNumber;
207+
private String subjectDN;
208+
private Validity validity;
209+
210+
public String getClientCertPem() {
211+
return clientCertPem;
212+
}
213+
214+
public void setClientCertPem(String clientCertPem) {
215+
this.clientCertPem = clientCertPem;
216+
}
217+
218+
public String getIssuerDN() {
219+
return issuerDN;
220+
}
221+
222+
public void setIssuerDN(String issuerDN) {
223+
this.issuerDN = issuerDN;
224+
}
225+
226+
public String getSerialNumber() {
227+
return serialNumber;
228+
}
229+
230+
public void setSerialNumber(String serialNumber) {
231+
this.serialNumber = serialNumber;
232+
}
233+
234+
public String getSubjectDN() {
235+
return subjectDN;
236+
}
237+
238+
public void setSubjectDN(String subjectDN) {
239+
this.subjectDN = subjectDN;
240+
}
241+
242+
public Validity getValidity() {
243+
return validity;
244+
}
245+
246+
public void setValidity(Validity validity) {
247+
this.validity = validity;
248+
}
249+
}
250+
251+
public static class Validity {
252+
253+
private String notAfter;
254+
private String notBefore;
255+
256+
public String getNotAfter() {
257+
return notAfter;
258+
}
259+
260+
public void setNotAfter(String notAfter) {
261+
this.notAfter = notAfter;
262+
}
263+
264+
public String getNotBefore() {
265+
return notBefore;
266+
}
267+
268+
public void setNotBefore(String notBefore) {
269+
this.notBefore = notBefore;
270+
}
271+
}
182272
}
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
package com.amazonaws.serverless.proxy.model;
2+
3+
public class HttpApiV2Authentication {
4+
private ClientCert clientCert;
5+
6+
public ClientCert getClientCert() {
7+
return clientCert;
8+
}
9+
10+
public void setClientCert(ClientCert clientCert) {
11+
this.clientCert = clientCert;
12+
}
13+
14+
public static class ClientCert {
15+
16+
private String clientCertPem;
17+
private String issuerDN;
18+
private String serialNumber;
19+
private String subjectDN;
20+
private Validity validity;
21+
22+
public String getClientCertPem() {
23+
return clientCertPem;
24+
}
25+
26+
public void setClientCertPem(String clientCertPem) {
27+
this.clientCertPem = clientCertPem;
28+
}
29+
30+
public String getIssuerDN() {
31+
return issuerDN;
32+
}
33+
34+
public void setIssuerDN(String issuerDN) {
35+
this.issuerDN = issuerDN;
36+
}
37+
38+
public String getSerialNumber() {
39+
return serialNumber;
40+
}
41+
42+
public void setSerialNumber(String serialNumber) {
43+
this.serialNumber = serialNumber;
44+
}
45+
46+
public String getSubjectDN() {
47+
return subjectDN;
48+
}
49+
50+
public void setSubjectDN(String subjectDN) {
51+
this.subjectDN = subjectDN;
52+
}
53+
54+
public Validity getValidity() {
55+
return validity;
56+
}
57+
58+
public void setValidity(Validity validity) {
59+
this.validity = validity;
60+
}
61+
62+
public static class Validity {
63+
64+
private String notAfter;
65+
private String notBefore;
66+
67+
public String getNotAfter() {
68+
return notAfter;
69+
}
70+
71+
public void setNotAfter(String notAfter) {
72+
this.notAfter = notAfter;
73+
}
74+
75+
public String getNotBefore() {
76+
return notBefore;
77+
}
78+
79+
public void setNotBefore(String notBefore) {
80+
this.notBefore = notBefore;
81+
}
82+
}
83+
}
84+
}

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/model/HttpApiV2ProxyRequestContext.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public class HttpApiV2ProxyRequestContext {
2828

2929
private HttpApiV2HttpContext http;
3030
private HttpApiV2AuthorizerMap authorizer;
31+
private HttpApiV2Authentication authentication;
3132

3233
public String getAccountId() {
3334
return accountId;
@@ -117,4 +118,12 @@ public void setAuthorizer(HttpApiV2AuthorizerMap authorizer) {
117118
this.authorizer = authorizer;
118119
}
119120

121+
public HttpApiV2Authentication getAuthentication() {
122+
return authentication;
123+
}
124+
125+
public void setAuthentication(HttpApiV2Authentication authentication) {
126+
this.authentication = authentication;
127+
}
128+
120129
}

0 commit comments

Comments
 (0)