Fixed - host name containing underscore cause NPE. Illegal reflective access by org.redisson.misc.URIBuilder warning removed #2150 #2029
Nikita Koksharov
6 years ago
parent
b2fc908615
commit
0ce487f08d
@ -0,0 +1,127 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2013-2019 Nikita Koksharov
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.redisson.misc;
|
||||||
|
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
|
import java.net.MalformedURLException;
|
||||||
|
import java.net.URL;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @author Nikita Koksharov
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public class RedisURI {
|
||||||
|
|
||||||
|
private final boolean ssl;
|
||||||
|
private final String host;
|
||||||
|
private final int port;
|
||||||
|
|
||||||
|
public RedisURI(String uri) {
|
||||||
|
if (!uri.startsWith("redis://")
|
||||||
|
&& !uri.startsWith("rediss://")) {
|
||||||
|
throw new IllegalArgumentException("Redis url should start with redis:// or rediss:// (for SSL connection)");
|
||||||
|
}
|
||||||
|
|
||||||
|
String urlHost = uri.replaceFirst("redis://", "http://").replaceFirst("rediss://", "http://");
|
||||||
|
String ipV6Host = uri.substring(uri.indexOf("://")+3, uri.lastIndexOf(":"));
|
||||||
|
if (ipV6Host.contains(":")) {
|
||||||
|
urlHost = urlHost.replace(ipV6Host, "[" + ipV6Host + "]");
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
URL url = new URL(urlHost);
|
||||||
|
host = url.getHost();
|
||||||
|
port = url.getPort();
|
||||||
|
ssl = uri.startsWith("rediss://");
|
||||||
|
} catch (MalformedURLException e) {
|
||||||
|
throw new IllegalArgumentException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getScheme() {
|
||||||
|
if (ssl) {
|
||||||
|
return "rediss";
|
||||||
|
}
|
||||||
|
return "redis";
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isSsl() {
|
||||||
|
return ssl;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getHost() {
|
||||||
|
return host;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getPort() {
|
||||||
|
return port;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String trimIpv6Brackets(String host) {
|
||||||
|
if (host.startsWith("[") && host.endsWith("]")) {
|
||||||
|
return host.substring(1, host.length() - 1);
|
||||||
|
}
|
||||||
|
return host;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean compare(InetSocketAddress entryAddr, RedisURI addr) {
|
||||||
|
if (((entryAddr.getHostName() != null && entryAddr.getHostName().equals(trimIpv6Brackets(addr.getHost())))
|
||||||
|
|| entryAddr.getAddress().getHostAddress().equals(trimIpv6Brackets(addr.getHost())))
|
||||||
|
&& entryAddr.getPort() == addr.getPort()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@SuppressWarnings("AvoidInlineConditionals")
|
||||||
|
public int hashCode() {
|
||||||
|
final int prime = 31;
|
||||||
|
int result = 1;
|
||||||
|
result = prime * result + ((host == null) ? 0 : host.hashCode());
|
||||||
|
result = prime * result + port;
|
||||||
|
result = prime * result + (ssl ? 1231 : 1237);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj)
|
||||||
|
return true;
|
||||||
|
if (obj == null)
|
||||||
|
return false;
|
||||||
|
if (getClass() != obj.getClass())
|
||||||
|
return false;
|
||||||
|
RedisURI other = (RedisURI) obj;
|
||||||
|
if (host == null) {
|
||||||
|
if (other.host != null)
|
||||||
|
return false;
|
||||||
|
} else if (!host.equals(other.host))
|
||||||
|
return false;
|
||||||
|
if (port != other.port)
|
||||||
|
return false;
|
||||||
|
if (ssl != other.ssl)
|
||||||
|
return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return getScheme() + "://" + host + ":" + port;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,90 +0,0 @@
|
|||||||
/**
|
|
||||||
* Copyright (c) 2013-2019 Nikita Koksharov
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package org.redisson.misc;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.lang.reflect.Modifier;
|
|
||||||
import java.net.InetSocketAddress;
|
|
||||||
import java.net.URI;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @author Rui Gu (https://github.com/jackygurui)
|
|
||||||
*/
|
|
||||||
public class URIBuilder {
|
|
||||||
|
|
||||||
public static URI create(String uri) {
|
|
||||||
if (!uri.startsWith("redis://")
|
|
||||||
&& !uri.startsWith("rediss://")) {
|
|
||||||
throw new IllegalArgumentException("Redis url should start with redis:// or rediss:// (for SSL connection)");
|
|
||||||
}
|
|
||||||
|
|
||||||
URI u = URI.create(uri);
|
|
||||||
// Let's assuming most of the time it is OK.
|
|
||||||
if (u.getHost() != null) {
|
|
||||||
return u;
|
|
||||||
}
|
|
||||||
String s = uri.substring(0, uri.lastIndexOf(":")).replaceFirst("redis://", "").replaceFirst("rediss://", "");
|
|
||||||
// Assuming this is an IPv6 format, other situations will be handled by
|
|
||||||
// Netty at a later stage.
|
|
||||||
return URI.create(uri.replace(s, "[" + s + "]"));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void patchUriObject() {
|
|
||||||
try {
|
|
||||||
patchUriField(35184372088832L, "L_DASH");
|
|
||||||
patchUriField(2147483648L, "H_DASH");
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new IllegalStateException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void patchUriField(Long maskValue, String fieldName)
|
|
||||||
throws IOException {
|
|
||||||
try {
|
|
||||||
Field field = URI.class.getDeclaredField(fieldName);
|
|
||||||
|
|
||||||
Field modifiers = Field.class.getDeclaredField("modifiers");
|
|
||||||
modifiers.setAccessible(true);
|
|
||||||
modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
|
|
||||||
|
|
||||||
field.setAccessible(true);
|
|
||||||
field.setLong(null, maskValue);
|
|
||||||
} catch (NoSuchFieldException e) {
|
|
||||||
// skip for Android platform
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new IOException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String trimIpv6Brackets(String host) {
|
|
||||||
if (host.startsWith("[") && host.endsWith("]")) {
|
|
||||||
return host.substring(1, host.length() - 1);
|
|
||||||
}
|
|
||||||
return host;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean compare(InetSocketAddress entryAddr, URI addr) {
|
|
||||||
if (((entryAddr.getHostName() != null && entryAddr.getHostName().equals(trimIpv6Brackets(addr.getHost())))
|
|
||||||
|| entryAddr.getAddress().getHostAddress().equals(trimIpv6Brackets(addr.getHost())))
|
|
||||||
&& entryAddr.getPort() == addr.getPort()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue