Bumped version to 1.2.20; includes fixes for RTMP/E

Red5 · Apr 11, 2022 · 3ec498b · 3ec498b
1 parent edb5459
commit 3ec498b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.2.19</version>
+        <version>1.2.20</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server</artifactId>

diff --git a/src/main/java/org/red5/server/net/rtmpe/RTMPEIoFilter.java b/src/main/java/org/red5/server/net/rtmpe/RTMPEIoFilter.java
@@ -119,29 +119,35 @@ public void messageReceived(NextFilter nextFilter, IoSession session, Object obj
                             log.warn("Client was rejected due to invalid handshake");
                             conn.close();
                         }
+                    } else {
+                        // don't fall through to connected process if we didn't have enough for the handshake
+                        break;
                     }
                     // allow fall-through
                 case RTMP.STATE_CONNECTED:
-                    IoBuffer message = buffer.getBufferAsIoBuffer();
-                    // assuming majority of connections will not be encrypted
-                    if (!((RTMPConnection) conn).isEncrypted()) {
-                        log.trace("Receiving message: {}", message);
-                        nextFilter.messageReceived(session, message);
-                    } else {
-                        Cipher cipher = (Cipher) session.getAttribute(RTMPConnection.RTMPE_CIPHER_IN);
-                        if (cipher != null) {
-                            if (log.isDebugEnabled()) {
-                                log.debug("Decrypting message: {}", message);
-                            }
-                            byte[] encrypted = new byte[message.remaining()];
-                            message.get(encrypted);
-                            message.free();
-                            byte[] plain = cipher.update(encrypted);
-                            IoBuffer messageDecrypted = IoBuffer.wrap(plain);
-                            if (log.isDebugEnabled()) {
-                                log.debug("Receiving decrypted message: {}", messageDecrypted);
+                    // skip empty buffer
+                    if (buffer.getBufferSize() > 0) {
+                        IoBuffer message = buffer.getBufferAsIoBuffer();
+                        // assuming majority of connections will not be encrypted
+                        if (!((RTMPConnection) conn).isEncrypted()) {
+                            log.trace("Receiving message: {}", message);
+                            nextFilter.messageReceived(session, message);
+                        } else {
+                            Cipher cipher = (Cipher) session.getAttribute(RTMPConnection.RTMPE_CIPHER_IN);
+                            if (cipher != null) {
+                                if (log.isDebugEnabled()) {
+                                    log.debug("Decrypting message: {}", message);
+                                }
+                                byte[] encrypted = new byte[message.remaining()];
+                                message.get(encrypted);
+                                message.free();
+                                byte[] plain = cipher.update(encrypted);
+                                IoBuffer messageDecrypted = IoBuffer.wrap(plain);
+                                if (log.isDebugEnabled()) {
+                                    log.debug("Receiving decrypted message: {}", messageDecrypted);
+                                }
+                                nextFilter.messageReceived(session, messageDecrypted);
                             }
-                            nextFilter.messageReceived(session, messageDecrypted);
                         }
                     }
                     break;