Merged branch 'jetty-12.0.x' into 'jetty-12.1.x'.

Signed-off-by: Simone Bordet <[email protected]>
jetty · Sep 20, 2024 · 838b97d · 838b97d
2 parents acb30ab + 9c34263
commit 838b97d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 24 deletions.
diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
@@ -401,8 +401,8 @@ default boolean isSecure()
     interface SslSessionData
     {
         /**
-         * The name at which an {@code SslSessionData} instance may be found as a request
-         * {@link org.eclipse.jetty.util.Attributes Attribute} or from {@link SSLSession#getValue(String)}.
+         * The name at which an {@code SslSessionData} instance may be found
+         * as a request {@link org.eclipse.jetty.util.Attributes attribute}.
          */
         String ATTRIBUTE = "org.eclipse.jetty.io.Endpoint.SslSessionData";
 

diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
@@ -507,6 +507,7 @@ public class SslEndPoint extends AbstractEndPoint implements EndPoint.Wrapper
 
         private final Callback _incompleteWriteCallback = new IncompleteWriteCallback();
         private Throwable _failure;
+        private SslSessionData _sslSessionData;
 
         public SslEndPoint()
         {
@@ -1572,6 +1573,28 @@ private Throwable handleException(Throwable x, String context)
             }
         }
 
+        @Override
+        public SslSessionData getSslSessionData()
+        {
+            SSLSession sslSession = _sslEngine.getSession();
+            SslSessionData sslSessionData = _sslSessionData;
+            if (sslSessionData == null)
+            {
+                String cipherSuite = sslSession.getCipherSuite();
+
+                X509Certificate[] peerCertificates = _sslContextFactory != null
+                    ? _sslContextFactory.getX509CertChain(sslSession)
+                    : SslContextFactory.getCertChain(sslSession);
+
+                byte[] bytes = sslSession.getId();
+                String idStr = StringUtil.toHexString(bytes);
+
+                sslSessionData = SslSessionData.from(sslSession, idStr, cipherSuite, peerCertificates);
+                _sslSessionData = sslSessionData;
+            }
+            return sslSessionData;
+        }
+
         @Override
         public String toString()
         {
@@ -1644,28 +1667,6 @@ public String toString()
                 return String.format("SSL@%h.DEP.writeCallback", SslConnection.this);
             }
         }
-
-        @Override
-        public SslSessionData getSslSessionData()
-        {
-            SSLSession sslSession = _sslEngine.getSession();
-            SslSessionData sslSessionData = (SslSessionData)sslSession.getValue(SslSessionData.ATTRIBUTE);
-            if (sslSessionData == null)
-            {
-                String cipherSuite = sslSession.getCipherSuite();
-
-                X509Certificate[] peerCertificates = _sslContextFactory != null
-                    ? _sslContextFactory.getX509CertChain(sslSession)
-                    : SslContextFactory.getCertChain(sslSession);
-
-                byte[] bytes = sslSession.getId();
-                String idStr = StringUtil.toHexString(bytes);
-
-                sslSessionData = SslSessionData.from(sslSession, idStr, cipherSuite, peerCertificates);
-                sslSession.putValue(SslSessionData.ATTRIBUTE, sslSessionData);
-            }
-            return sslSessionData;
-        }
     }
 
     private abstract class RunnableTask implements Invocable.Task