You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by an...@apache.org on 2023/10/02 19:40:37 UTC
[zookeeper] branch branch-3.9.1 created (now a61834c62)
This is an automated email from the ASF dual-hosted git repository.
andor pushed a change to branch branch-3.9.1
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
at a61834c62 Prepared 3.9.2-SNAPSHOT
This branch includes the following new commits:
new 3b01adcc5 zookeeper-server: Improvement: Explicit handling of DIGEST-MD5 vs GSSAPI in quorum auth
new 19351b396 Added release notes for 3.9.1
new 40487256d Prepared 3.9.1
new a61834c62 Prepared 3.9.2-SNAPSHOT
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[zookeeper] 01/04: zookeeper-server: Improvement: Explicit handling of DIGEST-MD5 vs GSSAPI in quorum auth
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.9.1
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
commit 3b01adcc581a0e6a42feb10740181064cb6105b2
Author: Damien Diederen <dd...@apache.org>
AuthorDate: Sun Sep 24 14:28:56 2023 +0200
zookeeper-server: Improvement: Explicit handling of DIGEST-MD5 vs GSSAPI in quorum auth
Before this, the SASL-based quorum authorizer did not explicitly
distinguish between the DIGEST-MD5 and GSSAPI mechanisms: it was
simply relying on NameCallback and PasswordCallback for authentication
with the former and examining Kerberos principals in AuthorizeCallback
for the latter.
It turns out that some SASL/DIGEST-MD5 configurations cause
authentication and authorization IDs not to match the expected format,
and the DIGEST-MD5-based portions of the quorum test suite to fail
with obscure errors. (They can be traced to failures to join the
quorum, but only by looking into detailed logs.)
This patch uses the login module name to determine whether DIGEST-MD5
or GSSAPI is used, and relaxes the authentication ID check for the
former. As a cleanup, it keeps the password-based credential map
empty when Kerberos principals are expected. It finally adapts a
test, and adds a new one, ensuring "weirdly-shaped" credentials only
cause authentication failures in the GSSAPI case.
---
.../auth/SaslQuorumServerCallbackHandler.java | 44 +++++++++----
.../server/quorum/auth/QuorumKerberosAuthTest.java | 12 ++--
.../auth/QuorumKerberosHostBasedAuthTest.java | 72 +++++++++++++++++++++-
3 files changed, 107 insertions(+), 21 deletions(-)
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java
index 4b711a6b5..b182ee13a 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java
@@ -19,6 +19,7 @@
package org.apache.zookeeper.server.quorum.auth;
import java.io.IOException;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -31,6 +32,7 @@ import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
import javax.security.sasl.AuthorizeCallback;
import javax.security.sasl.RealmCallback;
+import org.apache.zookeeper.server.auth.DigestLoginModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +48,8 @@ public class SaslQuorumServerCallbackHandler implements CallbackHandler {
private static final Logger LOG = LoggerFactory.getLogger(SaslQuorumServerCallbackHandler.class);
private String userName;
- private final Map<String, String> credentials = new HashMap<>();
+ private final boolean isDigestAuthn;
+ private final Map<String, String> credentials;
private final Set<String> authzHosts;
public SaslQuorumServerCallbackHandler(
@@ -60,20 +63,35 @@ public class SaslQuorumServerCallbackHandler implements CallbackHandler {
LOG.error(errorMessage);
throw new IOException(errorMessage);
}
- credentials.clear();
+
+ Map<String, String> credentials = new HashMap<>();
+ boolean isDigestAuthn = true;
+
for (AppConfigurationEntry entry : configurationEntries) {
- Map<String, ?> options = entry.getOptions();
- // Populate DIGEST-MD5 user -> password map with JAAS configuration entries from the "QuorumServer" section.
- // Usernames are distinguished from other options by prefixing the username with a "user_" prefix.
- for (Map.Entry<String, ?> pair : options.entrySet()) {
- String key = pair.getKey();
- if (key.startsWith(USER_PREFIX)) {
- String userName = key.substring(USER_PREFIX.length());
- credentials.put(userName, (String) pair.getValue());
+ if (entry.getLoginModuleName().equals(DigestLoginModule.class.getName())) {
+ Map<String, ?> options = entry.getOptions();
+ // Populate DIGEST-MD5 user -> password map with JAAS configuration entries from the "QuorumServer" section.
+ // Usernames are distinguished from other options by prefixing the username with a "user_" prefix.
+ for (Map.Entry<String, ?> pair : options.entrySet()) {
+ String key = pair.getKey();
+ if (key.startsWith(USER_PREFIX)) {
+ String userName = key.substring(USER_PREFIX.length());
+ credentials.put(userName, (String) pair.getValue());
+ }
}
+ } else {
+ isDigestAuthn = false;
}
}
+ this.isDigestAuthn = isDigestAuthn;
+ if (isDigestAuthn) {
+ this.credentials = Collections.unmodifiableMap(credentials);
+ LOG.warn("Using DIGEST-MD5 for quorum authorization");
+ } else {
+ this.credentials = Collections.emptyMap();
+ }
+
// authorized host lists
this.authzHosts = authzHosts;
}
@@ -126,13 +144,15 @@ public class SaslQuorumServerCallbackHandler implements CallbackHandler {
// 2. Verify whether the connecting host is present in authorized hosts.
// If not exists, then connecting peer is not authorized to join the
// ensemble and will reject it.
- if (authzFlag) {
+ if (!isDigestAuthn && authzFlag) {
String[] components = authorizationID.split("[/@]");
if (components.length == 3) {
authzFlag = authzHosts.contains(components[1]);
+ } else {
+ authzFlag = false;
}
if (!authzFlag) {
- LOG.error("SASL authorization completed, {} is not authorized to connect", components[1]);
+ LOG.error("SASL authorization completed, {} is not authorized to connect", authorizationID);
}
}
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java
index 475c89973..4a8458054 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java
@@ -57,7 +57,7 @@ public class QuorumKerberosAuthTest extends KerberosSecurityTestcase {
+ " debug=false\n"
+ " refreshKrb5Config=true\n"
+ " principal=\""
- + KerberosTestUtils.getServerPrincipal()
+ + KerberosTestUtils.replaceHostPattern(KerberosTestUtils.getHostServerPrincipal())
+ "\";\n"
+ "};\n"
+ "QuorumLearner {\n"
@@ -71,7 +71,7 @@ public class QuorumKerberosAuthTest extends KerberosSecurityTestcase {
+ " debug=false\n"
+ " refreshKrb5Config=true\n"
+ " principal=\""
- + KerberosTestUtils.getLearnerPrincipal()
+ + KerberosTestUtils.replaceHostPattern(KerberosTestUtils.getHostLearnerPrincipal())
+ "\";\n"
+ "};\n";
setupJaasConfig(jaasEntries);
@@ -81,10 +81,10 @@ public class QuorumKerberosAuthTest extends KerberosSecurityTestcase {
public static void setUp() throws Exception {
// create keytab
keytabFile = new File(KerberosTestUtils.getKeytabFile());
- String learnerPrincipal = KerberosTestUtils.getLearnerPrincipal();
- String serverPrincipal = KerberosTestUtils.getServerPrincipal();
- learnerPrincipal = learnerPrincipal.substring(0, learnerPrincipal.lastIndexOf("@"));
- serverPrincipal = serverPrincipal.substring(0, serverPrincipal.lastIndexOf("@"));
+ String learnerPrincipal = KerberosTestUtils.getHostLearnerPrincipal();
+ String serverPrincipal = KerberosTestUtils.getHostServerPrincipal();
+ learnerPrincipal = KerberosTestUtils.replaceHostPattern(learnerPrincipal.substring(0, learnerPrincipal.lastIndexOf("@")));
+ serverPrincipal = KerberosTestUtils.replaceHostPattern(serverPrincipal.substring(0, serverPrincipal.lastIndexOf("@")));
getKdc().createPrincipal(keytabFile, learnerPrincipal, serverPrincipal);
}
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java
index 287761ac3..55a6d7480 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java
@@ -44,15 +44,17 @@ public class QuorumKerberosHostBasedAuthTest extends KerberosSecurityTestcase {
private static String hostServerPrincipal = KerberosTestUtils.getHostServerPrincipal();
private static String hostLearnerPrincipal = KerberosTestUtils.getHostLearnerPrincipal();
private static String hostNamedLearnerPrincipal = KerberosTestUtils.getHostNamedLearnerPrincipal("myHost");
+ private static String hostlessLearnerPrincipal = KerberosTestUtils.getLearnerPrincipal();
static {
- setupJaasConfigEntries(hostServerPrincipal, hostLearnerPrincipal, hostNamedLearnerPrincipal);
+ setupJaasConfigEntries(hostServerPrincipal, hostLearnerPrincipal, hostNamedLearnerPrincipal, hostlessLearnerPrincipal);
}
private static void setupJaasConfigEntries(
String hostServerPrincipal,
String hostLearnerPrincipal,
- String hostNamedLearnerPrincipal) {
+ String hostNamedLearnerPrincipal,
+ String hostlessLearnerPrincipal) {
String keytabFilePath = FilenameUtils.normalize(KerberosTestUtils.getKeytabFile(), true);
// note: we use "refreshKrb5Config=true" to refresh the kerberos config in the JVM,
@@ -93,6 +95,18 @@ public class QuorumKerberosHostBasedAuthTest extends KerberosSecurityTestcase {
+ " refreshKrb5Config=true\n"
+ " principal=\"" + hostNamedLearnerPrincipal
+ "\";\n"
+ + "};\n"
+ + "QuorumLearnerMissingHost {\n"
+ + " com.sun.security.auth.module.Krb5LoginModule required\n"
+ + " useKeyTab=true\n"
+ + " keyTab=\"" + keytabFilePath
+ + "\"\n"
+ + " storeKey=true\n"
+ + " useTicketCache=false\n"
+ + " debug=false\n"
+ + " refreshKrb5Config=true\n"
+ + " principal=\"" + hostlessLearnerPrincipal
+ + "\";\n"
+ "};\n";
setupJaasConfig(jaasEntries);
}
@@ -110,7 +124,11 @@ public class QuorumKerberosHostBasedAuthTest extends KerberosSecurityTestcase {
// learner with ipaddress in principal
String learnerPrincipal2 = hostNamedLearnerPrincipal.substring(0, hostNamedLearnerPrincipal.lastIndexOf("@"));
- getKdc().createPrincipal(keytabFile, learnerPrincipal, learnerPrincipal2, serverPrincipal);
+
+ // learner without host in principal
+ String learnerPrincipal3 = hostlessLearnerPrincipal.substring(0, hostlessLearnerPrincipal.lastIndexOf("@"));
+
+ getKdc().createPrincipal(keytabFile, learnerPrincipal, learnerPrincipal2, learnerPrincipal3, serverPrincipal);
}
@AfterEach
@@ -224,4 +242,52 @@ public class QuorumKerberosHostBasedAuthTest extends KerberosSecurityTestcase {
}
}
+ /**
+ * Test to verify that the bad server connection to the quorum should be rejected.
+ */
+ @Test
+ @Timeout(value = 120)
+ public void testConnectHostlessPrincipalBadServer() throws Exception {
+ String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@"));
+ Map<String, String> authConfigs = new HashMap<>();
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL, serverPrincipal);
+ String connectStr = startQuorum(3, authConfigs, 3);
+ CountdownWatcher watcher = new CountdownWatcher();
+ ZooKeeper zk = new ZooKeeper(connectStr, ClientBase.CONNECTION_TIMEOUT, watcher);
+ watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT);
+ for (int i = 0; i < 10; i++) {
+ zk.create("/" + i, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+ }
+ zk.close();
+
+ String quorumCfgSection = mt.get(0).getQuorumCfgSection();
+ StringBuilder sb = new StringBuilder();
+ sb.append(quorumCfgSection);
+
+ int myid = mt.size() + 1;
+ final int clientPort = PortAssignment.unique();
+ String server = String.format("server.%d=localhost:%d:%d:participant", myid, PortAssignment.unique(), PortAssignment.unique());
+ sb.append(server + "\n");
+ quorumCfgSection = sb.toString();
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearnerMissingHost");
+ MainThread badServer = new MainThread(myid, clientPort, quorumCfgSection, authConfigs);
+ badServer.start();
+ watcher = new CountdownWatcher();
+ connectStr = "127.0.0.1:" + clientPort;
+ zk = new ZooKeeper(connectStr, ClientBase.CONNECTION_TIMEOUT, watcher);
+ try {
+ watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT / 3);
+ fail("Must throw exception as the principal does not include an authorized host!");
+ } catch (TimeoutException e) {
+ // expected
+ } finally {
+ zk.close();
+ badServer.shutdown();
+ badServer.deleteBaseDir();
+ }
+ }
+
}
[zookeeper] 03/04: Prepared 3.9.1
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.9.1
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
commit 40487256d9b9f274484798758699e49c26d91cda
Author: Andor Molnar <an...@cloudera.com>
AuthorDate: Mon Oct 2 13:06:17 2023 +0000
Prepared 3.9.1
---
pom.xml | 4 ++--
zookeeper-assembly/pom.xml | 2 +-
zookeeper-client/pom.xml | 2 +-
zookeeper-client/zookeeper-client-c/pom.xml | 2 +-
zookeeper-compatibility-tests/pom.xml | 2 +-
.../zookeeper-compatibility-tests-curator/pom.xml | 2 +-
zookeeper-contrib/pom.xml | 2 +-
zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml | 2 +-
zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml | 2 +-
zookeeper-contrib/zookeeper-contrib-rest/pom.xml | 2 +-
zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml | 2 +-
zookeeper-docs/pom.xml | 2 +-
zookeeper-it/pom.xml | 2 +-
zookeeper-jute/pom.xml | 2 +-
zookeeper-metrics-providers/pom.xml | 2 +-
zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml | 2 +-
zookeeper-recipes/pom.xml | 2 +-
zookeeper-recipes/zookeeper-recipes-election/pom.xml | 2 +-
zookeeper-recipes/zookeeper-recipes-lock/pom.xml | 2 +-
zookeeper-recipes/zookeeper-recipes-queue/pom.xml | 2 +-
zookeeper-server/pom.xml | 2 +-
21 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9f9711f43..f544ca4b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<!-- to change version: mvn -B release:update-versions -DdevelopmentVersion=3.6.0-SNAPSHOT -->
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
<name>Apache ZooKeeper</name>
<description>
ZooKeeper is a centralized service for maintaining configuration information, naming,
@@ -71,7 +71,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/zookeeper.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/zookeeper.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf/zookeeper.git</url>
- <tag>branch-3.9</tag>
+ <tag>release-3.9.1-0</tag>
</scm>
<issueManagement>
<system>JIRA</system>
diff --git a/zookeeper-assembly/pom.xml b/zookeeper-assembly/pom.xml
index 7934e8d8a..b168cf5fc 100755
--- a/zookeeper-assembly/pom.xml
+++ b/zookeeper-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-assembly</artifactId>
diff --git a/zookeeper-client/pom.xml b/zookeeper-client/pom.xml
index b267710f6..ec248b5c4 100755
--- a/zookeeper-client/pom.xml
+++ b/zookeeper-client/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-client</artifactId>
diff --git a/zookeeper-client/zookeeper-client-c/pom.xml b/zookeeper-client/zookeeper-client-c/pom.xml
index afea77e86..9d68b29d8 100755
--- a/zookeeper-client/zookeeper-client-c/pom.xml
+++ b/zookeeper-client/zookeeper-client-c/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-client</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-client-c</artifactId>
diff --git a/zookeeper-compatibility-tests/pom.xml b/zookeeper-compatibility-tests/pom.xml
index 25c698b6d..b5ebd0a11 100644
--- a/zookeeper-compatibility-tests/pom.xml
+++ b/zookeeper-compatibility-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
diff --git a/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml b/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml
index 130f0aa78..34114e5c0 100644
--- a/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml
+++ b/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-compatibility-tests</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/zookeeper-contrib/pom.xml b/zookeeper-contrib/pom.xml
index b02ead78d..dfecc1d1f 100755
--- a/zookeeper-contrib/pom.xml
+++ b/zookeeper-contrib/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-contrib</artifactId>
diff --git a/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml b/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
index 75688a037..2d673aeab 100755
--- a/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<groupId>org.apache.zookeeper</groupId>
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
index 5106bd3b7..2b904926a 100755
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-contrib-loggraph</artifactId>
diff --git a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
index ddf557b72..6ee417e74 100755
--- a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-contrib-rest</artifactId>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
index 03c017b04..911710046 100755
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-contrib-zooinspector</artifactId>
diff --git a/zookeeper-docs/pom.xml b/zookeeper-docs/pom.xml
index 4582b3bbe..30a4b9a2a 100644
--- a/zookeeper-docs/pom.xml
+++ b/zookeeper-docs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-docs</artifactId>
diff --git a/zookeeper-it/pom.xml b/zookeeper-it/pom.xml
index 1416b64c8..76a039b05 100755
--- a/zookeeper-it/pom.xml
+++ b/zookeeper-it/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-it</artifactId>
diff --git a/zookeeper-jute/pom.xml b/zookeeper-jute/pom.xml
index b69c1af81..1c35ea224 100755
--- a/zookeeper-jute/pom.xml
+++ b/zookeeper-jute/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-jute</artifactId>
diff --git a/zookeeper-metrics-providers/pom.xml b/zookeeper-metrics-providers/pom.xml
index 089b1db7b..fc1858f60 100755
--- a/zookeeper-metrics-providers/pom.xml
+++ b/zookeeper-metrics-providers/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-metrics-providers</artifactId>
diff --git a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml
index 46e795af9..4d08a1569 100755
--- a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml
+++ b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-metrics-providers</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-prometheus-metrics</artifactId>
diff --git a/zookeeper-recipes/pom.xml b/zookeeper-recipes/pom.xml
index b0e7ee949..159dc5a97 100755
--- a/zookeeper-recipes/pom.xml
+++ b/zookeeper-recipes/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-recipes</artifactId>
diff --git a/zookeeper-recipes/zookeeper-recipes-election/pom.xml b/zookeeper-recipes/zookeeper-recipes-election/pom.xml
index 9f620c2c3..f7519ff9a 100755
--- a/zookeeper-recipes/zookeeper-recipes-election/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-election/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-recipes</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-recipes-election</artifactId>
diff --git a/zookeeper-recipes/zookeeper-recipes-lock/pom.xml b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
index 4182a97dc..e420400cc 100755
--- a/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-recipes</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-recipes-lock</artifactId>
diff --git a/zookeeper-recipes/zookeeper-recipes-queue/pom.xml b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
index c0f63f232..9fb1a9de9 100755
--- a/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-recipes</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper-recipes-queue</artifactId>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 980c34f56..5070cee42 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1-SNAPSHOT</version>
+ <version>3.9.1</version>
</parent>
<artifactId>zookeeper</artifactId>
[zookeeper] 04/04: Prepared 3.9.2-SNAPSHOT
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.9.1
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
commit a61834c62efdebcf42cda94cf2a1be380f91f3a0
Author: Andor Molnar <an...@cloudera.com>
AuthorDate: Mon Oct 2 13:07:41 2023 +0000
Prepared 3.9.2-SNAPSHOT
---
pom.xml | 4 ++--
zookeeper-assembly/pom.xml | 2 +-
zookeeper-client/pom.xml | 2 +-
zookeeper-client/zookeeper-client-c/CMakeLists.txt | 2 +-
zookeeper-client/zookeeper-client-c/configure.ac | 2 +-
zookeeper-client/zookeeper-client-c/pom.xml | 2 +-
zookeeper-compatibility-tests/pom.xml | 2 +-
.../zookeeper-compatibility-tests-curator/pom.xml | 2 +-
zookeeper-contrib/pom.xml | 2 +-
zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml | 2 +-
zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml | 2 +-
zookeeper-contrib/zookeeper-contrib-rest/pom.xml | 2 +-
zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml | 2 +-
zookeeper-docs/pom.xml | 2 +-
zookeeper-it/pom.xml | 2 +-
zookeeper-jute/pom.xml | 2 +-
zookeeper-metrics-providers/pom.xml | 2 +-
zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml | 2 +-
zookeeper-recipes/pom.xml | 2 +-
zookeeper-recipes/zookeeper-recipes-election/pom.xml | 2 +-
zookeeper-recipes/zookeeper-recipes-lock/pom.xml | 2 +-
zookeeper-recipes/zookeeper-recipes-queue/pom.xml | 2 +-
zookeeper-server/pom.xml | 2 +-
23 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index f544ca4b7..ae96e0f61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<!-- to change version: mvn -B release:update-versions -DdevelopmentVersion=3.6.0-SNAPSHOT -->
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
<name>Apache ZooKeeper</name>
<description>
ZooKeeper is a centralized service for maintaining configuration information, naming,
@@ -71,7 +71,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/zookeeper.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/zookeeper.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf/zookeeper.git</url>
- <tag>release-3.9.1-0</tag>
+ <tag>branch-3.9</tag>
</scm>
<issueManagement>
<system>JIRA</system>
diff --git a/zookeeper-assembly/pom.xml b/zookeeper-assembly/pom.xml
index b168cf5fc..f3f4d8e2b 100755
--- a/zookeeper-assembly/pom.xml
+++ b/zookeeper-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-assembly</artifactId>
diff --git a/zookeeper-client/pom.xml b/zookeeper-client/pom.xml
index ec248b5c4..d35d28d56 100755
--- a/zookeeper-client/pom.xml
+++ b/zookeeper-client/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-client</artifactId>
diff --git a/zookeeper-client/zookeeper-client-c/CMakeLists.txt b/zookeeper-client/zookeeper-client-c/CMakeLists.txt
index d44e86296..d7ae184ac 100644
--- a/zookeeper-client/zookeeper-client-c/CMakeLists.txt
+++ b/zookeeper-client/zookeeper-client-c/CMakeLists.txt
@@ -16,7 +16,7 @@
cmake_minimum_required(VERSION 3.5)
-project(zookeeper VERSION 3.9.1)
+project(zookeeper VERSION 3.9.2)
set(email user@zookeeper.apache.org)
set(description "zookeeper C client")
diff --git a/zookeeper-client/zookeeper-client-c/configure.ac b/zookeeper-client/zookeeper-client-c/configure.ac
index 0fd4635d0..e1624a0ab 100644
--- a/zookeeper-client/zookeeper-client-c/configure.ac
+++ b/zookeeper-client/zookeeper-client-c/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
-AC_INIT([zookeeper C client],3.9.1,[user@zookeeper.apache.org],[zookeeper])
+AC_INIT([zookeeper C client],3.9.2,[user@zookeeper.apache.org],[zookeeper])
AC_CONFIG_SRCDIR([src/zookeeper.c])
# Save initial CFLAGS and CXXFLAGS values before AC_PROG_CC and AC_PROG_CXX
diff --git a/zookeeper-client/zookeeper-client-c/pom.xml b/zookeeper-client/zookeeper-client-c/pom.xml
index 9d68b29d8..5a1eddd0b 100755
--- a/zookeeper-client/zookeeper-client-c/pom.xml
+++ b/zookeeper-client/zookeeper-client-c/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-client</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-client-c</artifactId>
diff --git a/zookeeper-compatibility-tests/pom.xml b/zookeeper-compatibility-tests/pom.xml
index b5ebd0a11..0cd9dfc42 100644
--- a/zookeeper-compatibility-tests/pom.xml
+++ b/zookeeper-compatibility-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
diff --git a/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml b/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml
index 34114e5c0..4d4a483ab 100644
--- a/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml
+++ b/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-compatibility-tests</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/zookeeper-contrib/pom.xml b/zookeeper-contrib/pom.xml
index dfecc1d1f..0f8a2638f 100755
--- a/zookeeper-contrib/pom.xml
+++ b/zookeeper-contrib/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-contrib</artifactId>
diff --git a/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml b/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
index 2d673aeab..41c5112da 100755
--- a/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.zookeeper</groupId>
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
index 2b904926a..48077c93e 100755
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-contrib-loggraph</artifactId>
diff --git a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
index 6ee417e74..aaefdf090 100755
--- a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-contrib-rest</artifactId>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
index 911710046..df15964f0 100755
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-contrib-zooinspector</artifactId>
diff --git a/zookeeper-docs/pom.xml b/zookeeper-docs/pom.xml
index 30a4b9a2a..f4b9fbbab 100644
--- a/zookeeper-docs/pom.xml
+++ b/zookeeper-docs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-docs</artifactId>
diff --git a/zookeeper-it/pom.xml b/zookeeper-it/pom.xml
index 76a039b05..f2d343fe0 100755
--- a/zookeeper-it/pom.xml
+++ b/zookeeper-it/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-it</artifactId>
diff --git a/zookeeper-jute/pom.xml b/zookeeper-jute/pom.xml
index 1c35ea224..e09db18d9 100755
--- a/zookeeper-jute/pom.xml
+++ b/zookeeper-jute/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-jute</artifactId>
diff --git a/zookeeper-metrics-providers/pom.xml b/zookeeper-metrics-providers/pom.xml
index fc1858f60..710af9a11 100755
--- a/zookeeper-metrics-providers/pom.xml
+++ b/zookeeper-metrics-providers/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-metrics-providers</artifactId>
diff --git a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml
index 4d08a1569..4a6608b70 100755
--- a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml
+++ b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-metrics-providers</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-prometheus-metrics</artifactId>
diff --git a/zookeeper-recipes/pom.xml b/zookeeper-recipes/pom.xml
index 159dc5a97..2b08181a7 100755
--- a/zookeeper-recipes/pom.xml
+++ b/zookeeper-recipes/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-recipes</artifactId>
diff --git a/zookeeper-recipes/zookeeper-recipes-election/pom.xml b/zookeeper-recipes/zookeeper-recipes-election/pom.xml
index f7519ff9a..6d314c404 100755
--- a/zookeeper-recipes/zookeeper-recipes-election/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-election/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-recipes</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-recipes-election</artifactId>
diff --git a/zookeeper-recipes/zookeeper-recipes-lock/pom.xml b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
index e420400cc..edd87b9cd 100755
--- a/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-recipes</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-recipes-lock</artifactId>
diff --git a/zookeeper-recipes/zookeeper-recipes-queue/pom.xml b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
index 9fb1a9de9..be21a14e2 100755
--- a/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-recipes</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-recipes-queue</artifactId>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 5070cee42..e470c18aa 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
- <version>3.9.1</version>
+ <version>3.9.2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper</artifactId>
[zookeeper] 02/04: Added release notes for 3.9.1
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.9.1
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
commit 19351b396afc6df84f15f8cc37e0d17eb709ab42
Author: Andor Molnar <an...@cloudera.com>
AuthorDate: Mon Oct 2 12:53:46 2023 +0000
Added release notes for 3.9.1
---
zookeeper-docs/src/main/resources/markdown/releasenotes.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/zookeeper-docs/src/main/resources/markdown/releasenotes.md b/zookeeper-docs/src/main/resources/markdown/releasenotes.md
index 4de1a2c23..ecf5c5b6e 100644
--- a/zookeeper-docs/src/main/resources/markdown/releasenotes.md
+++ b/zookeeper-docs/src/main/resources/markdown/releasenotes.md
@@ -14,6 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License.
//-->
+# Release Notes - ZooKeeper - Version 3.9.1
+
+## Bug
+
+* Fix CVE-2023-44981
+
+
+
# Release Notes - ZooKeeper - Version 3.9.0