Skip to content

Bump org.apache.zookeeper:zookeeper from 3.9.3 to 3.9.4 #1172

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.

Sign up for GitHub

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

Merged
ilgrosso merged 3 commits into from
Sep 16, 2025
Merged

Bump org.apache.zookeeper:zookeeper from 3.9.3 to 3.9.4 #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fe7fe7
Bump org.apache.zookeeper:zookeeper from 3.9.3 to 3.9.4
dependabot[bot] Sep 4, 2025
e3e69ef
Merge branch 'master' into dependabot/maven/org.apache.zookeeper-zook…
ilgrosso Sep 16, 2025
9ba3141
Disabling zookeeper.fips-mode by default
ilgrosso Sep 16, 2025
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
19 changes: 17 additions & 2 deletions ...org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperKeymasterClientContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,12 @@
import org.apache.syncope.common.keymaster.client.api.KeymasterProperties;
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;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
Expand Down Expand Up @@ -63,8 +66,20 @@ public ConditionOutcome getMatchOutcome(final ConditionContext context, final An
}

@Conditional(ZookeeperCondition.class)
@ConditionalOnMissingBean
@Bean
public CuratorFramework curatorFramework(final KeymasterProperties props) throws InterruptedException {
public ZKClientConfig zkClientConfig() {
ZKClientConfig zkClientConfig = new ZKClientConfig();
zkClientConfig.setProperty(X509Util.FIPS_MODE_PROPERTY, "false");
return zkClientConfig;
}

@Conditional(ZookeeperCondition.class)
@Bean
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() {

Expand Down Expand Up @@ -102,7 +117,7 @@ public List<ACL> getAclForPath(final String path) {
}
});
}
CuratorFramework client = clientBuilder.build();
CuratorFramework client = clientBuilder.zkClientConfig(zkClientConfig).build();
client.start();
client.blockUntilConnected(3, TimeUnit.SECONDS);

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ under the License.
<antlr4.version>4.13.2</antlr4.version>

<curator.version>5.9.0</curator.version>
<zookeeper.version>3.9.3</zookeeper.version>
<zookeeper.version>3.9.4</zookeeper.version>

<zonky.embedded-postgres.version>2.1.1</zonky.embedded-postgres.version>
<zonky.embedded-postgres-binaries.version>17.6.0</zonky.embedded-postgres-binaries.version>
Expand Down
Loading