test(jsonrpc): drop request body cases already covered by the byte check

- Remove the UTF-32 decoding test; its bodies contain NUL bytes and are
  rejected before parsing, like the other UTF-16 and UTF-32 cases.
- Merge the UTF-16 test with a byte order mark into the UTF-16/UTF-32
  rejection test and add a U+00E9 request to it.
- Drop stubs for methods that the rejection tests never reach.
- Use Guava Bytes.concat instead of local helpers.

Author: waynercheung

framework/src/test/java/org/tron/core/services/jsonrpc/JsonRpcServletJettyTest.java

@@ -1,10 +1,11 @@
 package org.tron.core.services.jsonrpc;
 
+import static com.google.common.primitives.Bytes.concat;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.googlecode.jsonrpc4j.JsonRpcMethod;
 import com.googlecode.jsonrpc4j.JsonRpcServer;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.net.SocketException;
@@ -233,14 +234,6 @@ private void assertParseErrorOverHttp(URI endpoint, byte[] body) throws IOExcept
     }
   }
 
-  private static byte[] concat(byte[]... parts) {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    for (byte[] part : parts) {
-      out.write(part, 0, part.length);
-    }
-    return out.toByteArray();
-  }
-
   public interface FatalService {
 
     @JsonRpcMethod("test_fatal")

framework/src/test/java/org/tron/core/services/jsonrpc/JsonRpcServletTest.java

@@ -1,5 +1,6 @@
 package org.tron.core.services.jsonrpc;
 
+import static com.google.common.primitives.Bytes.concat;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -34,7 +35,6 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.googlecode.jsonrpc4j.JsonRpcMethod;
 import com.googlecode.jsonrpc4j.JsonRpcServer;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -110,7 +110,6 @@ public void emptyBody_returnsParseError() throws Exception {
   @Test
   public void malformedUtf8_isRejectedBeforeDispatch() throws Exception {
     TronJsonRpc rpc = useRealRpcServer();
-    when(rpc.web3ClientVersion()).thenReturn("client");
     // Each sequence replaces the leading 'w' of web3_clientVersion. The overlong forms decode
     // to 'w' in a lenient parser, so they reach the real method unless rejected up front.
     byte[][] sequences = {
@@ -165,15 +164,22 @@ public void utf8ByteOrderMark_isAccepted() throws Exception {
   }
 
   @Test
-  public void utf16AndUtf32WithoutByteOrderMark_areRejected() throws Exception {
+  public void utf16AndUtf32Bodies_areRejected() throws Exception {
     TronJsonRpc rpc = useRealRpcServer();
     String request = "{\"jsonrpc\":\"2.0\",\"method\":\"eth_blockNumber\",\"id\":1}";
     String chinese = "{\"jsonrpc\":\"2.0\",\"method\":\"web3_sha3\",\"params\":[\"中\"],\"id\":1}";
+    String accented = "{\"jsonrpc\":\"2.0\",\"method\":\"web3_sha3\",\"params\":[\"é\"],\"id\":1}";
     for (String charset : Arrays.asList("UTF-16LE", "UTF-16BE", "UTF-32LE", "UTF-32BE")) {
-      for (String body : Arrays.asList(request, chinese)) {
+      for (String body : Arrays.asList(request, chinese, accented)) {
         assertParseError(charset + " " + body, doPost(body.getBytes(Charset.forName(charset))));
       }
     }
+    List<byte[]> withByteOrderMark = Arrays.asList(
+        request.getBytes(StandardCharsets.UTF_16),
+        concat(new byte[] {(byte) 0xFF, (byte) 0xFE}, request.getBytes(StandardCharsets.UTF_16LE)));
+    for (byte[] body : withByteOrderMark) {
+      assertParseError(Arrays.toString(body), doPost(body));
+    }
     verify(realRpcServer, never()).handleRequest(any(InputStream.class), any(OutputStream.class));
     verify(rpc, never()).getLatestBlockNum();
     verify(rpc, never()).web3Sha3(any());
@@ -208,25 +214,6 @@ public void escapedNulCharacter_isDispatched() throws Exception {
     verify(rpc).web3Sha3("a" + (char) 0 + "b");
   }
 
-  @Test
-  public void utf16BodyThatIsNotWellFormedUtf8_isRejected() throws Exception {
-    TronJsonRpc rpc = useRealRpcServer();
-    when(rpc.web3Sha3(any())).thenReturn("0x1");
-    String request = "{\"jsonrpc\":\"2.0\",\"method\":\"eth_blockNumber\",\"id\":1}";
-    String nonAscii = "{\"jsonrpc\":\"2.0\",\"method\":\"web3_sha3\",\"params\":[\"é\"],\"id\":1}";
-    List<byte[]> bodies = Arrays.asList(
-        request.getBytes(StandardCharsets.UTF_16),
-        concat(new byte[] {(byte) 0xFF, (byte) 0xFE}, request.getBytes(StandardCharsets.UTF_16LE)),
-        nonAscii.getBytes(StandardCharsets.UTF_16LE),
-        nonAscii.getBytes(StandardCharsets.UTF_16BE));
-    for (byte[] body : bodies) {
-      assertParseError(Arrays.toString(body), doPost(body));
-    }
-    verify(realRpcServer, never()).handleRequest(any(InputStream.class), any(OutputStream.class));
-    verify(rpc, never()).getLatestBlockNum();
-    verify(rpc, never()).web3Sha3(any());
-  }
-
   @Test
   public void trailingContent_isRejectedBeforeDispatch() throws Exception {
     TronJsonRpc rpc = useRealRpcServer();
@@ -270,28 +257,6 @@ public void trailingWhitespace_isAccepted() throws Exception {
     verify(rpc, times(7)).getLatestBlockNum();
   }
 
-  @Test
-  public void undecodableUtf32Body_returnsParseError() throws Exception {
-    TronJsonRpc rpc = useRealRpcServer();
-    byte[] request = "{\"jsonrpc\":\"2.0\",\"method\":\"eth_blockNumber\",\"id\":1}"
-        .getBytes(Charset.forName("UTF-32BE"));
-    byte[] padding = new byte[4096];
-    for (int i = 3; i < padding.length; i += 4) {
-      padding[i] = ' ';
-    }
-    // Jackson's UTF-32 decoder reports these as a CharConversionException, an IOException that
-    // is not a JsonProcessingException.
-    List<byte[]> bodies = Arrays.asList(
-        concat(request, new byte[] {'\n'}),
-        concat(request, new byte[] {0, 0, ' '}),
-        concat(request, padding, new byte[] {0, 0x11, 0, 0}));
-    for (byte[] body : bodies) {
-      assertParseError(Arrays.toString(body), doPost(body));
-    }
-    verify(realRpcServer, never()).handleRequest(any(InputStream.class), any(OutputStream.class));
-    verify(rpc, never()).getLatestBlockNum();
-  }
-
   // --- batch size limit ---
 
   @Test
@@ -2073,14 +2038,6 @@ private static byte[] utf8(String text) {
     return text.getBytes(StandardCharsets.UTF_8);
   }
 
-  private static byte[] concat(byte[]... parts) {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    for (byte[] part : parts) {
-      out.write(part, 0, part.length);
-    }
-    return out.toByteArray();
-  }
-
   private void assertCleanupFailureDoesNotReplaceFatal(HttpServletResponse response)
       throws Exception {
     StackOverflowError fatal = new StackOverflowError("original-fatal-marker");