Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Limit websocket idle timeout to service user connections only (#1582)

Rich Turner045758efee7e
diff --git a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
index 83cd173c7..8bc3c784b 100644
--- a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
+++ b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
@@ -44,6 +44,7 @@ import org.openremote.model.event.Event;
import org.openremote.model.event.RespondableEvent;
import org.openremote.model.event.TriggeredEventSubscription;
import org.openremote.model.event.shared.*;
+import org.openremote.model.security.User;
import org.openremote.model.syslog.SyslogEvent;
import org.openremote.model.util.Pair;
@@ -104,7 +105,7 @@ import static org.openremote.model.Constants.*;
*/
public class ClientEventService extends RouteBuilder implements ContainerService {
public static final int PRIORITY = ManagerWebService.PRIORITY - 200;
- public static final String WEBSOCKET_URI = "undertow://ws://0.0.0.0/websocket/events?fireWebSocketChannelEvents=true&sendTimeout=15000&keepAlive=false"; // Host is not used as existing undertow instance is utilised
+ public static final String WEBSOCKET_URI = "undertow://ws://0.0.0.0/websocket/events?fireWebSocketChannelEvents=true&sendTimeout=15000"; // Host is not used as existing undertow instance is utilised
protected static final System.Logger LOG = System.getLogger(ClientEventService.class.getName());
protected static final String PUBLISH_QUEUE = "direct://ClientPublishQueue";
@@ -194,8 +195,12 @@ public class ClientEventService extends RouteBuilder implements ContainerService
LOG.log(INFO, "Unsupported user principal type: " + principal);
}
- // Set an idle timeout value
- webSocketChannel.setIdleTimeout(30000);
+ // Set an idle timeout value for service account connections; browsers don't reliably support
+ // ping/pong frames so we can't be too aggressive with those connections but other clients
+ // should implement ping/pong
+ if (authContext != null && authContext.getUsername().startsWith(User.SERVICE_ACCOUNT_PREFIX)) {
+ webSocketChannel.setIdleTimeout(30000);
+ }
// Push auth and realm into channel for future use
webSocketChannel.setAttribute(Constants.AUTH_CONTEXT, authContext);