From d4d81141d23f706117c9b7306e4bcc5e66eae353 Mon Sep 17 00:00:00 2001
From: Paul Gregoire <mondain@gmail.com>
Date: Tue, 1 Jun 2021 14:25:34 -0700
Subject: [PATCH] Fixed binding to loopback and parsing of incoming client
 socket for validation

---
 pom.xml                                              |  2 +-
 .../java/org/red5/server/service/ShutdownServer.java | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index abc8aea6a..f550dc426 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
         <red5-io.version>${project.parent.version}</red5-io.version>
         <red5-service.version>${project.parent.version}</red5-service.version>
         <red5-server-common.version>${project.parent.version}</red5-server-common.version>
-        <tomcatplugin.version>2.2.8</tomcatplugin.version>
+        <tomcatplugin.version>2.2.9</tomcatplugin.version>
         <cors-filter.version>2.6</cors-filter.version>
     </properties>
     <repositories>
diff --git a/src/main/java/org/red5/server/service/ShutdownServer.java b/src/main/java/org/red5/server/service/ShutdownServer.java
index b34f3336e..50f0d4b20 100644
--- a/src/main/java/org/red5/server/service/ShutdownServer.java
+++ b/src/main/java/org/red5/server/service/ShutdownServer.java
@@ -131,6 +131,7 @@ public void destroy() throws Exception {
      * Starts internal server listening for shutdown requests.
      */
     public void start() {
+        log.info("Shutdown server start");
         // dump to stdout
         System.out.printf("Token: %s%n", token);
         // write out the token to a file so that red5 may be shutdown external to this VM instance.
@@ -147,11 +148,20 @@ public void start() {
             log.warn("Exception handling token file", e);
         }
         final InetAddress loopbackAddr = InetAddress.getLoopbackAddress();
+        // handle format of localhost/127.0.0.1
+        final String localAddr = loopbackAddr.getHostAddress();
+        int pos = localAddr.indexOf('/');
+        final String localIPAddr = pos >= 0 ? localAddr.substring(pos) : localAddr;
+        log.info("Starting socket server on {}:{}", localIPAddr, port);
         while (!shutdown.get()) {
             // server socket on loopback address (127.0.0.1) with given port and a backlog of 8
             try (ServerSocket serverSocket = new ServerSocket(port, 8, loopbackAddr); Socket clientSocket = serverSocket.accept(); PrintWriter out = new PrintWriter(clientSocket.getOutputStream(), true); BufferedReader in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));) {
                 log.info("Connected - local: {} remote: {}", clientSocket.getLocalSocketAddress(), clientSocket.getRemoteSocketAddress());
-                if (clientSocket.getRemoteSocketAddress().toString().startsWith(loopbackAddr.toString())) {                    
+                String remoteAddr = clientSocket.getRemoteSocketAddress().toString();
+                // handle SocketAddress format of /127.0.0.1:9999
+                String remoteIPAddr = remoteAddr.substring(1, remoteAddr.indexOf(':'));
+                log.info("IP addresses - local: {} remote: {}", localIPAddr, remoteIPAddr);
+                if (localIPAddr.equals(remoteIPAddr)) {
                     String inputLine = in.readLine();
                     if (inputLine != null && token.equals(inputLine)) {
                         log.info("Shutdown request validated using token");