Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Downcast to InetSocketAddress for Jetty 10

Browse Source 
Closes gh-27120
This commit is contained in:
Rossen Stoyanchev
2021-07-12 15:04:14 +01:00
parent a90ed957be
commit 6d01d49b76
1 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java
View File

@@ -19,6 +19,7 @@ package org.springframework.web.socket.adapter.jetty;
import java.io.IOException;
import java.lang.reflect.Method;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.net.URI;
import java.security.Principal;
import java.util.ArrayList;
@@ -143,13 +144,13 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
@Override
public InetSocketAddress getLocalAddress() {
checkNativeSessionInitialized();
return getNativeSession().getLocalAddress();
return this.sessionHelper.getLocalAddress(getNativeSession());
}
@Override
public InetSocketAddress getRemoteAddress() {
checkNativeSessionInitialized();
return getNativeSession().getRemoteAddress();
return this.sessionHelper.getRemoteAddress(getNativeSession());
}
/**
@@ -248,6 +249,11 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
int getTextMessageSizeLimit(Session session);
int getBinaryMessageSizeLimit(Session session);
InetSocketAddress getRemoteAddress(Session session);
InetSocketAddress getLocalAddress(Session session);
}
@@ -275,6 +281,16 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
public int getBinaryMessageSizeLimit(Session session) {
return session.getPolicy().getMaxBinaryMessageSize();
}
@Override
public InetSocketAddress getRemoteAddress(Session session) {
return session.getRemoteAddress();
}
@Override
public InetSocketAddress getLocalAddress(Session session) {
return session.getLocalAddress();
}
}
@@ -284,11 +300,17 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
private static final Method getBinaryMessageSizeLimitMethod;
private static final Method getRemoteAddressMethod;
private static final Method getLocalAddressMethod;
static {
try {
Class<?> type = loader.loadClass("org.eclipse.jetty.websocket.api.WebSocketPolicy");
getTextMessageSizeLimitMethod = type.getMethod("getMaxTextMessageSize");
getBinaryMessageSizeLimitMethod = type.getMethod("getMaxBinaryMessageSize");
getRemoteAddressMethod = type.getMethod("getRemoteAddress");
getLocalAddressMethod = type.getMethod("getLocalAddress");
}
catch (ClassNotFoundException | NoSuchMethodException ex) {
throw new IllegalStateException("No compatible Jetty version found", ex);
@@ -321,6 +343,22 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
Assert.state(result <= Integer.MAX_VALUE, "binaryMessageSizeLimit is larger than Integer.MAX_VALUE");
return (int) result;
}
@Override
@SuppressWarnings("ConstantConditions")
public InetSocketAddress getRemoteAddress(Session session) {
SocketAddress address = (SocketAddress) ReflectionUtils.invokeMethod(getRemoteAddressMethod, session);
Assert.isInstanceOf(InetSocketAddress.class, address);
return (InetSocketAddress) address;
}
@Override
@SuppressWarnings("ConstantConditions")
public InetSocketAddress getLocalAddress(Session session) {
SocketAddress address = (SocketAddress) ReflectionUtils.invokeMethod(getLocalAddressMethod, session);
Assert.isInstanceOf(InetSocketAddress.class, address);
return (InetSocketAddress) address;
}
}
}