Implemented #30 (#31)

RogueMaster · Nov 18, 2022 · 018aa7e · 018aa7e
1 parent ee4252c
commit 018aa7e
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 14 deletions.
diff --git a/services/cli/cli_helpers.h b/services/cli/cli_helpers.h
@@ -37,4 +37,11 @@
     TOTP_CLI_PRINTF(                       \
         "Invalid command arguments. use \"help\" command to get list of available commands")
 
+/**
+ * @brief Checks whether user is authenticated and entered correct PIN.
+ *        If user is not authenticated it prompts user to enter correct PIN to authenticate.
+ * @param plugin_state application state
+ * @param cli reference to the firmware CLI subsystem 
+ * @return \c true if user is already authenticated or successfully authenticated; \c false otherwise
+ */
 bool totp_cli_ensure_authenticated(const PluginState* plugin_state, Cli* cli);
diff --git a/totp_app.c b/totp_app.c
@@ -24,7 +24,7 @@
 
 static void render_callback(Canvas* const canvas, void* ctx) {
     PluginState* plugin_state = acquire_mutex((ValueMutex*)ctx, 25);
-    if (plugin_state != NULL && !plugin_state->changing_scene) {
+    if(plugin_state != NULL && !plugin_state->changing_scene) {
         totp_scene_director_render(canvas, plugin_state);
     }
 
@@ -49,29 +49,43 @@ static bool totp_plugin_state_init(PluginState* const plugin_state) {
 
     totp_scene_director_init_scenes(plugin_state);
 
-    if (plugin_state->crypto_verify_data == NULL) {
+    if(plugin_state->crypto_verify_data == NULL) {
         DialogMessage* message = dialog_message_alloc();
         dialog_message_set_buttons(message, "No", NULL, "Yes");
-        dialog_message_set_text(message, "Would you like to setup PIN?", SCREEN_WIDTH_CENTER, SCREEN_HEIGHT_CENTER, AlignCenter, AlignCenter);
+        dialog_message_set_text(
+            message,
+            "Would you like to setup PIN?",
+            SCREEN_WIDTH_CENTER,
+            SCREEN_HEIGHT_CENTER,
+            AlignCenter,
+            AlignCenter);
         DialogMessageButton dialog_result = dialog_message_show(plugin_state->dialogs, message);
         dialog_message_free(message);
-        if (dialog_result == DialogMessageButtonRight) {
+        if(dialog_result == DialogMessageButtonRight) {
             totp_scene_director_activate_scene(plugin_state, TotpSceneAuthentication, NULL);
         } else {
             totp_crypto_seed_iv(plugin_state, NULL, 0);
             totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);
         }
-    } else if (plugin_state->pin_set) {
+    } else if(plugin_state->pin_set) {
         totp_scene_director_activate_scene(plugin_state, TotpSceneAuthentication, NULL);
     } else {
         totp_crypto_seed_iv(plugin_state, NULL, 0);
-        if (totp_crypto_verify_key(plugin_state)) {
+        if(totp_crypto_verify_key(plugin_state)) {
             totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);
         } else {
-            FURI_LOG_E(LOGGING_TAG, "Digital signature verification failed. Looks like conf file was created on another flipper and can't be used on any other");
+            FURI_LOG_E(
+                LOGGING_TAG,
+                "Digital signature verification failed. Looks like conf file was created on another flipper and can't be used on any other");
             DialogMessage* message = dialog_message_alloc();
             dialog_message_set_buttons(message, "Exit", NULL, NULL);
-            dialog_message_set_text(message, "Digital signature verification failed", SCREEN_WIDTH_CENTER, SCREEN_HEIGHT_CENTER, AlignCenter, AlignCenter);
+            dialog_message_set_text(
+                message,
+                "Digital signature verification failed",
+                SCREEN_WIDTH_CENTER,
+                SCREEN_HEIGHT_CENTER,
+                AlignCenter,
+                AlignCenter);
             dialog_message_show(plugin_state->dialogs, message);
             dialog_message_free(message);
             return false;
@@ -94,15 +108,15 @@ static void totp_plugin_state_free(PluginState* plugin_state) {
 
     ListNode* node = plugin_state->tokens_list;
     ListNode* tmp;
-    while (node != NULL) {
+    while(node != NULL) {
         tmp = node->next;
         TokenInfo* tokenInfo = node->data;
         token_info_free(tokenInfo);
         free(node);
         node = tmp;
     }
 
-    if (plugin_state->crypto_verify_data != NULL) {
+    if(plugin_state->crypto_verify_data != NULL) {
         free(plugin_state->crypto_verify_data);
     }
     free(plugin_state);
@@ -113,7 +127,7 @@ int32_t totp_app() {
     PluginState* plugin_state = malloc(sizeof(PluginState));
     furi_check(plugin_state != NULL);
 
-    if (!totp_plugin_state_init(plugin_state)) {
+    if(!totp_plugin_state_init(plugin_state)) {
         FURI_LOG_E(LOGGING_TAG, "App state initialization failed\r\n");
         totp_plugin_state_free(plugin_state);
         return 254;
@@ -138,18 +152,20 @@ int32_t totp_app() {
     bool processing = true;
     uint32_t last_user_interaction_time = furi_get_tick();
     while(processing) {
-        if (plugin_state->changing_scene) continue;
+        if(plugin_state->changing_scene) continue;
         FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
 
         PluginState* plugin_state_m = acquire_mutex_block(&state_mutex);
 
         if(event_status == FuriStatusOk) {
-            if (event.type == EventTypeKey) {
+            if(event.type == EventTypeKey) {
                 last_user_interaction_time = furi_get_tick();
             }
 
             processing = totp_scene_director_handle_event(&event, plugin_state_m);
-        } else if (plugin_state_m->pin_set && plugin_state_m->current_scene != TotpSceneAuthentication && furi_get_tick() - last_user_interaction_time > IDLE_TIMEOUT) {
+        } else if(
+            plugin_state_m->pin_set && plugin_state_m->current_scene != TotpSceneAuthentication &&
+            furi_get_tick() - last_user_interaction_time > IDLE_TIMEOUT) {
             totp_scene_director_activate_scene(plugin_state_m, TotpSceneAuthentication, NULL);
         }