File size: 4,227 Bytes
f4a7cbe |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 |
commit 1fac0ad3848bc4e9cb6afd6de004e6c448da20e9
Author: Isaac Goldthwaite <igoldthwaite@kududyn.com>
Date: Wed May 21 14:33:18 2025 -0400
[automated] Set delta state
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/util/MessageTracker.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/util/MessageTracker.java
index a81a12ba..91952cad 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/util/MessageTracker.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/util/MessageTracker.java
@@ -105,7 +105,9 @@ private static void logMessages(
CircularBuffer<BufferedMessage> messages,
Direction direction) {
String sentOrReceivedText = direction == Direction.SENT ? "sentBuffer to" : "receivedBuffer from";
-
+ if (serverAddr.contains(":")) {
+ verifyIPv6(serverAddr);
+ }
if (messages.isEmpty()) {
LOG.info("No buffered timestamps for messages {} {}", sentOrReceivedText, serverAddr);
} else {
@@ -116,6 +118,34 @@ private static void logMessages(
}
}
+ private static void verifyIPv6(String serverAddr) {
+ int maxColons = 8;
+ int cntColons = 0;
+ int i = serverAddr.indexOf(':');
+ while (i > -1 && i < serverAddr.length() && cntColons < maxColons) {
+ cntColons++;
+ i = serverAddr.indexOf(':', i + 1);
+ }
+ //is there an extra?
+ int extraColons = countExtraColons(i, serverAddr);
+ //count extras
+ if (cntColons > 0 && (cntColons < maxColons || extraColons == 0)) {
+ return;
+ }
+ throw new IllegalArgumentException("bad ipv6: " + serverAddr + " too many colons=" + extraColons);
+ }
+
+ private static int countExtraColons(int i, String serverAddr) {
+ if (i == -1) {
+ return 1;
+ }
+ int cnt = 1;
+ while (i > 0) {
+ cnt++;
+ i = serverAddr.indexOf(':');
+ }
+ return cnt;
+ }
/**
* Direction for message track.
*/
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/MessageTrackerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/MessageTrackerTest.java
index d400cf99..9e1d6b37 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/MessageTrackerTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/MessageTrackerTest.java
@@ -20,6 +20,9 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -127,4 +130,30 @@ public void testDumpToLog() {
assertNull(messageTracker.peekSent());
assertNull(messageTracker.peekReceived());
}
+
+ @Test
+ public void testIPv6VerificationGood() {
+ MessageTracker messageTracker = new MessageTracker(10);
+ //see https://www.ibm.com/docs/en/ts4500-tape-library?topic=functionality-ipv4-ipv6-address-formats
+ for (String serverAddr : new String[] {
+ "2001:db8:3333:4444:5555:6666:7777:8888",
+ "2001:db8:3333:4444:CCCC:DDDD:EEEE:FFFF",
+ "::", "2001:db8::", "2001:db8::1234:5678",
+ "2001:0db8:0001:0000:0000:0ab9:C0A8:0102"
+ }) {
+ messageTracker.dumpToLog(serverAddr);
+ }
+ }
+
+ @Test
+ public void testIPv6TooManyColons() {
+ final String serverAddr = "2001:db8:1234:0000:0000:0000:0000:0000:0000";
+ MessageTracker messageTracker = new MessageTracker(10);
+ IllegalArgumentException thrown = assertThrows(
+ IllegalArgumentException.class,
+ () -> messageTracker.dumpToLog(serverAddr),
+ "Expected dumpToLog to throw IllegalArgumentException, but it didn't"
+ );
+ assertTrue(thrown.getMessage().contains("too many colons=1"));
+ }
}
|