From e0446b884c00cbe6204e2d3f589f3f9dbf96eb1d Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:27:56 +0000
Subject: [PATCH 1/3] FISH-8459: Update SSLConfigurator for Grizzly 4.0.2

---
 .../org/glassfish/grizzly/config/SSLConfigurator.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java
index b606c0ac44c..59072f16faa 100644
--- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java
+++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java
@@ -139,8 +139,8 @@ public SSLImplementation get() {
         }
 
         sslImplementation = sslImplementationLocal;
-        needClientAuth = isNeedClientAuth(ssl);
-        wantClientAuth = isWantClientAuth(ssl);
+        this.setNeedClientAuth(isNeedClientAuth(ssl));
+        this.setWantClientAuth(isWantClientAuth(ssl));
         clientMode = false;
         sslContextConfiguration = new InternalSSLContextConfigurator();
     }
@@ -187,7 +187,7 @@ protected SSLContext configureSSL() {
                 } else {
                     final String[] protocols = new String[tmpSSLArtifactsList.size()];
                     tmpSSLArtifactsList.toArray(protocols);
-                    enabledProtocols = protocols;
+                    this.setEnabledProtocols(protocols);
                 }
 //                String auth = ssl.getClientAuth();
 //                if (auth != null) {
@@ -211,14 +211,14 @@ protected SSLContext configureSSL() {
                     logEmptyWarning(ssl, "WEB0308: All SSL cipher suites disabled for network-listener(s) {0}."
                             + "  Using SSL implementation specific defaults");
                 } else {
-                    enabledCipherSuites = ciphers;
+                    this.setEnabledCipherSuites(ciphers);
                 }
             }
             
             if (LOGGER.isLoggable(Level.FINE)) {
                 LOGGER.log(Level.FINE, "Enabled secure protocols={0}"
                         + "" + " ciphers={1}", new Object[]
-                        {Arrays.toString(enabledProtocols), Arrays.toString(enabledCipherSuites)});
+                        {Arrays.toString(this.getEnabledProtocols()), Arrays.toString(this.getEnabledCipherSuites())});
             }
             
             return newSslContext;

From 9492638b20000ea4ebe734a73e47f07fc83dc5a6 Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:28:17 +0000
Subject: [PATCH 2/3] FISH-8459: Update Grizzly to 4.0.2.payara-p1.

---
 core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index 8254549e33d..15715e8035f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -66,7 +66,7 @@
         <osgi.dto.version>1.1.1</osgi.dto.version>
         <jakarta.security.enterprise.version>3.0.3.payara-p1</jakarta.security.enterprise.version>
         <cdi-api.version>4.0.1</cdi-api.version>
-        <grizzly.version>4.0.0.payara-p2</grizzly.version>
+        <grizzly.version>4.0.2.payara-p1</grizzly.version>
         <servlet-api.version>6.0.0</servlet-api.version>
         <jakarta.el-api.version>5.0.1</jakarta.el-api.version>
         <expressly.version>5.0.0</expressly.version>

From 96775a5460c8472fd56a5d39c68e3799bebd4353 Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Mon, 10 Feb 2025 12:07:18 +0000
Subject: [PATCH 3/3] Implement feedback

Co-authored-by: Andrew Pielage <pandrex247@hotmail.com>
---
 .../org/glassfish/grizzly/config/SSLConfigurator.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java
index 59072f16faa..5ac52d14487 100644
--- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java
+++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java
@@ -139,8 +139,8 @@ public SSLImplementation get() {
         }
 
         sslImplementation = sslImplementationLocal;
-        this.setNeedClientAuth(isNeedClientAuth(ssl));
-        this.setWantClientAuth(isWantClientAuth(ssl));
+        setNeedClientAuth(isNeedClientAuth(ssl));
+        setWantClientAuth(isWantClientAuth(ssl));
         clientMode = false;
         sslContextConfiguration = new InternalSSLContextConfigurator();
     }
@@ -187,7 +187,7 @@ protected SSLContext configureSSL() {
                 } else {
                     final String[] protocols = new String[tmpSSLArtifactsList.size()];
                     tmpSSLArtifactsList.toArray(protocols);
-                    this.setEnabledProtocols(protocols);
+                    setEnabledProtocols(protocols);
                 }
 //                String auth = ssl.getClientAuth();
 //                if (auth != null) {
@@ -211,14 +211,14 @@ protected SSLContext configureSSL() {
                     logEmptyWarning(ssl, "WEB0308: All SSL cipher suites disabled for network-listener(s) {0}."
                             + "  Using SSL implementation specific defaults");
                 } else {
-                    this.setEnabledCipherSuites(ciphers);
+                    setEnabledCipherSuites(ciphers);
                 }
             }
             
             if (LOGGER.isLoggable(Level.FINE)) {
                 LOGGER.log(Level.FINE, "Enabled secure protocols={0}"
                         + "" + " ciphers={1}", new Object[]
-                        {Arrays.toString(this.getEnabledProtocols()), Arrays.toString(this.getEnabledCipherSuites())});
+                        {Arrays.toString(getEnabledProtocols()), Arrays.toString(getEnabledCipherSuites())});
             }
             
             return newSslContext;