[FL-2226] BadUSB, U2F: missing assets error (#979)
* badusb, u2f: showing error screen if assets are missing * BadUsb: remove dead code * U2F: remove dead code Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
@@ -1 +1,2 @@
|
||||
ADD_SCENE(u2f, main, Main)
|
||||
ADD_SCENE(u2f, error, Error)
|
||||
|
49
applications/u2f/scenes/u2f_scene_error.c
Normal file
49
applications/u2f/scenes/u2f_scene_error.c
Normal file
@@ -0,0 +1,49 @@
|
||||
#include "../u2f_app_i.h"
|
||||
|
||||
static void u2f_scene_error_event_callback(GuiButtonType result, InputType type, void* context) {
|
||||
furi_assert(context);
|
||||
U2fApp* app = context;
|
||||
|
||||
if((result == GuiButtonTypeLeft) && (type == InputTypeShort)) {
|
||||
view_dispatcher_send_custom_event(app->view_dispatcher, U2fCustomEventErrorBack);
|
||||
}
|
||||
}
|
||||
|
||||
void u2f_scene_error_on_enter(void* context) {
|
||||
U2fApp* app = context;
|
||||
|
||||
widget_add_icon_element(app->widget, 0, 0, &I_SDQuestion_35x43);
|
||||
|
||||
widget_add_string_multiline_element(
|
||||
app->widget,
|
||||
81,
|
||||
4,
|
||||
AlignCenter,
|
||||
AlignTop,
|
||||
FontSecondary,
|
||||
"No SD card or\napp data found.\nThis app will not\nwork without\nrequired files.");
|
||||
|
||||
widget_add_button_element(
|
||||
app->widget, GuiButtonTypeLeft, "Back", u2f_scene_error_event_callback, app);
|
||||
|
||||
view_dispatcher_switch_to_view(app->view_dispatcher, U2fAppViewError);
|
||||
}
|
||||
|
||||
bool u2f_scene_error_on_event(void* context, SceneManagerEvent event) {
|
||||
U2fApp* app = context;
|
||||
bool consumed = false;
|
||||
|
||||
if(event.type == SceneManagerEventTypeCustom) {
|
||||
if(event.event == U2fCustomEventErrorBack) {
|
||||
view_dispatcher_stop(app->view_dispatcher);
|
||||
consumed = true;
|
||||
}
|
||||
}
|
||||
|
||||
return consumed;
|
||||
}
|
||||
|
||||
void u2f_scene_error_on_exit(void* context) {
|
||||
U2fApp* app = context;
|
||||
widget_clear(app->widget);
|
||||
}
|
@@ -1,4 +1,5 @@
|
||||
#include "u2f_app_i.h"
|
||||
#include "u2f_data.h"
|
||||
#include <furi.h>
|
||||
#include <furi_hal.h>
|
||||
|
||||
@@ -39,11 +40,19 @@ U2fApp* u2f_app_alloc() {
|
||||
|
||||
view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
|
||||
|
||||
// Custom Widget
|
||||
app->widget = widget_alloc();
|
||||
view_dispatcher_add_view(app->view_dispatcher, U2fAppViewError, widget_get_view(app->widget));
|
||||
|
||||
app->u2f_view = u2f_view_alloc();
|
||||
view_dispatcher_add_view(
|
||||
app->view_dispatcher, U2fAppViewMain, u2f_view_get_view(app->u2f_view));
|
||||
|
||||
scene_manager_next_scene(app->scene_manager, U2fAppViewMain);
|
||||
if(u2f_data_check()) {
|
||||
scene_manager_next_scene(app->scene_manager, U2fSceneMain);
|
||||
} else {
|
||||
scene_manager_next_scene(app->scene_manager, U2fSceneError);
|
||||
}
|
||||
|
||||
return app;
|
||||
}
|
||||
@@ -55,6 +64,10 @@ void u2f_app_free(U2fApp* app) {
|
||||
view_dispatcher_remove_view(app->view_dispatcher, U2fAppViewMain);
|
||||
u2f_view_free(app->u2f_view);
|
||||
|
||||
// Custom Widget
|
||||
view_dispatcher_remove_view(app->view_dispatcher, U2fAppViewError);
|
||||
widget_free(app->widget);
|
||||
|
||||
// View dispatcher
|
||||
view_dispatcher_free(app->view_dispatcher);
|
||||
scene_manager_free(app->scene_manager);
|
||||
|
@@ -10,6 +10,7 @@
|
||||
#include <dialogs/dialogs.h>
|
||||
#include <notification/notification_messages.h>
|
||||
#include <gui/modules/variable_item_list.h>
|
||||
#include <gui/modules/widget.h>
|
||||
#include "views/u2f_view.h"
|
||||
#include "u2f_hid.h"
|
||||
#include "u2f.h"
|
||||
@@ -29,9 +30,12 @@ typedef enum {
|
||||
|
||||
U2fCustomEventConfirm,
|
||||
|
||||
U2fCustomEventErrorBack,
|
||||
|
||||
} GpioCustomEvent;
|
||||
|
||||
typedef enum {
|
||||
U2fAppViewError,
|
||||
U2fAppViewMain,
|
||||
} U2fAppView;
|
||||
|
||||
@@ -40,6 +44,7 @@ struct U2fApp {
|
||||
ViewDispatcher* view_dispatcher;
|
||||
SceneManager* scene_manager;
|
||||
NotificationApp* notifications;
|
||||
Widget* widget;
|
||||
osTimerId_t timer;
|
||||
U2fHid* u2f_hid;
|
||||
U2fView* u2f_view;
|
||||
|
@@ -38,6 +38,26 @@ typedef struct {
|
||||
uint32_t control;
|
||||
} __attribute__((packed)) U2fCounterData;
|
||||
|
||||
bool u2f_data_check() {
|
||||
bool state = false;
|
||||
Storage* fs_api = furi_record_open("storage");
|
||||
File* file = storage_file_alloc(fs_api);
|
||||
|
||||
if(storage_file_open(file, U2F_CERT_FILE, FSAM_READ, FSOM_OPEN_EXISTING)) {
|
||||
storage_file_close(file);
|
||||
if(storage_file_open(file, U2F_CERT_KEY_FILE, FSAM_READ, FSOM_OPEN_EXISTING)) {
|
||||
state = true;
|
||||
}
|
||||
}
|
||||
|
||||
storage_file_close(file);
|
||||
storage_file_free(file);
|
||||
|
||||
furi_record_close("storage");
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
bool u2f_data_cert_check() {
|
||||
bool state = false;
|
||||
Storage* fs_api = furi_record_open("storage");
|
||||
|
@@ -6,6 +6,8 @@ extern "C" {
|
||||
|
||||
#include <furi.h>
|
||||
|
||||
bool u2f_data_check();
|
||||
|
||||
bool u2f_data_cert_check();
|
||||
|
||||
uint32_t u2f_data_cert_load(uint8_t* cert);
|
||||
|
@@ -39,7 +39,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) {
|
||||
canvas, 128 / 2, 3, AlignCenter, AlignTop, "Authentication successfull!");
|
||||
} else if(model->display_msg == U2fMsgError) {
|
||||
canvas_draw_icon(canvas, 22, 15, &I_Error_62x31);
|
||||
canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Ceritficate missing");
|
||||
canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Ceritficate error");
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user