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.

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

TLS: Introduce key-store-key-password #18387

Merged
merged 1 commit into from
Jul 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ public class CertificateConfig {
@ConfigItem
public Optional<String> keyStoreKeyAlias;

/**
* An optional parameter to define the password for the key, in case it's different from {@link #keyStorePassword}.
*/
@ConfigItem
public Optional<String> keyStoreKeyPassword;

/**
* An optional trust store which holds the certificate information of the certificates to trust.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,8 @@ private static HttpServerOptions createSslOptions(HttpBuildTimeConfig buildTimeC
keystorePassword,
sslConfig.certificate.keyStoreFileType,
sslConfig.certificate.keyStoreProvider,
sslConfig.certificate.keyStoreKeyAlias);
sslConfig.certificate.keyStoreKeyAlias,
sslConfig.certificate.keyStoreKeyPassword);
serverOptions.setKeyCertOptions(options);
} else {
return null;
Expand All @@ -637,7 +638,8 @@ private static HttpServerOptions createSslOptions(HttpBuildTimeConfig buildTimeC
trustStorePassword.get(),
sslConfig.certificate.trustStoreFileType,
sslConfig.certificate.trustStoreProvider,
sslConfig.certificate.trustStoreCertAlias);
sslConfig.certificate.trustStoreCertAlias,
Optional.empty());
serverOptions.setTrustOptions(options);
}

Expand All @@ -664,22 +666,23 @@ private static HttpServerOptions createSslOptions(HttpBuildTimeConfig buildTimeC
return serverOptions;
}

private static KeyStoreOptions createKeyStoreOptions(Path keyStorePath, String password, Optional<String> keyStoreFileType,
Optional<String> keyStoreProvider, Optional<String> keyStoreAlias) throws IOException {
private static KeyStoreOptions createKeyStoreOptions(Path path, String password, Optional<String> fileType,
Optional<String> provider, Optional<String> alias, Optional<String> aliasPassword) throws IOException {
final String type;
if (keyStoreFileType.isPresent()) {
type = keyStoreFileType.get().toLowerCase();
if (fileType.isPresent()) {
type = fileType.get().toLowerCase();
} else {
type = findKeystoreFileType(keyStorePath);
type = findKeystoreFileType(path);
}

byte[] data = getFileContent(keyStorePath);
byte[] data = getFileContent(path);
KeyStoreOptions options = new KeyStoreOptions()
.setPassword(password)
.setValue(Buffer.buffer(data))
.setType(type.toUpperCase())
.setProvider(keyStoreProvider.orElse(null))
.setAlias(keyStoreAlias.orElse(null));
.setProvider(provider.orElse(null))
.setAlias(alias.orElse(null))
.setAliasPassword(aliasPassword.orElse(null));
return options;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ vertx.event-loops.size=2
quarkus.http.ssl.certificate.key-store-file=server-keystore.jks
quarkus.http.ssl.certificate.key-store-password=password
quarkus.http.ssl.certificate.key-store-key-alias=server
quarkus.http.ssl.certificate.key-store-key-password=serverpw
quarkus.http.ssl.certificate.trust-store-file=server-truststore.jks
quarkus.http.ssl.certificate.trust-store-password=password
quarkus.http.ssl.certificate.trust-store-cert-alias=mykey-1
Expand Down
Binary file not shown.