Fix ExecutionRequestsDataCodec handling of missing request data

Consensys · Dec 3, 2024 · 31397fa · 31397fa
1 parent c0263ca
commit 31397fa
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/...gasys/teku/spec/datastructures/execution/versions/electra/ExecutionRequestsDataCodec.java b/...gasys/teku/spec/datastructures/execution/versions/electra/ExecutionRequestsDataCodec.java
@@ -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(

diff --git a/...s/teku/spec/datastructures/execution/versions/electra/ExecutionRequestsDataCodecTest.java b/...s/teku/spec/datastructures/execution/versions/electra/ExecutionRequestsDataCodecTest.java
@@ -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
@@ -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 =