Better validation of HTTP responses

Author: markt-asf

java/org/apache/catalina/ha/backend/LocalStrings.properties

@@ -25,6 +25,7 @@ multiCastSender.multiCastFailed=Unable to use multicast
 multiCastSender.sendFailed=Unable to send multicast message
 
 tcpSender.connectionFailed=Unable to connect to proxy
+tcpSender.duplicateContentLength=The response contained more than one content-length header
 tcpSender.invalidContentLength=Unable to parse content length [{0}]
 tcpSender.invalidHeaderLine=Unable to parse header line [{0}]
 tcpSender.invalidProxyList=Invalid proxy list

java/org/apache/catalina/ha/backend/TcpSender.java

@@ -187,15 +187,24 @@ public int send(String mess) throws Exception {
                 int contentLength = 0;
                 while (header != null && !header.isEmpty()) {
                     int colon = header.indexOf(':');
-                    if (colon >= 0 && header.length() > (colon + 1)) {
+                    if (colon >= 0) {
                         String headerName = header.substring(0, colon).trim();
                         String headerValue = header.substring(colon + 1).trim();
                         if ("content-length".equalsIgnoreCase(headerName)) {
+                            if (contentLength > 0) {
+                                log.error(sm.getString("tcpSender.duplicateContentLength"));
+                                close(i);
+                                // Clear any content length if one has been read.
+                                contentLength = 0;
+                                break;
+                            }
                             try {
                                 contentLength = Integer.parseInt(headerValue);
                             } catch (NumberFormatException e) {
                                 log.error(sm.getString("tcpSender.invalidContentLength", headerValue));
                                 close(i);
+                                // Clear any content length if one has been read.
+                                contentLength = 0;
                                 break;
                             }
                         }