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

Jump to bottom

Fix broken client tls negotiation #11999

Merged
merged 8 commits into from
Jul 10, 2024
Merged

Fix broken client tls negotiation #11999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e452452
#11965 use writable empty buffer in fill() to avoid ReadOnlyBufferExc…
lorban Jul 3, 2024
16b64b3
#11965 introduce EMPTY_WRITABLE_BUFFER constant and use it everywhere…
lorban Jul 3, 2024
cf7feb4
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12.…
lorban Jul 4, 2024
c3b7db2
#11965 make EMPTY_BUFFER not read-only anymore
lorban Jul 4, 2024
e48e8f4
#11965 make chunk buffers read-only
lorban Jul 4, 2024
519d7eb
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12.…
lorban Jul 8, 2024
6fca73c
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12.…
lorban Jul 9, 2024
528b13b
handle review comments
lorban Jul 9, 2024
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 jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/Content.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,7 @@ default int skip(int length)
*/
default Chunk asReadOnly()
{
if (getByteBuffer().isReadOnly())
if (!getByteBuffer().hasRemaining() || getByteBuffer().isReadOnly())
return this;
if (canRetain())
return asChunk(getByteBuffer().asReadOnlyBuffer(), isLast(), this);
Expand Down
3 changes: 1 addition & 2 deletions ...uic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicStreamEndPoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public class QuicStreamEndPoint extends AbstractEndPoint
{
private static final Logger LOG = LoggerFactory.getLogger(QuicStreamEndPoint.class);
private static final ByteBuffer LAST_FLAG = ByteBuffer.allocate(0);
private static final ByteBuffer EMPTY_WRITABLE_BUFFER = ByteBuffer.allocate(0);

private final QuicSession session;
private final long streamId;
Expand Down Expand Up @@ -272,7 +271,7 @@ public boolean onReadable()
// Check if the stream was finished normally.
try
{
fill(EMPTY_WRITABLE_BUFFER);
fill(BufferUtil.EMPTY_BUFFER);
}
catch (EOFException x)
{
Expand Down
5 changes: 2 additions & 3 deletions ...core/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,20 @@
package org.eclipse.jetty.server;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.List;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult;

import org.eclipse.jetty.io.AbstractConnection;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.util.BufferUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public abstract class NegotiatingServerConnection extends AbstractConnection
{
private static final Logger LOG = LoggerFactory.getLogger(NegotiatingServerConnection.class);
private static final ByteBuffer EMPTY_WRITABLE_BUFFER = ByteBuffer.allocate(0);

public interface CipherDiscriminator
{
Expand Down Expand Up @@ -145,7 +144,7 @@ private int fill()
{
try
{
return getEndPoint().fill(EMPTY_WRITABLE_BUFFER);
return getEndPoint().fill(BufferUtil.EMPTY_BUFFER);
}
catch (IOException x)
{
Expand Down
2 changes: 1 addition & 1 deletion jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public class BufferUtil
};

public static final byte[] EMPTY_BYTES = new byte[0];
public static final ByteBuffer EMPTY_BUFFER = ByteBuffer.wrap(EMPTY_BYTES).asReadOnlyBuffer();
public static final ByteBuffer EMPTY_BUFFER = ByteBuffer.wrap(EMPTY_BYTES);

/**
* Allocate ByteBuffer in flush mode.
Expand Down
Loading