Skip to content

Commit 171e77f

Browse files
Bump org.apache.zookeeper:zookeeper from 3.9.3 to 3.9.4 (#1172)
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Francesco Chicchiriccò <ilgrosso@apache.org>
1 parent e69984c commit 171e77f

2 files changed

Lines changed: 18 additions & 3 deletions

File tree

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,12 @@
3333
import org.apache.syncope.common.keymaster.client.api.KeymasterProperties;
3434
import org.apache.syncope.common.keymaster.client.api.ServiceOps;
3535
import org.apache.zookeeper.ZooDefs;
36+
import org.apache.zookeeper.client.ZKClientConfig;
37+
import org.apache.zookeeper.common.X509Util;
3638
import org.apache.zookeeper.data.ACL;
3739
import org.apache.zookeeper.server.auth.DigestLoginModule;
3840
import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
41+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3942
import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
4043
import org.springframework.boot.context.properties.EnableConfigurationProperties;
4144
import org.springframework.context.annotation.Bean;
@@ -63,8 +66,20 @@ public ConditionOutcome getMatchOutcome(final ConditionContext context, final An
6366
}
6467

6568
@Conditional(ZookeeperCondition.class)
69+
@ConditionalOnMissingBean
6670
@Bean
67-
public CuratorFramework curatorFramework(final KeymasterProperties props) throws InterruptedException {
71+
public ZKClientConfig zkClientConfig() {
72+
ZKClientConfig zkClientConfig = new ZKClientConfig();
73+
zkClientConfig.setProperty(X509Util.FIPS_MODE_PROPERTY, "false");
74+
return zkClientConfig;
75+
}
76+
77+
@Conditional(ZookeeperCondition.class)
78+
@Bean
79+
public CuratorFramework curatorFramework(
80+
final ZKClientConfig zkClientConfig,
81+
final KeymasterProperties props) throws InterruptedException {
82+
6883
if (StringUtils.isNotBlank(props.getUsername()) && StringUtils.isNotBlank(props.getPassword())) {
6984
javax.security.auth.login.Configuration.setConfiguration(new javax.security.auth.login.Configuration() {
7085

@@ -102,7 +117,7 @@ public List<ACL> getAclForPath(final String path) {
102117
}
103118
});
104119
}
105-
CuratorFramework client = clientBuilder.build();
120+
CuratorFramework client = clientBuilder.zkClientConfig(zkClientConfig).build();
106121
client.start();
107122
client.blockUntilConnected(3, TimeUnit.SECONDS);
108123

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ under the License.
471471
<antlr4.version>4.13.2</antlr4.version>
472472

473473
<curator.version>5.9.0</curator.version>
474-
<zookeeper.version>3.9.3</zookeeper.version>
474+
<zookeeper.version>3.9.4</zookeeper.version>
475475

476476
<testcontainers.version>1.21.0</testcontainers.version>
477477

0 commit comments

Comments
 (0)