Merge pull request #430 from Red5/bug/ws

Bug/ws

Author: mondain

client/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.26</version>
+        <version>2.0.27</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-client</artifactId>

client/src/main/java/org/red5/client/Red5Client.java

@@ -18,7 +18,7 @@ public final class Red5Client {
     /**
      * Current server version with revision
      */
-    public static final String VERSION = "Red5 Client 2.0.26";
+    public static final String VERSION = "Red5 Client 2.0.27";
 
     /**
      * Create a new Red5Client object using the connection local to the current thread A bit of magic that lets you access the red5 scope

common/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.26</version>
+        <version>2.0.27</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server-common</artifactId>

common/src/main/java/org/red5/server/api/Red5.java

@@ -57,12 +57,12 @@ public final class Red5 {
     /**
      * Server version with revision
      */
-    public static final String VERSION = "Red5 Server 2.0.26";
+    public static final String VERSION = "Red5 Server 2.0.27";
 
     /**
      * Server version for fmsVer requests
      */
-    public static final String FMS_VERSION = "RED5/2,0,26,0";
+    public static final String FMS_VERSION = "RED5/2,0,27,0";
 
     /**
      * Server capabilities

io/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.26</version>
+        <version>2.0.27</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-io</artifactId>

pom.xml

@@ -24,7 +24,7 @@
     <name>Red5</name>
     <description>The Red5 server</description>
     <groupId>org.red5</groupId>
-    <version>2.0.26</version>
+    <version>2.0.27</version>
     <url>https://github.com/Red5/red5-server</url>
     <inceptionYear>2005</inceptionYear>
     <organization>

server/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.26</version>
+        <version>2.0.27</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server</artifactId>

server/src/main/java/org/red5/net/websocket/WebSocketPlugin.java

@@ -312,10 +312,13 @@ public void setApplication(MultiThreadedApplicationAdapter application) {
         log.info("WebSocketPlugin application: {}", application);
         // get the app scope
         final IScope appScope = application.getScope();
-        // put if not already there
-        managerMap.putIfAbsent(appScope, new WebSocketScopeManager());
-        // add the app scope to the manager
-        managerMap.get(appScope).setApplication(appScope);
+        // atomically create and initialize manager to prevent race condition
+        // where getManager() could return a manager before setApplication() is called
+        managerMap.computeIfAbsent(appScope, scope -> {
+            WebSocketScopeManager manager = new WebSocketScopeManager();
+            manager.setApplication(scope);
+            return manager;
+        });
         super.setApplication(application);
     }
 

server/src/main/java/org/red5/net/websocket/WebSocketScopeManager.java

@@ -333,6 +333,10 @@ public void makeScope(String path) {
      */
     public void makeScope(IScope scope) {
         log.debug("makeScope: {}", scope);
+        if (scope == null) {
+            log.warn("Cannot create WebSocket scope for null IScope");
+            return;
+        }
         String path = scope.getContextPath();
         if (!scopes.containsKey(path)) {
             // add the name to the collection (no '/' prefix)
@@ -358,6 +362,10 @@ public void makeScope(IScope scope) {
      */
     public WebSocketScope getScope(String path) {
         log.debug("getScope: {}", path);
+        // normalize path by removing trailing slashes (e.g., "/live/" -> "/live")
+        while (path != null && path.length() > 1 && path.endsWith("/")) {
+            path = path.substring(0, path.length() - 1);
+        }
         WebSocketScope scope = scopes.get(path);
         // if we dont find a scope, go for default
         if (scope == null) {
@@ -453,6 +461,15 @@ public boolean setApplication(IScope appScope) {
         return activeRooms.add(appScope.getName());
     }
 
+    /**
+     * Returns the application scope for this manager.
+     *
+     * @return the application scope or null if not set
+     */
+    public IScope getApplication() {
+        return appScope;
+    }
+
     /**
      * <p>Setter for the field <code>copyListeners</code>.</p>
      *

server/src/main/java/org/red5/net/websocket/server/DefaultServerEndpointConfigurator.java

@@ -144,6 +144,11 @@ public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request,
         if (idx != -1) {
             path = path.substring(0, idx);
         }
+        // normalize path by removing trailing slashes (e.g., "/live/" -> "/live")
+        while (path.length() > 1 && path.endsWith("/")) {
+            path = path.substring(0, path.length() - 1);
+        }
+        log.debug("Normalized path: {}", path);
         // get the manager
         WebSocketPlugin plugin = (WebSocketPlugin) PluginRegistry.getPlugin(WebSocketPlugin.NAME);
         WebSocketScopeManager manager = plugin.getManager(path);
@@ -156,8 +161,12 @@ public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request,
             if (scope == null) {
                 // split up the path into usable scope names
                 String[] paths = path.split("\\/");
-                // parent scope
-                IScope appScope = Optional.ofNullable(applicationScope).orElse(plugin.getApplicationScope(path));
+                // parent scope - prefer manager's app scope over separate lookup
+                IScope appScope = Optional.ofNullable(applicationScope).orElse(manager.getApplication());
+                if (appScope == null) {
+                    // fallback to plugin lookup
+                    appScope = plugin.getApplicationScope(path);
+                }
                 IScope parentScope = appScope;
                 // room scope
                 IScope roomScope = null;
@@ -177,23 +186,37 @@ public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request,
                         parentScope = roomScope;
                     }
                 }
-                // create and add the websocket scope for the new room scope
-                manager.makeScope(roomScope);
-                // get the new ws scope
-                scope = manager.getScope(path);
-                // copy the listeners from the app websocket scope
-                Set<IWebSocketDataListener> listeners = ((WebSocketScope) appScope.getAttribute(WSConstants.WS_SCOPE)).getListeners();
-                for (IWebSocketDataListener listener : listeners) {
-                    log.debug("Adding listener: {}", listener);
-                    scope.addListener(listener);
+                // create and add the websocket scope for the room or app scope
+                IScope scopeToUse = roomScope != null ? roomScope : appScope;
+                if (scopeToUse != null) {
+                    manager.makeScope(scopeToUse);
+                    // get the new ws scope
+                    scope = manager.getScope(path);
+                    // copy the listeners from the app websocket scope if available
+                    if (appScope != null && appScope.hasAttribute(WSConstants.WS_SCOPE)) {
+                        WebSocketScope appWsScope = (WebSocketScope) appScope.getAttribute(WSConstants.WS_SCOPE);
+                        if (appWsScope != null && scope != null) {
+                            Set<IWebSocketDataListener> listeners = appWsScope.getListeners();
+                            for (IWebSocketDataListener listener : listeners) {
+                                log.debug("Adding listener: {}", listener);
+                                scope.addListener(listener);
+                            }
+                        }
+                    }
+                } else {
+                    log.warn("Cannot create websocket scope - no valid scope available for path: {}", path);
                 }
             }
-            // add the websocket scope to the user props
-            sec.getUserProperties().put(WSConstants.WS_SCOPE, scope);
-            // run through any modifiers
-            handshakeModifiers.forEach(modifier -> {
-                modifier.modifyHandshake(request, response);
-            });
+            // add the websocket scope to the user props if available
+            if (scope != null) {
+                sec.getUserProperties().put(WSConstants.WS_SCOPE, scope);
+                // run through any modifiers
+                handshakeModifiers.forEach(modifier -> {
+                    modifier.modifyHandshake(request, response);
+                });
+            } else {
+                log.warn("WebSocket scope is null for path: {} - handshake may fail", path);
+            }
         } else {
             log.warn("No websocket manager found for path: {} requested uri: {}", path, request.getRequestURI().toString());
         }