Fixes spring-projects#39057 : Added keystore type and truststore type…

… in toString
amparab · Jan 15, 2024 · 9c18e5e · 9c18e5e
1 parent a721595
commit 9c18e5e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/...nfigure/src/main/java/org/springframework/boot/autoconfigure/ssl/PropertiesSslBundle.java b/...nfigure/src/main/java/org/springframework/boot/autoconfigure/ssl/PropertiesSslBundle.java
@@ -147,6 +147,9 @@ private static JksSslStoreDetails asStoreDetails(JksSslBundleProperties.Store pr
 	@Override
 	public String toString() {
 		return "PropertiesSslBundle{" + "key-alias=" + this.key.getAlias() + ", protocol='" + this.protocol + '\''
+				+ ", keystore-type=" + this.stores.getKeyStore().getType()
+				+ ((this.stores.getTrustStore() != null) ? ", truststore-type=" + this.stores.getTrustStore().getType()
+						: ", truststore=null")
 				+ ", ciphers=" + Arrays.toString(this.options.getCiphers()) + ", enabled-protocols="
 				+ Arrays.toString(this.options.getEnabledProtocols()) + '}';
 	}

diff --git a/...ect/spring-boot/src/main/java/org/springframework/boot/web/server/WebServerSslBundle.java b/...ect/spring-boot/src/main/java/org/springframework/boot/web/server/WebServerSslBundle.java
@@ -155,6 +155,9 @@ private static boolean hasJavaKeyStoreProperties(Ssl ssl) {
 	@Override
 	public String toString() {
 		return "WebServerSslBundle{" + "key-alias=" + this.key.getAlias() + ", protocol='" + this.protocol + '\''
+				+ ", keystore-type=" + this.stores.getKeyStore().getType()
+				+ ((this.stores.getTrustStore() != null) ? ", truststore-type=" + this.stores.getTrustStore().getType()
+						: ", truststore=null")
 				+ ", ciphers=" + Arrays.toString(this.options.getCiphers()) + ", enabled-protocols="
 				+ Arrays.toString(this.options.getEnabledProtocols()) + '}';
 	}