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

Fix ExecutionRequestsDataCodec handling of missing request data #8880

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Fix ExecutionRequestsDataCodec handling of missing request data #8880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions ...gasys/teku/spec/datastructures/execution/versions/electra/ExecutionRequestsDataCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,18 @@ public ExecutionRequests decode(final List<Bytes> executionRequests) {
if (request.isEmpty()) {
throw new IllegalArgumentException("Execution request data must not be empty");
}

final byte requestType = request.get(0);
if (requestType <= previousRequestType) {
throw new IllegalArgumentException(
"Execution requests are not in strictly ascending order");
}

final Bytes requestData = request.slice(1);
if (requestData.isEmpty()) {
throw new IllegalArgumentException("Empty data for request type " + requestType);
}

switch (requestType) {
case DepositRequest.REQUEST_TYPE ->
executionRequestsBuilder.deposits(
Expand Down
29 changes: 27 additions & 2 deletions ...s/teku/spec/datastructures/execution/versions/electra/ExecutionRequestsDataCodecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,14 @@ public void decodeExecutionRequestsDataWithOneRequestMissing() {

@Test
public void decodeExecutionRequestsDataWithInvalidRequestType() {
final Bytes invalidRequestType = Bytes.of(9);
final Bytes invalidTypeEncodedList = Bytes.concatenate(invalidRequestType, Bytes.random(10));
final List<Bytes> invalidExecutionRequestsData =
List.of(depositRequestListEncoded, withdrawalRequestsListEncoded, Bytes.of(9));
List.of(depositRequestListEncoded, withdrawalRequestsListEncoded, invalidTypeEncodedList);

assertThatThrownBy(() -> codec.decode(invalidExecutionRequestsData))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("Invalid execution request type: 9");
.hasMessage("Invalid execution request type: " + invalidRequestType.toInt());
}

@Test
Expand Down Expand Up @@ -126,6 +128,29 @@ public void decodeExecutionRequestDataWithRepeatedRequestsOfSameType() {
.hasMessage("Execution requests are not in strictly ascending order");
}

@Test
public void decodeExecutionRequestsDataWithEmptyRequestData() {
// Element containing only the type by but no data
final List<Bytes> invalidEmptyRequestsData = List.of(DepositRequest.REQUEST_TYPE_PREFIX);

assertThatThrownBy(() -> codec.decode(invalidEmptyRequestsData))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("Empty data for request type 0");
}

@Test
public void decodeExecutionRequestsDataWithOneInvalidEmptyRequestData() {
final List<Bytes> invalidExecutionRequestsData =
List.of(
depositRequestListEncoded,
withdrawalRequestsListEncoded,
ConsolidationRequest.REQUEST_TYPE_PREFIX);

assertThatThrownBy(() -> codec.decode(invalidExecutionRequestsData))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("Empty data for request type 2");
}

@Test
public void encodeExecutionRequests() {
final ExecutionRequests executionRequests =
Expand Down
Loading