Merge pull request #20 from MattGill98/CUSTCOM-83-2.4.3

CUSTCOM-83 Infinite Loop Causing CPU Hogging 2.4.3
payara · Dec 16, 2019 · 35a3953 · 35a3953
2 parents 0890e4c + 548746f
commit 35a3953
Show file tree

Hide file tree

Showing 43 changed files with 93 additions and 85 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -31,7 +31,7 @@
     <artifactId>grizzly-bom</artifactId>
     <packaging>pom</packaging>
     <name>grizzly-bom</name>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
 
     <description>Grizzly Bill of Materials (BOM)</description>
 

diff --git a/extras/bundles/grizzly-httpservice-bundle/pom.xml b/extras/bundles/grizzly-httpservice-bundle/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <name>Grizzly OSGi HttpService Bundle</name>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <groupId>org.glassfish.grizzly.osgi</groupId>
     <artifactId>grizzly-httpservice-bundle</artifactId>
     <build>

diff --git a/extras/bundles/pom.xml b/extras/bundles/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-extra-bundles</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-extra-bundles</name>
 
     <modules>

diff --git a/extras/connection-pool/pom.xml b/extras/connection-pool/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>connection-pool</artifactId>
     <packaging>bundle</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>connection-pool</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/extras/grizzly-httpservice/pom.xml b/extras/grizzly-httpservice/pom.xml
@@ -20,14 +20,14 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <name>Grizzly OSGi HttpService</name>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <groupId>org.glassfish.grizzly.osgi</groupId>
     <artifactId>grizzly-httpservice</artifactId>
     <dependencies>

diff --git a/extras/http-server-jaxws/pom.xml b/extras/http-server-jaxws/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-server-jaxws</artifactId>
     <packaging>bundle</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-http-server-jaxws</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/extras/http-server-multipart/pom.xml b/extras/http-server-multipart/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-server-multipart</artifactId>
     <packaging>bundle</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-http-server-multipart</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/extras/http-servlet-extras/pom.xml b/extras/http-servlet-extras/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-servlet-extras</artifactId>
     <packaging>bundle</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-http-servlet-extras</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/extras/pom.xml b/extras/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-extras</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-extras</name>
     <profiles>
         <profile>

diff --git a/extras/tls-sni/pom.xml b/extras/tls-sni/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tls-sni</artifactId>
     <packaging>bundle</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>tls-sni</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/bundles/comet/pom.xml b/modules/bundles/comet/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-comet-server</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-comet-server</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/bundles/core/pom.xml b/modules/bundles/core/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-core</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-core</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/bundles/http-all/pom.xml b/modules/bundles/http-all/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-all</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-all</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/bundles/http-servlet/pom.xml b/modules/bundles/http-servlet/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-servlet-server</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-http-servlet-server</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/bundles/http/pom.xml b/modules/bundles/http/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-server-core</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-http-server-core</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/bundles/pom.xml b/modules/bundles/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-bundles</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-bundles</name>
 
     <modules>

diff --git a/modules/bundles/websockets/pom.xml b/modules/bundles/websockets/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-websockets-server</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-websockets-server</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/comet/pom.xml b/modules/comet/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-comet</artifactId>
     <packaging>bundle</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-comet</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/grizzly/pom.xml b/modules/grizzly/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-framework</artifactId>
     <packaging>bundle</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-framework</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLBaseFilter.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLBaseFilter.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019 Oracle and/or its affiliates and others.
+ * All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -12,6 +13,9 @@
  * https://www.gnu.org/software/classpath/license.html.
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ * 
+ * Contributors:
+ *   Payara Services - Propagate stop action on a closed SSL connection
  */
 
 package org.glassfish.grizzly.ssl;
@@ -441,7 +445,11 @@ protected NextAction unwrapAll(final FilterChainContext ctx,
 
             if (output.hasRemaining() || isClosed) {
                 ctx.setMessage(output);
-                return ctx.getInvokeAction(makeInputRemainder(sslCtx, ctx, input));
+                if (!isClosed) {
+                    return ctx.getInvokeAction(makeInputRemainder(sslCtx, ctx, input));
+                } else {
+                    LOGGER.finer("Closed SSL connection detected, terminating chain.");
+                }
             }
         }
 

diff --git a/modules/http-ajp/pom.xml b/modules/http-ajp/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-ajp</artifactId>
     <packaging>bundle</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-http-ajp</name>
     <url>https://projects.eclipse.org/projects/ee4j.grizzly</url>
     <build>

diff --git a/modules/http-server/pom.xml b/modules/http-server/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-server</artifactId>
     <packaging>bundle</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-http-server</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/http-servlet/pom.xml b/modules/http-servlet/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-servlet</artifactId>
     <packaging>bundle</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-http-servlet</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/http/pom.xml b/modules/http/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.4.3.payara-p9</version>
+        <version>2.4.3.payara-p10</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http</artifactId>
     <packaging>bundle</packaging>
-    <version>2.4.3.payara-p9</version>
+    <version>2.4.3.payara-p10</version>
     <name>grizzly-http</name>
     <build>
         <defaultGoal>install</defaultGoal>