commit 9bd69c45ddfd21a85c0946c1513a36009d424f64
parent 8cb390792f19a1bebb0ce112dfeaff98c2bf8208
Author: Christian Grothoff <christian@grothoff.org>
Date: Wed, 29 Sep 2021 22:10:32 +0200
-fix totp issues
Diffstat:
4 files changed, 118 insertions(+), 4 deletions(-)
diff --git a/contrib/anastasis_gtk_challenge_code.glade b/contrib/anastasis_gtk_challenge_code.glade
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2
+<!-- Generated with glade 3.38.2
Copyright (C) 2019-2021 Anastasis SARL
@@ -233,7 +233,7 @@ Author: Christian Grothoff
<property name="width-chars">24</property>
<property name="text">A-</property>
<property name="primary-icon-stock">gtk-dialog-authentication</property>
- <property name="placeholder-text" translatable="yes">A-</property>
+ <property name="placeholder-text" translatable="no">A-</property>
<signal name="changed" handler="anastasis_gtk_c_code_dialog_answer_entry_changed_cb" swapped="no"/>
</object>
<packing>
diff --git a/contrib/anastasis_gtk_challenge_totp.glade b/contrib/anastasis_gtk_challenge_totp.glade
@@ -192,9 +192,7 @@ Author: Christian Grothoff
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="width-chars">24</property>
- <property name="text">A-</property>
<property name="primary-icon-stock">gtk-dialog-authentication</property>
- <property name="placeholder-text" translatable="yes">A-</property>
<signal name="changed" handler="anastasis_gtk_c_totp_dialog_answer_entry_changed_cb" swapped="no"/>
</object>
<packing>
diff --git a/src/anastasis/Makefile.am b/src/anastasis/Makefile.am
@@ -23,6 +23,7 @@ anastasis_gtk_SOURCES = \
anastasis-gtk_handle-challenge-iban.c \
anastasis-gtk_handle-challenge-row-activated.c \
anastasis-gtk_handle-challenge-question.c \
+ anastasis-gtk_handle-challenge-totp.c \
anastasis-gtk_handle-clear-secret-clicked.c \
anastasis-gtk_handle-continent-selected.c \
anastasis-gtk_handle-country-activated.c \
diff --git a/src/anastasis/anastasis-gtk_handle-challenge-totp.c b/src/anastasis/anastasis-gtk_handle-challenge-totp.c
@@ -0,0 +1,115 @@
+/*
+ This file is part of anastasis-gtk.
+ Copyright (C) 2021 Anastasis SARL
+
+ Anastasis is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ Anastasis 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
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Anastasis; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+/**
+ * @file src/anastasis/anastasis-gtk_handle-challenge-totp.c
+ * @brief Handle dialogs for code returned to challenge address (TOTP)
+ * @author Christian Grothoff
+ */
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include "anastasis-gtk_action.h"
+#include "anastasis-gtk_helper.h"
+#include "anastasis-gtk_handle-identity-changed.h"
+#include <jansson.h>
+
+
+/**
+ * Function called from the secure question challenge dialog upon completion.
+ *
+ * @param dialog the pseudonym selection dialog
+ * @param response_id response totp from the dialog
+ * @param user_data the builder of the dialog
+ */
+void
+anastasis_gtk_c_totp_dialog_response_cb (GtkDialog *dialog,
+ gint response_id,
+ gpointer user_data)
+{
+ GtkBuilder *builder = GTK_BUILDER (user_data);
+ GtkEntry *q;
+ const char *qs;
+ json_t *args;
+ unsigned long long pin;
+ char dummy;
+
+ if (GTK_RESPONSE_OK != response_id)
+ {
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+ g_object_unref (G_OBJECT (builder));
+ GNUNET_assert (NULL == AG_ra);
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
+ "back",
+ NULL,
+ &AG_action_cb,
+ NULL);
+ return;
+ }
+ q = GTK_ENTRY (gtk_builder_get_object (builder,
+ "anastasis_gtk_c_totp_entry"));
+ qs = gtk_entry_get_text (q);
+ if (1 != sscanf (qs,
+ "%llu%c",
+ &pin,
+ &dummy))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ args = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_uint64 ("pin",
+ pin));
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+ g_object_unref (G_OBJECT (builder));
+ AG_freeze ();
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
+ "solve_challenge",
+ args,
+ &AG_action_cb,
+ NULL);
+ json_decref (args);
+}
+
+
+void
+anastasis_gtk_c_totp_dialog_answer_entry_changed_cb (GtkEntry *entry,
+ gpointer user_data)
+{
+ GtkBuilder *builder = GTK_BUILDER (user_data);
+ GtkEntry *a;
+ const char *as;
+ unsigned int pin;
+ char dummy;
+ bool ok;
+
+ a = GTK_ENTRY (gtk_builder_get_object (builder,
+ "anastasis_gtk_c_totp_entry"));
+ as = gtk_entry_get_text (a);
+ ok = ( (NULL != as) &&
+ (6 == strlen (as)) &&
+ (1 == sscanf (as,
+ "%u%c",
+ &pin,
+ &dummy)) );
+ gtk_widget_set_sensitive (
+ GTK_WIDGET (gtk_builder_get_object (builder,
+ "anastasis_gtk_c_totp_dialog_btn_ok")),
+ ok);
+}
