Skip to content

Commit c3ee0d8

Browse files
mp911demp911de
committed
Properly parse IPv6 host and port into RedisNode.
Closes #2418
1 parent 4371d3f commit c3ee0d8

File tree

5 files changed

+126
-22
lines changed

5 files changed

+126
-22
lines changed

‎src/main/java/org/springframework/data/redis/connection/RedisClusterConfiguration.java‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public RedisClusterConfiguration clusterNode(String host, Integer port) {
170170
private void appendClusterNodes(Set<String> hostAndPorts) {
171171

172172
for (String hostAndPort : hostAndPorts) {
173-
addClusterNode(readHostAndPortFromString(hostAndPort));
173+
addClusterNode(RedisNode.fromString(hostAndPort));
174174
}
175175
}
176176

@@ -228,15 +228,6 @@ public int hashCode() {
228228
return result;
229229
}
230230

231-
private RedisNode readHostAndPortFromString(String hostAndPort) {
232-
233-
String[] args = split(hostAndPort, ":");
234-
235-
Assert.notNull(args, "HostAndPort need to be seperated by ':'.");
236-
Assert.isTrue(args.length == 2, "Host and Port String needs to specified as host:port");
237-
return new RedisNode(args[0], Integer.valueOf(args[1]));
238-
}
239-
240231
/**
241232
* @param clusterHostAndPorts must not be {@literal null} or empty.
242233
* @param redirects the max number of redirects to follow.
@@ -256,4 +247,5 @@ private static Map<String, Object> asMap(Collection<String> clusterHostAndPorts,
256247

257248
return map;
258249
}
250+
259251
}

‎src/main/java/org/springframework/data/redis/connection/RedisNode.java‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,95 @@ private RedisNode(RedisNode redisNode) {
6161
this.masterId = redisNode.masterId;
6262
}
6363

64+
/**
65+
* Parse a {@code hostAndPort} string into {@link RedisNode}. Supports IPv4, IPv6, and hostname notations including
66+
* the port. For example:
67+
*
68+
* <pre class="code">
69+
* RedisNode.fromString("127.0.0.1:6379");
70+
* RedisNode.fromString("[aaaa:bbbb::dddd:eeee]:6379");
71+
* RedisNode.fromString("my.redis.server:6379");
72+
* </pre>
73+
*
74+
* @param hostPortString must not be {@literal null} or empty.
75+
* @return the parsed {@link RedisNode}.
76+
* @since 2.7.4
77+
*/
78+
public static RedisNode fromString(String hostPortString) {
79+
80+
Assert.notNull(hostPortString, "HostAndPort must not be null");
81+
82+
String host;
83+
String portString = null;
84+
85+
if (hostPortString.startsWith("[")) {
86+
String[] hostAndPort = getHostAndPortFromBracketedHost(hostPortString);
87+
host = hostAndPort[0];
88+
portString = hostAndPort[1];
89+
} else {
90+
int colonPos = hostPortString.indexOf(':');
91+
if (colonPos >= 0 && hostPortString.indexOf(':', colonPos + 1) == -1) {
92+
// Exactly 1 colon. Split into host:port.
93+
host = hostPortString.substring(0, colonPos);
94+
portString = hostPortString.substring(colonPos + 1);
95+
} else {
96+
// 0 or 2+ colons. Bare hostname or IPv6 literal.
97+
host = hostPortString;
98+
}
99+
}
100+
101+
int port = -1;
102+
try {
103+
port = Integer.parseInt(portString);
104+
} catch (RuntimeException e) {
105+
throw new IllegalArgumentException(String.format("Unparseable port number: %s", hostPortString));
106+
}
107+
108+
if (!isValidPort(port)) {
109+
throw new IllegalArgumentException(String.format("Port number out of range: %s", hostPortString));
110+
}
111+
112+
return new RedisNode(host, port);
113+
}
114+
115+
/**
116+
* Parses a bracketed host-port string, throwing IllegalArgumentException if parsing fails.
117+
*
118+
* @param hostPortString the full bracketed host-port specification. Post might not be specified.
119+
* @return an array with 2 strings: host and port, in that order.
120+
* @throws IllegalArgumentException if parsing the bracketed host-port string fails.
121+
*/
122+
private static String[] getHostAndPortFromBracketedHost(String hostPortString) {
123+
124+
if (hostPortString.charAt(0) != '[') {
125+
throw new IllegalArgumentException(
126+
String.format("Bracketed host-port string must start with a bracket: %s", hostPortString));
127+
}
128+
129+
int colonIndex = hostPortString.indexOf(':');
130+
int closeBracketIndex = hostPortString.lastIndexOf(']');
131+
132+
if (!(colonIndex > -1 && closeBracketIndex > colonIndex)) {
133+
throw new IllegalArgumentException(String.format("Invalid bracketed host/port: %s", hostPortString));
134+
}
135+
136+
String host = hostPortString.substring(1, closeBracketIndex);
137+
if (closeBracketIndex + 1 == hostPortString.length()) {
138+
return new String[] { host, "" };
139+
} else {
140+
if (!(hostPortString.charAt(closeBracketIndex + 1) == ':')) {
141+
throw new IllegalArgumentException(
142+
String.format("Only a colon may follow a close bracket: %s", hostPortString));
143+
}
144+
for (int i = closeBracketIndex + 2; i < hostPortString.length(); ++i) {
145+
if (!Character.isDigit(hostPortString.charAt(i))) {
146+
throw new IllegalArgumentException(String.format("Port must be numeric: %s", hostPortString));
147+
}
148+
}
149+
return new String[] { host, hostPortString.substring(closeBracketIndex + 2) };
150+
}
151+
}
152+
64153
/**
65154
* @return can be {@literal null}.
66155
*/
@@ -86,6 +175,11 @@ public Integer getPort() {
86175
}
87176

88177
public String asString() {
178+
179+
if (host != null && host.contains(":")) {
180+
return "[" + host + "]:" + port;
181+
}
182+
89183
return host + ":" + port;
90184
}
91185

@@ -294,4 +388,8 @@ public RedisNode build() {
294388
}
295389
}
296390

391+
private static boolean isValidPort(int port) {
392+
return port >= 0 && port <= 65535;
393+
}
394+
297395
}

‎src/main/java/org/springframework/data/redis/connection/RedisSentinelConfiguration.java‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public RedisSentinelConfiguration sentinel(String host, Integer port) {
200200
private void appendSentinels(Set<String> hostAndPorts) {
201201

202202
for (String hostAndPort : hostAndPorts) {
203-
addSentinel(readHostAndPortFromString(hostAndPort));
203+
addSentinel(RedisNode.fromString(hostAndPort));
204204
}
205205
}
206206

@@ -306,15 +306,6 @@ public int hashCode() {
306306
return result;
307307
}
308308

309-
private RedisNode readHostAndPortFromString(String hostAndPort) {
310-
311-
String[] args = split(hostAndPort, ":");
312-
313-
Assert.notNull(args, "HostAndPort need to be separated by ':'");
314-
Assert.isTrue(args.length == 2, "Host and Port String needs to specified as host:port");
315-
return new RedisNode(args[0], Integer.valueOf(args[1]).intValue());
316-
}
317-
318309
/**
319310
* @param master must not be {@literal null} or empty.
320311
* @param sentinelHostAndPorts must not be {@literal null}.

‎src/test/java/org/springframework/data/redis/connection/RedisClusterConfigurationUnitTests.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import org.springframework.util.StringUtils;
2929

3030
/**
31+
* Unit tests for {@link RedisClusterConfiguration}.
32+
*
3133
* @author Christoph Strobl
3234
* @author Mark Paluch
3335
*/
@@ -48,12 +50,22 @@ void shouldCreateRedisClusterConfigurationCorrectly() {
4850
assertThat(config.getMaxRedirects()).isNull();
4951
}
5052

53+
@Test // GH-2418
54+
void shouldCreateRedisClusterConfigurationForIPV6Correctly() {
55+
56+
RedisClusterConfiguration config = new RedisClusterConfiguration(Collections.singleton("[aaa:bbb:ccc::dd1]:123"));
57+
58+
assertThat(config.getClusterNodes().size()).isEqualTo(1);
59+
assertThat(config.getClusterNodes()).contains(new RedisNode("aaa:bbb:ccc::dd1", 123));
60+
assertThat(config.getClusterNodes()).first().hasToString("[aaa:bbb:ccc::dd1]:123");
61+
assertThat(config.getMaxRedirects()).isNull();
62+
}
63+
5164
@Test // DATAREDIS-315
5265
void shouldCreateRedisClusterConfigurationCorrectlyGivenMultipleHostAndPortStrings() {
5366

5467
RedisClusterConfiguration config = new RedisClusterConfiguration(
55-
new HashSet<>(Arrays.asList(HOST_AND_PORT_1,
56-
HOST_AND_PORT_2, HOST_AND_PORT_3)));
68+
new HashSet<>(Arrays.asList(HOST_AND_PORT_1, HOST_AND_PORT_2, HOST_AND_PORT_3)));
5769

5870
assertThat(config.getClusterNodes().size()).isEqualTo(3);
5971
assertThat(config.getClusterNodes()).contains(new RedisNode("127.0.0.1", 123), new RedisNode("localhost", 456),

‎src/test/java/org/springframework/data/redis/connection/RedisSentinelConfigurationUnitTests.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
* Unit tests for {@link RedisSentinelConfiguration}.
3131
*
3232
* @author Christoph Strobl
33+
* @author Mark Paluch
3334
* @author Vikas Garg
3435
*/
3536
class RedisSentinelConfigurationUnitTests {
@@ -49,6 +50,16 @@ void shouldCreateRedisSentinelConfigurationCorrectlyGivenMasterAndSingleHostAndP
4950
assertThat(config.getSentinels()).contains(new RedisNode("127.0.0.1", 123));
5051
}
5152

53+
@Test // GH-2418
54+
void shouldCreateRedisSentinelConfigurationCorrectlyGivenMasterAndSingleIPV6HostAndPortString() {
55+
56+
RedisSentinelConfiguration config = new RedisSentinelConfiguration("mymaster",
57+
Collections.singleton("[ca:fee::1]:123"));
58+
59+
assertThat(config.getSentinels()).hasSize(1);
60+
assertThat(config.getSentinels()).contains(new RedisNode("ca:fee::1", 123));
61+
}
62+
5263
@Test // DATAREDIS-372
5364
void shouldCreateRedisSentinelConfigurationCorrectlyGivenMasterAndMultipleHostAndPortStrings() {
5465

0 commit comments

Comments
 (0)