Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TKSS-637: JettyServer supports client authentication #638

Merged
merged 1 commit into from
Jan 16, 2024
Merged

TKSS-637: JettyServer supports client authentication #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions kona-demo/src/main/java/com/tencent/kona/demo/AppConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ public class AppConfig {
@Value("${server.ssl.enabled}")
private boolean sslEnabled;

@Value("${server.ssl.provider}")
private String provider;

@Value("${server.ssl.trust-store-provider}")
private String trustStoreProvider;

Expand Down Expand Up @@ -58,6 +61,9 @@ public class AppConfig {
@Value("${server.ssl.protocol}")
private String contextProtocol;

@Value("${server.ssl.client-auth-enabled}")
private boolean clientAuthEnabled;

@Value("${server.http2.enabled}")
private boolean http2Enabled;

Expand All @@ -77,6 +83,14 @@ public void setSslEnabled(String sslEnabled) {
this.sslEnabled = Boolean.parseBoolean(sslEnabled);
}

public String getProvider() {
return provider;
}

public void setProvider(String provider) {
this.provider = provider;
}

public String getTrustStoreProvider() {
return trustStoreProvider;
}
Expand Down Expand Up @@ -149,6 +163,14 @@ public void setContextProtocol(String contextProtocol) {
this.contextProtocol = contextProtocol;
}

public boolean isClientAuthEnabled() {
return clientAuthEnabled;
}

public void setClientAuthEnabled(boolean clientAuthEnabled) {
this.clientAuthEnabled = clientAuthEnabled;
}

public boolean isHttp2Enabled() {
return http2Enabled;
}
Expand Down
3 changes: 3 additions & 0 deletions kona-demo/src/main/java/com/tencent/kona/demo/JettyServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ public SSLParameters customize(SSLParameters sslParams) {
}
};

contextFactory.setProvider(appConfig.getProvider());

contextFactory.setTrustStoreProvider(appConfig.getTrustStoreProvider());
contextFactory.setTrustStoreType(appConfig.getTrustStoreType());
contextFactory.setTrustStorePath(getAbsolutePath(appConfig.getTrustStorePath()));
Expand All @@ -109,6 +111,7 @@ public SSLParameters customize(SSLParameters sslParams) {
contextFactory.setKeyManagerPassword(appConfig.getKeyStorePassword());

contextFactory.setProtocol(appConfig.getContextProtocol());
contextFactory.setNeedClientAuth(appConfig.isClientAuthEnabled());

HttpConfiguration httpsConfig = new HttpConfiguration();
httpsConfig.setSecureScheme("https");
Expand Down
4 changes: 4 additions & 0 deletions kona-demo/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ server:
ssl:
enabled: true

provider: Kona

trust-store-provider: Kona
trust-store-type: PKCS12
trust-store: classpath:ssl/truststore.p12
Expand All @@ -37,5 +39,7 @@ server:
# and will take the providers from TencentKonaSMSuite to work.
protocol: TLCP

client-auth-enabled: false

http2:
enabled: true