Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CUSTCOM-83 Infinite Loop Causing CPU Hogging 2.3.31 #19

Merged
merged 2 commits into from
Dec 16, 2019
Merged

CUSTCOM-83 Infinite Loop Causing CPU Hogging 2.3.31 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3f386e
Abort filter chain if SSL connection closed
MattGill98 Dec 13, 2019
fcb2067
Update version number to 2.3.31.payara-p4
MattGill98 Dec 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<artifactId>grizzly-bom</artifactId>
<packaging>pom</packaging>
<name>grizzly-bom</name>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>

<description>Grizzly Bill of Materials (BOM)</description>

Expand Down
4 changes: 2 additions & 2 deletions extras/bundles/grizzly-httpservice-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<name>Grizzly OSGi HttpService Bundle</name>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<groupId>org.glassfish.grizzly.osgi</groupId>
<artifactId>grizzly-httpservice-bundle</artifactId>
<build>
Expand Down
4 changes: 2 additions & 2 deletions extras/bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-extra-bundles</artifactId>
<packaging>pom</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-extra-bundles</name>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions extras/connection-pool/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connection-pool</artifactId>
<packaging>bundle</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>connection-pool</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions extras/grizzly-httpservice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<name>Grizzly OSGi HttpService</name>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<groupId>org.glassfish.grizzly.osgi</groupId>
<artifactId>grizzly-httpservice</artifactId>
<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions extras/http-server-jaxws/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-server-jaxws</artifactId>
<packaging>bundle</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-http-server-jaxws</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions extras/http-server-multipart/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-server-multipart</artifactId>
<packaging>bundle</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-http-server-multipart</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions extras/http-servlet-extras/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-servlet-extras</artifactId>
<packaging>bundle</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-http-servlet-extras</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions extras/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-extras</artifactId>
<packaging>pom</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-extras</name>
<profiles>
<profile>
Expand Down
4 changes: 2 additions & 2 deletions extras/tls-sni/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tls-sni</artifactId>
<packaging>bundle</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>tls-sni</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/comet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-comet-server</artifactId>
<packaging>jar</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-comet-server</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-core</artifactId>
<packaging>jar</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-core</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/http-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-all</artifactId>
<packaging>jar</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-all</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/http-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-servlet-server</artifactId>
<packaging>jar</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-http-servlet-server</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-server-core</artifactId>
<packaging>jar</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-http-server-core</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-bundles</artifactId>
<packaging>pom</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-bundles</name>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/websockets/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-websockets-server</artifactId>
<packaging>jar</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-websockets-server</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/comet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-comet</artifactId>
<packaging>bundle</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-comet</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/grizzly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-framework</artifactId>
<packaging>bundle</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-framework</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
12 changes: 10 additions & 2 deletions modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLBaseFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012-2019 Oracle and/or its affiliates and others.
* All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
Expand Down Expand Up @@ -36,6 +37,9 @@
* and therefore, elected the GPL Version 2 license, then the option applies
* only if the new code is made subject to such option by the copyright
* holder.
*
* Contributors:
* Payara Services - Propagate stop action on a closed SSL connection
*/

package org.glassfish.grizzly.ssl;
Expand Down Expand Up @@ -466,7 +470,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.");
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/http-ajp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-ajp</artifactId>
<packaging>bundle</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-http-ajp</name>
<url>http://grizzly.java.net</url>
<build>
Expand Down
4 changes: 2 additions & 2 deletions modules/http-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-server</artifactId>
<packaging>bundle</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-http-server</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/http-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http-servlet</artifactId>
<packaging>bundle</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-http-servlet</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
4 changes: 2 additions & 2 deletions modules/http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grizzly-http</artifactId>
<packaging>bundle</packaging>
<version>2.3.31</version>
<version>2.3.31.payara-p4</version>
<name>grizzly-http</name>
<build>
<defaultGoal>install</defaultGoal>
Expand Down
Loading