mirror of https://github.com/hyperledger/besu
Handle Crytpo failures in Ibft, Clique, discovery and Handshaking (#831)
IbftRound has been updated to accept Signing errors (eg no signature supplier available) and continue operating if possible. This also catches failures in signing and ECDH Key agreement creation during discovery and handshaking. Signed-off-by: Trent Mohay <trent.mohay@consensys.net>pull/850/head
Trent Mohay
5 years ago
committed by
GitHub
parent
8a6f34913f
commit
0917f8905a
@ -0,0 +1,183 @@ |
||||
/* |
||||
* 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.consensus.ibft.tests.round; |
||||
|
||||
import static java.util.Collections.emptyList; |
||||
import static java.util.Optional.empty; |
||||
import static org.assertj.core.api.Assertions.assertThat; |
||||
import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators; |
||||
import static org.mockito.ArgumentMatchers.any; |
||||
import static org.mockito.Mockito.verify; |
||||
import static org.mockito.Mockito.verifyNoInteractions; |
||||
import static org.mockito.Mockito.when; |
||||
|
||||
import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; |
||||
import org.hyperledger.besu.consensus.ibft.IbftContext; |
||||
import org.hyperledger.besu.consensus.ibft.IbftExtraData; |
||||
import org.hyperledger.besu.consensus.ibft.RoundTimer; |
||||
import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreator; |
||||
import org.hyperledger.besu.consensus.ibft.network.IbftMessageTransmitter; |
||||
import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; |
||||
import org.hyperledger.besu.consensus.ibft.statemachine.IbftRound; |
||||
import org.hyperledger.besu.consensus.ibft.statemachine.RoundState; |
||||
import org.hyperledger.besu.consensus.ibft.support.StubValidatorMulticaster; |
||||
import org.hyperledger.besu.consensus.ibft.validation.MessageValidator; |
||||
import org.hyperledger.besu.crypto.NodeKey; |
||||
import org.hyperledger.besu.crypto.NodeKeyUtils; |
||||
import org.hyperledger.besu.crypto.SECP256K1.Signature; |
||||
import org.hyperledger.besu.ethereum.ProtocolContext; |
||||
import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; |
||||
import org.hyperledger.besu.ethereum.chain.MutableBlockchain; |
||||
import org.hyperledger.besu.ethereum.core.Block; |
||||
import org.hyperledger.besu.ethereum.core.BlockBody; |
||||
import org.hyperledger.besu.ethereum.core.BlockHeader; |
||||
import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; |
||||
import org.hyperledger.besu.ethereum.core.BlockImporter; |
||||
import org.hyperledger.besu.ethereum.core.Hash; |
||||
import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; |
||||
import org.hyperledger.besu.plugin.services.securitymodule.SecurityModuleException; |
||||
import org.hyperledger.besu.util.Subscribers; |
||||
|
||||
import java.math.BigInteger; |
||||
import java.util.Optional; |
||||
|
||||
import org.apache.tuweni.bytes.Bytes; |
||||
import org.junit.Before; |
||||
import org.junit.Test; |
||||
import org.junit.runner.RunWith; |
||||
import org.mockito.Mock; |
||||
import org.mockito.junit.MockitoJUnitRunner; |
||||
|
||||
@RunWith(MockitoJUnitRunner.class) |
||||
public class IbftRoundIntegrationTest { |
||||
|
||||
private final MessageFactory peerMessageFactory = new MessageFactory(NodeKeyUtils.generate()); |
||||
private final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 0); |
||||
private final Subscribers<MinedBlockObserver> subscribers = Subscribers.create(); |
||||
private ProtocolContext<IbftContext> protocolContext; |
||||
|
||||
@Mock private MutableBlockchain blockChain; |
||||
@Mock private WorldStateArchive worldStateArchive; |
||||
@Mock private BlockImporter<IbftContext> blockImporter; |
||||
|
||||
@Mock private IbftBlockCreator blockCreator; |
||||
@Mock private MessageValidator messageValidator; |
||||
@Mock private RoundTimer roundTimer; |
||||
@Mock private NodeKey nodeKey; |
||||
private MessageFactory throwingMessageFactory; |
||||
private IbftMessageTransmitter transmitter; |
||||
@Mock private StubValidatorMulticaster multicaster; |
||||
|
||||
private Block proposedBlock; |
||||
|
||||
private final Signature remoteCommitSeal = |
||||
Signature.create(BigInteger.ONE, BigInteger.ONE, (byte) 1); |
||||
|
||||
@Before |
||||
public void setup() { |
||||
protocolContext = |
||||
new ProtocolContext<>( |
||||
blockChain, worldStateArchive, setupContextWithValidators(emptyList())); |
||||
|
||||
when(messageValidator.validateProposal(any())).thenReturn(true); |
||||
when(messageValidator.validatePrepare(any())).thenReturn(true); |
||||
when(messageValidator.validateCommit(any())).thenReturn(true); |
||||
|
||||
when(nodeKey.sign(any())).thenThrow(new SecurityModuleException("Hsm Is Down")); |
||||
|
||||
throwingMessageFactory = new MessageFactory(nodeKey); |
||||
transmitter = new IbftMessageTransmitter(throwingMessageFactory, multicaster); |
||||
|
||||
IbftExtraData proposedExtraData = |
||||
new IbftExtraData(Bytes.wrap(new byte[32]), emptyList(), empty(), 0, emptyList()); |
||||
final BlockHeaderTestFixture headerTestFixture = new BlockHeaderTestFixture(); |
||||
headerTestFixture.extraData(proposedExtraData.encode()); |
||||
headerTestFixture.number(1); |
||||
final BlockHeader header = headerTestFixture.buildHeader(); |
||||
proposedBlock = new Block(header, new BlockBody(emptyList(), emptyList())); |
||||
|
||||
when(blockImporter.importBlock(any(), any(), any())).thenReturn(true); |
||||
} |
||||
|
||||
@Test |
||||
public void signingFailsOnReceiptOfProposalUpdatesRoundButTransmitsNothing() { |
||||
final int QUORUM_SIZE = 1; |
||||
final RoundState roundState = new RoundState(roundIdentifier, QUORUM_SIZE, messageValidator); |
||||
final IbftRound round = |
||||
new IbftRound( |
||||
roundState, |
||||
blockCreator, |
||||
protocolContext, |
||||
blockImporter, |
||||
subscribers, |
||||
nodeKey, |
||||
throwingMessageFactory, |
||||
transmitter, |
||||
roundTimer); |
||||
|
||||
round.handleProposalMessage( |
||||
peerMessageFactory.createProposal(roundIdentifier, proposedBlock, Optional.empty())); |
||||
|
||||
assertThat(roundState.getProposedBlock()).isNotEmpty(); |
||||
assertThat(roundState.isPrepared()).isTrue(); |
||||
assertThat(roundState.isCommitted()).isFalse(); |
||||
|
||||
verifyNoInteractions(multicaster); |
||||
} |
||||
|
||||
@Test |
||||
public void failuresToSignStillAllowBlockToBeImported() { |
||||
final int QUORUM_SIZE = 2; |
||||
final RoundState roundState = new RoundState(roundIdentifier, QUORUM_SIZE, messageValidator); |
||||
final IbftRound round = |
||||
new IbftRound( |
||||
roundState, |
||||
blockCreator, |
||||
protocolContext, |
||||
blockImporter, |
||||
subscribers, |
||||
nodeKey, |
||||
throwingMessageFactory, |
||||
transmitter, |
||||
roundTimer); |
||||
|
||||
// inject a block first, then a prepare on it.
|
||||
round.handleProposalMessage( |
||||
peerMessageFactory.createProposal(roundIdentifier, proposedBlock, Optional.empty())); |
||||
|
||||
assertThat(roundState.getProposedBlock()).isNotEmpty(); |
||||
assertThat(roundState.isPrepared()).isFalse(); |
||||
assertThat(roundState.isCommitted()).isFalse(); |
||||
|
||||
round.handlePrepareMessage(peerMessageFactory.createPrepare(roundIdentifier, Hash.EMPTY)); |
||||
|
||||
assertThat(roundState.getProposedBlock()).isNotEmpty(); |
||||
assertThat(roundState.isPrepared()).isTrue(); |
||||
assertThat(roundState.isCommitted()).isFalse(); |
||||
verifyNoInteractions(multicaster); |
||||
|
||||
round.handleCommitMessage( |
||||
peerMessageFactory.createCommit(roundIdentifier, Hash.EMPTY, remoteCommitSeal)); |
||||
assertThat(roundState.isCommitted()).isFalse(); |
||||
verifyNoInteractions(multicaster); |
||||
|
||||
round.handleCommitMessage( |
||||
peerMessageFactory.createCommit(roundIdentifier, Hash.EMPTY, remoteCommitSeal)); |
||||
assertThat(roundState.isCommitted()).isTrue(); |
||||
verifyNoInteractions(multicaster); |
||||
|
||||
verify(blockImporter).importBlock(any(), any(), any()); |
||||
} |
||||
} |
||||
@ -1 +1 @@ |
||||
Subproject commit 5841af6da472fb3f19810354cf9a30afd8e72b5f |
||||
Subproject commit 6af0621522dd0274525457741291d391c10002be |
||||
Loading…
Reference in new issue