Bump org.apache.zookeeper:zookeeper from 3.9.5 to 3.9.6

Bumps org.apache.zookeeper:zookeeper from 3.9.5 to 3.9.6.

---
updated-dependencies:
- dependency-name: org.apache.zookeeper:zookeeper
  dependency-version: 3.9.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Author: dependabot[bot]

common/keymaster/client-zookeeper/pom.xml

@@ -128,14 +128,9 @@ under the License.
                     <ports>
                       <port>2181:2181</port>
                     </ports>
-                    <volumes>
-                      <bind>
-                        <volume>${project.build.outputDirectory}/zoo.cfg:/conf/zoo.cfg</volume>
-                        <volume>${project.build.outputDirectory}/java.env:/conf/java.env</volume>
-                        <volume>${project.build.outputDirectory}/server-jaas.conf:/conf/server-jaas.conf</volume>
-                        <volume>${project.build.outputDirectory}/client-jaas.conf:/conf/client-jaas.conf</volume>
-                      </bind>
-                    </volumes>
+                    <env>
+                      <JVMFLAGS>-Dzookeeper.DigestAuthenticationProvider.superDigest=anonymous:NgPlLv4rbtJEAlVQcVR4CYocoRo=</JVMFLAGS>
+                    </env>
                   </run>
                 </image>
               </images>

common/keymaster/client-zookeeper/src/main/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperKeymasterClientContext.java

@@ -19,10 +19,8 @@
 package org.apache.syncope.common.keymaster.client.zookeeper;
 
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
-import javax.security.auth.login.AppConfigurationEntry;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
@@ -34,9 +32,7 @@
 import org.apache.syncope.common.keymaster.client.api.ServiceOps;
 import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.client.ZKClientConfig;
-import org.apache.zookeeper.common.X509Util;
 import org.apache.zookeeper.data.ACL;
-import org.apache.zookeeper.server.auth.DigestLoginModule;
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
@@ -69,9 +65,7 @@ public ConditionOutcome getMatchOutcome(final ConditionContext context, final An
     @ConditionalOnMissingBean
     @Bean
     public ZKClientConfig zkClientConfig() {
-        ZKClientConfig zkClientConfig = new ZKClientConfig();
-        zkClientConfig.setProperty(X509Util.FIPS_MODE_PROPERTY, "false");
-        return zkClientConfig;
+        return new ZKClientConfig();
     }
 
     @Conditional(ZookeeperCondition.class)
@@ -80,31 +74,13 @@ public CuratorFramework curatorFramework(
             final ZKClientConfig zkClientConfig,
             final KeymasterProperties props) throws InterruptedException {
 
-        if (StringUtils.isNotBlank(props.getUsername()) && StringUtils.isNotBlank(props.getPassword())) {
-            javax.security.auth.login.Configuration.setConfiguration(new javax.security.auth.login.Configuration() {
-
-                private final AppConfigurationEntry[] entries = {
-                    new AppConfigurationEntry(
-                    DigestLoginModule.class.getName(),
-                    AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
-                    Map.of(
-                    "username", props.getUsername(),
-                    "password", props.getPassword()
-                    ))
-                };
-
-                @Override
-                public AppConfigurationEntry[] getAppConfigurationEntry(final String name) {
-                    return entries;
-                }
-            });
-        }
-
         CuratorFrameworkFactory.Builder clientBuilder = CuratorFrameworkFactory.builder().
                 connectString(props.getAddress()).
                 retryPolicy(new ExponentialBackoffRetry(props.getBaseSleepTimeMs(), props.getMaxRetries()));
-        if (StringUtils.isNotBlank(props.getUsername())) {
-            clientBuilder.authorization("digest", props.getUsername().getBytes()).aclProvider(new ACLProvider() {
+
+        if (StringUtils.isNotBlank(props.getUsername()) && StringUtils.isNotBlank(props.getPassword())) {
+            String authString = props.getUsername() + ":" + props.getPassword();
+            clientBuilder.authorization("digest", authString.getBytes()).aclProvider(new ACLProvider() {
 
                 @Override
                 public List<ACL> getDefaultAcl() {
@@ -117,6 +93,7 @@ public List<ACL> getAclForPath(final String path) {
                 }
             });
         }
+
         CuratorFramework client = clientBuilder.zkClientConfig(zkClientConfig).build();
         client.start();
         client.blockUntilConnected(3, TimeUnit.SECONDS);

common/keymaster/client-zookeeper/src/main/resources/client-jaas.conf

@@ -21,15 +21,13 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.InputStream;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-import javax.security.auth.login.AppConfigurationEntry;
-import javax.security.auth.login.Configuration;
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.apache.curator.test.InstanceSpec;
 import org.apache.curator.test.TestingServer;
+import org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
 
 public final class ZookeeperTestingServer {
 
@@ -49,26 +47,10 @@ public static void start() throws Exception {
                 fail("Could not load /test.properties", e);
             }
 
-            Configuration.setConfiguration(new Configuration() {
-
-                private final AppConfigurationEntry[] entries = {
-                    new AppConfigurationEntry(
-                    "org.apache.zookeeper.server.auth.DigestLoginModule",
-                    AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
-                    Map.of(
-                    "user_" + username.get(), password.get()
-                    ))
-                };
-
-                @Override
-                public AppConfigurationEntry[] getAppConfigurationEntry(final String name) {
-                    return entries;
-                }
-            });
-
-            Map<String, Object> customProperties = new HashMap<>();
-            customProperties.put("authProvider.1", "org.apache.zookeeper.server.auth.SASLAuthenticationProvider");
-            InstanceSpec spec = new InstanceSpec(null, 2181, -1, -1, true, 1, -1, -1, customProperties);
+            System.setProperty(
+                    "zookeeper.DigestAuthenticationProvider.superDigest",
+                    DigestAuthenticationProvider.generateDigest(username.get() + ":" + password.get()));
+            InstanceSpec spec = new InstanceSpec(null, 2181, -1, -1, true, 1, -1, -1, Map.of());
             ZK_SERVER = new TestingServer(spec, true);
         }
     }

common/keymaster/client-zookeeper/src/main/resources/java.env

@@ -473,14 +473,9 @@ under the License.
                     <ports>
                       <port>2181:2181</port>
                     </ports>
-                    <volumes>
-                      <bind>
-                        <volume>${project.build.directory}/test-classes/zoo.cfg:/conf/zoo.cfg</volume>
-                        <volume>${project.build.directory}/test-classes/java.env:/conf/java.env</volume>
-                        <volume>${project.build.directory}/test-classes/server-jaas.conf:/conf/server-jaas.conf</volume>
-                        <volume>${project.build.directory}/test-classes/client-jaas.conf:/conf/client-jaas.conf</volume>
-                      </bind>
-                    </volumes>
+                    <env>
+                      <JVMFLAGS>-Dzookeeper.DigestAuthenticationProvider.superDigest=anonymous:NgPlLv4rbtJEAlVQcVR4CYocoRo=</JVMFLAGS>
+                    </env>
                   </run>
                 </image>
               </images>

common/keymaster/client-zookeeper/src/main/resources/server-jaas.conf

@@ -490,7 +490,7 @@ under the License.
     <antlr4.version>4.13.2</antlr4.version>
 
     <curator.version>5.9.0</curator.version>
-    <zookeeper.version>3.9.5</zookeeper.version>
+    <zookeeper.version>3.9.6</zookeeper.version>
 
     <byte-buddy.jdk25.version>1.17.8</byte-buddy.jdk25.version>
     <mockito.jdk25.version>5.20.0</mockito.jdk25.version>

common/keymaster/client-zookeeper/src/main/resources/zoo.cfg

@@ -21,18 +21,14 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.InputStream;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-import javax.security.auth.login.AppConfigurationEntry;
-import javax.security.auth.login.Configuration;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.apache.curator.test.InstanceSpec;
 import org.apache.curator.test.TestingServer;
-import org.apache.zookeeper.server.auth.DigestLoginModule;
-import org.apache.zookeeper.server.auth.SASLAuthenticationProvider;
+import org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 
@@ -55,26 +51,11 @@ public void initialize(final ConfigurableApplicationContext ctx) {
         }
 
         if (AbstractTest.available(port.get())) {
-            Configuration.setConfiguration(new Configuration() {
-
-                private final AppConfigurationEntry[] entries = {
-                    new AppConfigurationEntry(
-                    DigestLoginModule.class.getName(),
-                    AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
-                    Map.of("user_" + username.get(), password.get()))
-                };
-
-                @Override
-                public AppConfigurationEntry[] getAppConfigurationEntry(final String name) {
-                    return entries;
-                }
-            });
-
-            Map<String, Object> customProperties = new HashMap<>();
-            customProperties.put("authProvider.1", SASLAuthenticationProvider.class.getName());
-            InstanceSpec spec = new InstanceSpec(null, port.get(), -1, -1, true, 1, -1, -1, customProperties);
-
             try {
+                System.setProperty(
+                        "zookeeper.DigestAuthenticationProvider.superDigest",
+                        DigestAuthenticationProvider.generateDigest(username.get() + ":" + password.get()));
+                InstanceSpec spec = new InstanceSpec(null, port.get(), -1, -1, true, 1, -1, -1, Map.of());
                 new TestingServer(spec, true);
             } catch (Exception e) {
                 fail(e);