feat:check pin before u2f command (#112)

Author: lihuanhuan

legacy/firmware/config.c

@@ -1011,8 +1011,10 @@ bool config_unlock(const char *pin) {
 
   } else {
     char oldTiny = usbTiny(1);
+    register_timer("usbpoll", timer1s / 30, usbPoll);
     secbool ret =
         storage_unlock((const uint8_t *)pin, strnlen(pin, MAX_PIN_LEN), NULL);
+    unregister_timer("usbpoll");
     usbTiny(oldTiny);
     return sectrue == ret;
   }

legacy/firmware/layout2.c

@@ -2031,6 +2031,8 @@ void layoutInputPin(uint8_t pos, const char *text, int index,
   char buf[2] = {0};
   int x = 6;
 
+  layoutLast = layoutInputPin;
+
   for (uint8_t i = 0; i < pos; i++) {
     pin_show[i] = '*';
   }

legacy/firmware/protect.c

@@ -733,6 +733,8 @@ uint8_t blindsignWaitKey(void) {
   return key;
 }
 
+extern bool u2f_init_command;
+
 uint8_t protectWaitKey(uint32_t time_out, uint8_t mode) {
   uint8_t key = KEY_NULL;
 
@@ -749,6 +751,13 @@ uint8_t protectWaitKey(uint32_t time_out, uint8_t mode) {
       msg_tiny_id = 0xFFFF;
       break;
     }
+    if (layoutLast == layoutScreensaver) {
+      if (u2f_init_command) {
+        u2f_init_command = false;
+        break;
+      }
+    }
+
     key = keyScan();
     if (key != KEY_NULL) {
       if (device_sleep_state) device_sleep_state = SLEEP_CANCEL_BY_BUTTON;

legacy/firmware/u2f.c

@@ -30,6 +30,7 @@
 #include "hmac.h"
 #include "layout2.h"
 #include "memzero.h"
+#include "protect.h"
 #if !EMULATOR
 #include "mi2c.h"
 #endif
@@ -89,6 +90,11 @@ typedef enum {
 
 static U2F_STATE last_req_state = INIT;
 
+static bool input_pin = false;
+static bool first_package = true;
+static uint32_t package_len = 0, rec_len = 0;
+bool u2f_init_command = false;
+
 typedef struct {
   uint8_t reserved;
   uint8_t appId[U2F_APPID_SIZE];
@@ -132,6 +138,7 @@ U2F_ReadBuffer *reader;
 void u2fhid_read(char tiny, const U2FHID_FRAME *f) {
   // Always handle init packets directly
   if (f->init.cmd == U2FHID_INIT) {
+    u2f_init_command = true;
     u2fhid_init(f);
     if (tiny && reader && f->cid == cid) {
       // abort current channel
@@ -142,6 +149,24 @@ void u2fhid_read(char tiny, const U2FHID_FRAME *f) {
     return;
   }
 
+  if (layoutLast == layoutInputPin) {
+    if (first_package) {
+      first_package = false;
+      package_len = MSG_LEN(*f);
+      rec_len = sizeof(f->cont.data);
+      while (rec_len < package_len) {
+        usbPoll();
+      }
+      send_u2f_error(U2F_SW_CONDITIONS_NOT_SATISFIED);
+      first_package = true;
+      return;
+    } else {
+      rec_len += sizeof(f->cont.data);
+      return;
+    }
+    return;
+  }
+
   if (tiny) {
     // read continue packet
     if (reader == 0 || cid != f->cid) {
@@ -259,6 +284,10 @@ void u2fhid_read_start(const U2FHID_FRAME *f) {
         // standard requires to remember button press for 10 seconds.
         dialog_timeout = 10 * U2F_TIMEOUT;
       }
+      if (reader == 0) {
+        layoutHome();
+        return;
+      }
     }
 
     if (reader->cmd == 0) {
@@ -627,6 +656,20 @@ void u2f_register(const APDU *a) {
     return;
   }
 
+  if (!session_isUnlocked()) {
+    input_pin = true;
+    send_u2f_error(U2F_SW_CONDITIONS_NOT_SATISFIED);
+  }
+
+  protectPinOnDevice(true, true);
+
+  if (input_pin) {
+    input_pin = false;
+    last_req_state = REG;
+    dialog_timeout = U2F_TIMEOUT;
+    return;
+  }
+
   // Validate basic request parameters
   debugLog(0, "", "u2f register");
   if (APDU_LEN(*a) != sizeof(U2F_REGISTER_REQ)) {
@@ -770,6 +813,20 @@ void u2f_authenticate(const APDU *a) {
     return;
   }
 
+  if (!session_isUnlocked()) {
+    input_pin = true;
+    send_u2f_error(U2F_SW_CONDITIONS_NOT_SATISFIED);
+  }
+
+  protectPinOnDevice(true, true);
+
+  if (input_pin) {
+    input_pin = false;
+    last_req_state = AUTH;
+    dialog_timeout = U2F_TIMEOUT;
+    return;
+  }
+
   if (a->p1 == U2F_AUTH_CHECK_ONLY) {
     debugLog(0, "", "u2f authenticate check");
     // This is a success for a good keyhandle

legacy/timer.c

@@ -48,7 +48,7 @@ void delay_us(uint32_t uiDelay_us) {
   }
 }
 
-#define TIMER_NUM 3
+#define TIMER_NUM 4
 typedef struct {
   char name[32];
   uint32_t current;