From 55da3d9a9ab6b9964391a25adb4d155a207ac02c Mon Sep 17 00:00:00 2001 From: Tomas Susanka Date: Tue, 27 Feb 2018 11:50:10 +0100 Subject: [PATCH] tests/device/signtx: assert exception type and message --- .../tests/device_tests/test_msg_signtx.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/trezorlib/tests/device_tests/test_msg_signtx.py b/trezorlib/tests/device_tests/test_msg_signtx.py index 231914865b..1237bb3d50 100644 --- a/trezorlib/tests/device_tests/test_msg_signtx.py +++ b/trezorlib/tests/device_tests/test_msg_signtx.py @@ -604,6 +604,9 @@ class TestMsgSigntx(TrezorTest): if req.details.request_index != 1: return msg + if req.request_type != proto.RequestType.TXOUTPUT: + return msg + if not run_attack: run_attack = True return msg @@ -618,8 +621,13 @@ class TestMsgSigntx(TrezorTest): assert hexlify(serialized_tx) == b'01000000021c032e5715d1da8115a2fe4f57699e15742fe113b0d2d1ca3b594649d322bec6010000006b483045022100f773c403b2f85a5c1d6c9c4ad69c43de66930fff4b1bc818eb257af98305546a0220443bde4be439f276a6ce793664b463580e210ec6c9255d68354449ac0443c76501210338d78612e990f2eea0c426b5e48a8db70b9d7ed66282b3b26511e0b1c75515a6ffffffff6ea42cd8d9c8e5441c4c5f85bfe50311078730d2881494f11f4d2257777a4958010000006b48304502210090cff1c1911e771605358a8cddd5ae94c7b60cc96e50275908d9bf9d6367c79f02202bfa72e10260a146abd59d0526e1335bacfbb2b4401780e9e3a7441b0480c8da0121038caebd6f753bbbd2bb1f3346a43cd32140648583673a31d62f2dfb56ad0ab9e3ffffffff02a0860100000000001976a9142f4490d5263906e4887ca2996b9e207af3e7824088aca0860100000000001976a914812c13d97f9159e54e326b481b8f88a73df8507a88ac00000000' # Now run the attack, must trigger the exception - with pytest.raises(CallException): + try: self.client.sign_tx('Bitcoin', [inp1, inp2], [out1, out2], debug_processor=attack_processor) + except CallException as exc: + assert exc.args[0] == proto.FailureType.ProcessError + assert exc.args[1] == 'Transaction has changed during signing' + else: + assert False # exception expected def test_attack_change_input_address(self): # This unit test attempts to modify input address after the Trezor checked @@ -690,8 +698,14 @@ class TestMsgSigntx(TrezorTest): proto.TxRequest(request_type=proto.RequestType.TXINPUT, details=proto.TxRequestDetailsType(request_index=0)), proto.Failure(code=proto.FailureType.ProcessError), ]) - with pytest.raises(CallException): + # Now run the attack, must trigger the exception + try: self.client.sign_tx('Testnet', [inp1], [out1, out2], debug_processor=attack_processor) + except CallException as exc: + assert exc.args[0] == proto.FailureType.ProcessError + assert exc.args[1] == 'Transaction has changed during signing' + else: + assert False # exception expected def test_spend_coinbase(self): # 25 TEST generated to m/1 (mfiGQVPcRcaEvQPYDErR34DcCovtxYvUUV)