core: touch idle timer in keyboards (fixes #1099)

core/src/apps/management/recovery_device/keyboard_bip39.py

@@ -1,4 +1,4 @@
-from trezor import io, loop, res, ui
+from trezor import io, loop, res, ui, workflow
 from trezor.crypto import bip39
 from trezor.ui import display
 from trezor.ui.button import Button, ButtonClear, ButtonMono, ButtonMonoConfirm
@@ -204,6 +204,7 @@ class Bip39Keyboard(ui.Layout):
 
             if touch in race.finished:
                 event, x, y = result
+                workflow.idle_timer.touch()
                 self.dispatch(event, x, y)
             else:
                 self.on_timeout()

core/src/apps/management/recovery_device/keyboard_slip39.py

@@ -1,4 +1,4 @@
-from trezor import io, loop, res, ui
+from trezor import io, loop, res, ui, workflow
 from trezor.crypto import slip39
 from trezor.ui import display
 from trezor.ui.button import Button, ButtonClear, ButtonMono, ButtonMonoConfirm
@@ -214,6 +214,7 @@ class Slip39Keyboard(ui.Layout):
 
             if touch in race.finished:
                 event, x, y = result
+                workflow.idle_timer.touch()
                 self.dispatch(event, x, y)
             else:
                 self.on_timeout()

core/src/trezor/ui/passphrase.py

@@ -1,6 +1,6 @@
 from micropython import const
 
-from trezor import io, loop, res, ui
+from trezor import io, loop, res, ui, workflow
 from trezor.ui import display
 from trezor.ui.button import Button, ButtonClear, ButtonConfirm
 from trezor.ui.swipe import SWIPE_HORIZONTAL, SWIPE_LEFT, Swipe
@@ -221,6 +221,7 @@ class PassphraseKeyboard(ui.Layout):
 
             if touch in race.finished:
                 event, x, y = result
+                workflow.idle_timer.touch()
                 self.dispatch(event, x, y)
             else:
                 self.on_timeout()

tests/click_tests/test_autolock.py

@@ -0,0 +1,195 @@
+# This file is part of the Trezor project.
+#
+# Copyright (C) 2012-2019 SatoshiLabs and contributors
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the License along with this library.
+# If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.
+
+import time
+
+import pytest
+
+from trezorlib import btc, device, exceptions, messages
+from trezorlib.tools import parse_path
+
+from .. import buttons, common
+from ..tx_cache import TxCache
+from . import recovery
+
+TX_CACHE = TxCache("Bitcoin")
+
+TXHASH_d5f65e = bytes.fromhex(
+    "d5f65ee80147b4bcc70b75e4bbf2d7382021b871bd8867ef8fa525ef50864882"
+)
+
+PIN4 = "1234"
+
+WORDS_20 = buttons.grid34(2, 2)
+
+
+def set_autolock_delay(device_handler, delay_ms):
+    debug = device_handler.debuglink()
+
+    device_handler.run(device.apply_settings, auto_lock_delay_ms=delay_ms)
+
+    layout = debug.wait_layout()
+    assert layout.text == "PinDialog"
+    debug.input("1234")
+
+    layout = debug.wait_layout()
+    assert f"auto-lock your device after {delay_ms // 1000} seconds" in layout.text
+    debug.click(buttons.OK)
+
+    layout = debug.wait_layout()
+    assert layout.text == "Homescreen"
+    assert device_handler.result() == "Settings applied"
+
+
+@pytest.mark.setup_client(pin=PIN4)
+def test_autolock_interrupts_signing(device_handler):
+    set_autolock_delay(device_handler, 10_000)
+
+    debug = device_handler.debuglink()
+    # try to sign a transaction
+    inp1 = messages.TxInputType(
+        address_n=parse_path("44h/0h/0h/0/0"),
+        # amount=390000,
+        prev_hash=TXHASH_d5f65e,
+        prev_index=0,
+    )
+
+    out1 = messages.TxOutputType(
+        address="1MJ2tj2ThBE62zXbBYA5ZaN3fdve5CPAz1",
+        amount=390000 - 10000,
+        script_type=messages.OutputScriptType.PAYTOADDRESS,
+    )
+
+    device_handler.run(btc.sign_tx, "Bitcoin", [inp1], [out1], prev_txes=TX_CACHE)
+
+    layout = debug.wait_layout()
+    assert "1MJ2tj2ThBE62zXbBYA5ZaN3fdve5CPAz1" in layout.text.replace(" ", "")
+
+    layout = debug.click(buttons.OK, wait=True)
+    assert "Total amount: 0.0039 BTC" in layout.text
+
+    # wait for autolock to kick in
+    time.sleep(10.1)
+    with pytest.raises(exceptions.Cancelled):
+        device_handler.result()
+
+
+@pytest.mark.xfail(reason="depends on #922")
+@pytest.mark.setup_client(pin=PIN4, passphrase=True)
+def test_autolock_passphrase_keyboard(device_handler):
+    set_autolock_delay(device_handler, 10_000)
+    debug = device_handler.debuglink()
+
+    # get address
+    device_handler.run(common.get_test_address)
+
+    # enter passphrase - slowly
+    layout = debug.wait_layout()
+    assert layout.text == "PassphraseKeyboard"
+
+    CENTER_BUTTON = buttons.grid35(1, 2)
+    for _ in range(11):
+        debug.click(CENTER_BUTTON)
+        time.sleep(1.1)
+
+    assert device_handler.result() == "TODO when #922 fixed"
+
+
+@pytest.mark.setup_client(pin=PIN4)
+def test_dryrun_locks_at_number_of_words(device_handler):
+    set_autolock_delay(device_handler, 10_000)
+    debug = device_handler.debuglink()
+
+    device_handler.run(device.recover, dry_run=True)
+
+    # unlock
+    layout = debug.wait_layout()
+    assert "Do you really want to check the recovery seed?" in layout.text
+    layout = debug.click(buttons.OK, wait=True)
+    assert layout.text == "PinDialog"
+    layout = debug.input(PIN4, wait=True)
+    assert "Select number of words " in layout.text
+
+    # wait for autolock to trigger
+    time.sleep(10.1)
+    layout = debug.wait_layout()
+    assert layout.text == "Lockscreen"
+    with pytest.raises(exceptions.Cancelled):
+        device_handler.result()
+
+    # unlock
+    layout = debug.click(buttons.OK, wait=True)
+    assert layout.text == "PinDialog"
+    layout = debug.input(PIN4, wait=True)
+
+    # we are back at homescreen
+    assert "Select number of words" in layout.text
+
+
+@pytest.mark.setup_client(pin=PIN4)
+def test_dryrun_locks_at_word_entry(device_handler):
+    set_autolock_delay(device_handler, 10_000)
+    debug = device_handler.debuglink()
+
+    device_handler.run(device.recover, dry_run=True)
+
+    # unlock
+    layout = debug.wait_layout()
+    assert "Do you really want to check the recovery seed?" in layout.text
+    layout = debug.click(buttons.OK, wait=True)
+    assert layout.text == "PinDialog"
+    layout = debug.input(PIN4, wait=True)
+
+    # select 20 words
+    recovery.select_number_of_words(debug, 20)
+
+    layout = debug.click(buttons.OK, wait=True)
+    # make sure keyboard locks
+    assert layout.text == "Slip39Keyboard"
+    time.sleep(10.1)
+    layout = debug.wait_layout()
+    assert layout.text == "Lockscreen"
+    with pytest.raises(exceptions.Cancelled):
+        device_handler.result()
+
+
+@pytest.mark.setup_client(pin=PIN4)
+def test_dryrun_enter_word_slowly(device_handler):
+    set_autolock_delay(device_handler, 10_000)
+    debug = device_handler.debuglink()
+
+    device_handler.run(device.recover, dry_run=True)
+
+    # unlock
+    layout = debug.wait_layout()
+    assert "Do you really want to check the recovery seed?" in layout.text
+    layout = debug.click(buttons.OK, wait=True)
+    assert layout.text == "PinDialog"
+    layout = debug.input(PIN4, wait=True)
+
+    # select 20 words
+    recovery.select_number_of_words(debug, 20)
+
+    layout = debug.click(buttons.OK, wait=True)
+    # type the word OCEAN slowly
+    assert layout.text == "Slip39Keyboard"
+    for coords in buttons.type_word("ocea"):
+        time.sleep(9)
+        debug.click(coords)
+    layout = debug.click(buttons.CONFIRM_WORD, wait=True)
+    # should not have locked, even though we took 9 seconds to type each letter
+    assert layout.text == "Slip39Keyboard"
+    device_handler.kill_task()