Skip to content

Commit 1597a94

Browse files
authored
Merge pull request #45982 from karesti/fix-fips
Infinispan client default auth to DIGEST-SHA-512
2 parents 9e52d1a + ebf247e commit 1597a94

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

docs/src/main/asciidoc/infinispan-client-reference.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ distributedCache:
299299

300300
You can use the following authentication mechanisms with the Infinispan client:
301301

302+
* DIGEST-SHA-512 (default)
302303
* DIGEST-MD5
303304
* PLAIN (recommended only in combination with TLS encryption)
304305
* EXTERNAL

extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,15 +307,16 @@ InfinispanPropertiesBuildItem setup(ApplicationArchivesBuildItem applicationArch
307307
String[] elytronClasses = new String[] {
308308
"org.wildfly.security.sasl.plain.PlainSaslClientFactory",
309309
"org.wildfly.security.sasl.scram.ScramSaslClientFactory",
310+
"org.wildfly.security.sasl.digest.DigestClientFactory",
310311
"org.wildfly.security.credential.BearerTokenCredential",
311312
"org.wildfly.security.credential.GSSKerberosCredential",
312313
"org.wildfly.security.credential.KeyPairCredential",
313314
"org.wildfly.security.credential.PasswordCredential",
314315
"org.wildfly.security.credential.PublicKeyCredential",
315316
"org.wildfly.security.credential.SecretKeyCredential",
316317
"org.wildfly.security.credential.SSHCredential",
317-
"org.wildfly.security.credential.X509CertificateChainPrivateCredential",
318-
"org.wildfly.security.credential.X509CertificateChainPublicCredential"
318+
"org.wildfly.security.digest.SHA512_256MessageDigest",
319+
"org.wildfly.security.credential.X509CertificateChainPrivateCredential"
319320
};
320321

321322
reflectiveClass.produce(ReflectiveClassBuildItem.builder(elytronClasses).reason(getClass().getName()).build());

extensions/infinispan-client/deployment/src/test/java/org/quarkus/infinispan/client/deployment/InfinispanDefaultMinimalConfigurationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void infinispanConnectionConfiguration() {
3232
assertThat(configuration.clientIntelligence()).isEqualTo(ClientIntelligence.HASH_DISTRIBUTION_AWARE);
3333
assertThat(configuration.remoteCaches()).isEmpty();
3434
assertThat(configuration.security().authentication().enabled()).isTrue();
35-
assertThat(configuration.security().authentication().saslMechanism()).isEqualTo("DIGEST-MD5");
35+
assertThat(configuration.security().authentication().saslMechanism()).isEqualTo("DIGEST-SHA-512");
3636
assertThat(configuration.security().ssl().enabled()).isFalse();
3737
}
3838
}

extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientRuntimeConfig.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,14 @@ public interface InfinispanClientRuntimeConfig {
109109
/**
110110
* Sets SASL mechanism used by authentication.
111111
* Available values:
112-
* * `DIGEST-MD5` - Uses the MD5 hashing algorithm in addition to nonces to encrypt credentials. This is the default.
112+
* * `DIGEST-SHA-512` - Uses the SHA-512 hashing algorithm to securely hash and verify credentials. This is the default.
113+
* * `DIGEST-MD5` - Uses the MD5 hashing algorithm in addition to nonces to encrypt credentials.
113114
* * `EXTERNAL` - Uses client certificates to provide valid identities to Infinispan Server and enable encryption.
114115
* * `PLAIN` - Sends credentials in plain text (unencrypted) over the wire in a way that is similar to HTTP BASIC
115116
* authentication. You should use `PLAIN` authentication only in combination with TLS encryption.
116117
*/
117118
// @formatter:on
118-
@WithDefault("DIGEST-MD5")
119+
@WithDefault("DIGEST-SHA-512")
119120
Optional<String> saslMechanism();
120121

121122
/**

0 commit comments

Comments
 (0)