Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #11403 - Expose SslEndPoint in SslHandshakeListener 

Now also exposing the `EndPoint` in SslHandshakeListener.Event.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2024-02-14 12:09:06 +01:00
parent 55e3072247
commit 0e79997965
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
View File

@ -1481,7 +1481,7 @@ public class SslConnection extends AbstractConnection implements Connection.Upgr
for (SslHandshakeListener listener : handshakeListeners)
{
if (event == null)
event = new SslHandshakeListener.Event(sslEngine);
event = new SslHandshakeListener.Event(sslEngine, this);
try
{
listener.handshakeSucceeded(event);
@ -1503,7 +1503,7 @@ public class SslConnection extends AbstractConnection implements Connection.Upgr
for (SslHandshakeListener listener : handshakeListeners)
{
if (event == null)
event = new SslHandshakeListener.Event(sslEngine);
event = new SslHandshakeListener.Event(sslEngine, this);
try
{
listener.handshakeFailed(event, failure);

29
jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslHandshakeListener.java
View File

@ -18,6 +18,8 @@ import java.util.EventObject;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLException;
import org.eclipse.jetty.io.EndPoint;
/**
* <p>Implementations of this interface are notified of TLS handshake events.</p>
* <p>Similar to {@link javax.net.ssl.HandshakeCompletedListener}, but for {@link SSLEngine}.</p>
@ -49,11 +51,26 @@ public interface SslHandshakeListener extends EventListener
/**
* <p>The event object carrying information about TLS handshake events.</p>
*/
public static class Event extends EventObject
class Event extends EventObject
{
private final EndPoint endPoint;
/**
* <p>Creates a new instance with the given event source.</p>
*
* @param source the source of this event.
* @deprecated instances of this class can only be created by the implementation
*/
@Deprecated(forRemoval = true, since = "12.0.7")
public Event(Object source)
{
super(source);
this(source, null);
}
Event(Object sslEngine, EndPoint endPoint)
{
super(sslEngine);
this.endPoint = endPoint;
}
/**
@ -63,5 +80,13 @@ public interface SslHandshakeListener extends EventListener
{
return (SSLEngine)getSource();
}
/**
* @return the EndPoint associated to the TLS handshake event
*/
public EndPoint getEndPoint()
{
return endPoint;
}
}
}