Fix how ethproxy handles the initial message (hyperledger#1959)

Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>
daniellehrner · Mar 2, 2021 · f50eee6 · f50eee6
1 parent 87f6c1a
commit f50eee6
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 8 deletions.
diff --git a/...stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocol.java b/...stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocol.java
@@ -18,7 +18,6 @@
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
@@ -35,6 +34,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.google.common.io.BaseEncoding;
+import io.vertx.core.json.DecodeException;
 import io.vertx.core.json.JsonObject;
 import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
@@ -65,21 +65,20 @@ public Stratum1EthProxyProtocol(final MiningCoordinator miningCoordinator) {
 
   @Override
   public boolean canHandle(final String initialMessage, final StratumConnection conn) {
-    JsonRpcRequestContext req;
+    JsonRpcRequest req;
     try {
-      req = new JsonObject(initialMessage).mapTo(JsonRpcRequestContext.class);
-    } catch (IllegalArgumentException e) {
+      req = new JsonObject(initialMessage).mapTo(JsonRpcRequest.class);
+    } catch (DecodeException | IllegalArgumentException e) {
       LOG.debug(e.getMessage(), e);
       return false;
     }
-    if (!"eth_submitLogin".equals(req.getRequest().getMethod())) {
-      LOG.debug("Invalid first message method: {}", req.getRequest().getMethod());
+    if (!"eth_submitLogin".equals(req.getMethod())) {
+      LOG.debug("Invalid first message method: {}", req.getMethod());
       return false;
     }
 
     try {
-      String response =
-          mapper.writeValueAsString(new JsonRpcSuccessResponse(req.getRequest().getId(), true));
+      String response = mapper.writeValueAsString(new JsonRpcSuccessResponse(req.getId(), true));
       conn.send(response + "\n");
     } catch (JsonProcessingException e) {
       LOG.debug(e.getMessage(), e);

diff --git a/...tum/src/test/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocolTest.java b/...tum/src/test/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocolTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.stratum;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class Stratum1EthProxyProtocolTest {
+
+  private Stratum1EthProxyProtocol protocol;
+  private StratumConnection conn;
+  private List<String> receivedMessages;
+
+  @Before
+  public void setUp() {
+    MiningCoordinator coordinator = mock(EthHashMiningCoordinator.class);
+    protocol = new Stratum1EthProxyProtocol(coordinator);
+    receivedMessages = new ArrayList<>();
+    conn = new StratumConnection(new StratumProtocol[0], null, receivedMessages::add);
+  }
+
+  @Test
+  public void testCanHandleEmptyString() {
+    assertThat(protocol.canHandle("", conn)).isFalse();
+  }
+
+  @Test
+  public void testCanHandleMalformedJSON() {
+    assertThat(protocol.canHandle("{[\"foo\",", conn)).isFalse();
+  }
+
+  @Test
+  public void testCanHandleWrongMethod() {
+    assertThat(
+            protocol.canHandle(
+                "{\"id\":0,\"method\":\"eth_byebye\",\"params\":[\"0xdeadbeefdeadbeef.worker\"]}",
+                conn))
+        .isFalse();
+  }
+
+  @Test
+  public void testCanHandleWellFormedRequest() {
+    assertThat(
+            protocol.canHandle(
+                "{\"id\":0,\"method\":\"eth_submitLogin\",\"params\":[\"0xdeadbeefdeadbeef.worker\"]}",
+                conn))
+        .isTrue();
+  }
+}