From fd2f458abac21ceefa55468e1cb072ed16224a8e Mon Sep 17 00:00:00 2001 From: Cyrille Bagard Date: Mon, 10 Feb 2025 23:45:51 +0100 Subject: Track secret storage lock updates in the status bar. --- data/images/locked-symbolic.svg | 62 ++++++++++++++++++++++ data/images/nolock-symbolic.svg | 70 +++++++++++++++++++++++++ data/images/unlocked-symbolic.svg | 62 ++++++++++++++++++++++ src/glibext/secstorage-int.h | 4 ++ src/glibext/secstorage.c | 10 +++- src/gtkext/Makefile.am | 8 ++- src/gtkext/gresource.xml | 5 ++ src/gtkext/statusstack-int.h | 4 ++ src/gtkext/statusstack.c | 56 ++++++++++++++++++++ src/gtkext/statusstack.ui | 15 ++++++ src/schemas/re.chrysalide.framework.gschema.xml | 38 +++++++++----- 11 files changed, 318 insertions(+), 16 deletions(-) create mode 100644 data/images/locked-symbolic.svg create mode 100644 data/images/nolock-symbolic.svg create mode 100644 data/images/unlocked-symbolic.svg diff --git a/data/images/locked-symbolic.svg b/data/images/locked-symbolic.svg new file mode 100644 index 0000000..1b24147 --- /dev/null +++ b/data/images/locked-symbolic.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + diff --git a/data/images/nolock-symbolic.svg b/data/images/nolock-symbolic.svg new file mode 100644 index 0000000..ed59858 --- /dev/null +++ b/data/images/nolock-symbolic.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + diff --git a/data/images/unlocked-symbolic.svg b/data/images/unlocked-symbolic.svg new file mode 100644 index 0000000..da7b6ac --- /dev/null +++ b/data/images/unlocked-symbolic.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + diff --git a/src/glibext/secstorage-int.h b/src/glibext/secstorage-int.h index 310fbbc..bbac133 100644 --- a/src/glibext/secstorage-int.h +++ b/src/glibext/secstorage-int.h @@ -45,6 +45,10 @@ struct _GSecretStorageClass { GObjectClass parent; /* A laisser en premier */ + /* Signaux */ + + void (* lock_update) (GSecretStorage *); + }; diff --git a/src/glibext/secstorage.c b/src/glibext/secstorage.c index 84fc10c..ed2e4e6 100644 --- a/src/glibext/secstorage.c +++ b/src/glibext/secstorage.c @@ -111,6 +111,14 @@ static void g_secret_storage_class_init(GSecretStorageClass *klass) object->dispose = g_secret_storage_dispose; object->finalize = g_secret_storage_finalize; + g_signal_new("lock-update", + G_TYPE_SECRET_STORAGE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GSecretStorageClass, lock_update), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + } @@ -237,7 +245,7 @@ bool g_secret_storage_create(GSecretStorage *storage, GSettings *settings) storage->settings = settings; } else - result = false; // TODO + storage->settings = g_settings_new("re.chrysalide.framework.secstorage"); return result; diff --git a/src/gtkext/Makefile.am b/src/gtkext/Makefile.am index 4590aa6..cf1f057 100644 --- a/src/gtkext/Makefile.am +++ b/src/gtkext/Makefile.am @@ -26,10 +26,16 @@ libgtkext_la_LIBADD = \ libgtkext_la_CFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) +IMG_PATH = ../../data/images + RES_FILES = \ hexview.css \ hexview.ui \ - statusstack.ui + statusstack.ui \ + $(IMG_PATH)/nolock-symbolic.svg \ + $(IMG_PATH)/locked-symbolic.svg \ + $(IMG_PATH)/unlocked-symbolic.svg \ + tweak.ui libgtkext4_la_SOURCES = \ area-int.h \ diff --git a/src/gtkext/gresource.xml b/src/gtkext/gresource.xml index 3bfd8c5..6de48f6 100644 --- a/src/gtkext/gresource.xml +++ b/src/gtkext/gresource.xml @@ -5,4 +5,9 @@ hexview.ui statusstack.ui + + ../../data/images/nolock-symbolic.svg + ../../data/images/locked-symbolic.svg + ../../data/images/unlocked-symbolic.svg + diff --git a/src/gtkext/statusstack-int.h b/src/gtkext/statusstack-int.h index facc5af..2a9e99e 100644 --- a/src/gtkext/statusstack-int.h +++ b/src/gtkext/statusstack-int.h @@ -26,6 +26,7 @@ #include "statusstack.h" +#include "../glibext/secstorage.h" @@ -70,6 +71,9 @@ struct _GtkStatusStack /* Tronc commun */ + GSecretStorage *storage; /* Stockage des secrets */ + GtkToggleButton *lock_update; /* Activation des accès */ + GtkLabel *net_recv_speed; /* Débit en réception */ GtkLabel *net_send_speed; /* Débit en émission */ diff --git a/src/gtkext/statusstack.c b/src/gtkext/statusstack.c index 0d8ef62..1b558ba 100644 --- a/src/gtkext/statusstack.c +++ b/src/gtkext/statusstack.c @@ -53,6 +53,9 @@ static void gtk_status_stack_dispose(GtkStatusStack *); /* Procède à la libération totale de la mémoire. */ static void gtk_status_stack_finalize(GtkStatusStack *); +/* Note le changement de verrouillage du stockage sécurisé. */ +static void gtk_status_stack_on_secret_storage_lock_update(GSecretStorage *, GtkStatusStack *); + /* Met à jour dans la barre les débits réseau observés. */ static gboolean gtk_status_stack_update_network_stats(GtkStatusStack *); @@ -190,6 +193,8 @@ static void gtk_status_stack_class_init(GtkStatusStackClass *class) gtk_widget_class_bind_template_child(widget, GtkStatusStack, activity_message); gtk_widget_class_bind_template_child(widget, GtkStatusStack, activity_progress); + gtk_widget_class_bind_template_child(widget, GtkStatusStack, lock_update); + gtk_widget_class_bind_template_child(widget, GtkStatusStack, net_recv_speed); gtk_widget_class_bind_template_child(widget, GtkStatusStack, net_send_speed); @@ -220,6 +225,17 @@ static void gtk_status_stack_init(GtkStatusStack *stack) stack->activity_info = calloc(1, sizeof(activity_info_t)); init_activity_info(stack->activity_info); + /* Suivi des évolutions relatives au stockage sécurisé */ + + stack->storage = get_secret_storage(); + + g_signal_connect(stack->storage, "lock-update", + G_CALLBACK(gtk_status_stack_on_secret_storage_lock_update), stack); + + gtk_status_stack_on_secret_storage_lock_update(stack->storage, stack); + + /* Suivi des débits de connexion */ + stack->next_index = 0; stack->network_update_tag = g_timeout_add(NETWORK_UPDATE_INTERVAL, @@ -242,6 +258,12 @@ static void gtk_status_stack_init(GtkStatusStack *stack) static void gtk_status_stack_dispose(GtkStatusStack *stack) { + if (stack->storage != NULL) + g_signal_handlers_disconnect_by_func(stack->storage, + gtk_status_stack_on_secret_storage_lock_update, stack); + + g_clear_object(&stack->storage); + g_source_remove(stack->network_update_tag); gtk_widget_dispose_template(GTK_WIDGET(stack), GTK_TYPE_STATUS_STACK); @@ -322,6 +344,40 @@ void gtk_status_stack_reset(GtkStatusStack *stack) /****************************************************************************** * * +* Paramètres : storage = gardien des secrets impliqué. * + window = fenêtre dont la barre de statut est à actualiser. * +* * +* Description : Note le changement de verrouillage du stockage sécurisé. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +static void gtk_status_stack_on_secret_storage_lock_update(GSecretStorage *storage, GtkStatusStack *stack) +{ + if (!g_secret_storage_has_key(stack->storage)) + { + gtk_widget_set_sensitive(GTK_WIDGET(stack->lock_update), false); + gtk_button_set_icon_name(GTK_BUTTON(stack->lock_update), "nolock-symbolic"); + } + else + { + gtk_widget_set_sensitive(GTK_WIDGET(stack->lock_update), true); + + if (g_secret_storage_is_locked(stack->storage)) + gtk_button_set_icon_name(GTK_BUTTON(stack->lock_update), "locked-symbolic"); + else + gtk_button_set_icon_name(GTK_BUTTON(stack->lock_update), "unlocked-symbolic"); + + } + +} + + +/****************************************************************************** +* * * Paramètres : stack = barre de statut à actualiser. * * * * Description : Met à jour dans la barre les débits réseau observés. * diff --git a/src/gtkext/statusstack.ui b/src/gtkext/statusstack.ui index 422f95d..8469e6e 100644 --- a/src/gtkext/statusstack.ui +++ b/src/gtkext/statusstack.ui @@ -1,3 +1,4 @@ +