Verified Commit 7aba0e6a authored by Iain Lane's avatar Iain Lane

gkm-mock: Also store objects in the order they are taken

With GLib 2.59, the `test-login-auto` test fails:

  Gcr-CRITICAL **: 14:34:24.126: expected prompt property 'choice-label'
  to be "Automatically unlock this keyring whenever I\342\200\231m
  logged in", but it is instead ""

This is because, in `mock_secret_C_Initialize()` we assign two sets of
fields to the mock module, one with `CKA_G_LOGIN_COLLECTION` → `CK_TRUE`
and one with it pointing to `CK_FALSE`.

This variable is used to decide, via `is_login_keyring()`, whether to call
`setup_unlock_keyring_login()` or `setup_unlock_keyring_other()`. The
first one sets `choice-label` to the empty string. The second one is
what we want, and upgrading GLib made it flip.

The reason is the same as the previous two fixes: the mock-secret-store
expects to be able to insert items into a hash table and then iterate it
and get them out in the same order. That was never guaranteed, and now
doesn't happen.

Let's keep a parallel list which keeps track of the order things were
added. And then instead of iterating the hash table, we iterate this
list.

Closes #21
parent 3091bf66
Pipeline #54748 passed with stages
in 24 minutes and 44 seconds
......@@ -72,6 +72,7 @@ typedef struct _Session {
static guint unique_identifier = 100;
static GHashTable *the_sessions = NULL;
static GHashTable *the_objects = NULL;
static GSList *the_objects_list = NULL;
static GArray *the_credential_template = NULL;
enum {
......@@ -102,6 +103,39 @@ lookup_object (Session *session, CK_OBJECT_HANDLE hObject)
return attrs;
}
typedef struct {
guint handle;
GArray *template; /* owned by the_objects */
} ObjectData;
static gint
list_find_handle (gconstpointer l, gconstpointer r)
{
guint handle;
ObjectData *item;
handle = GPOINTER_TO_UINT (r);
item = (ObjectData *) l;
if (item->handle == handle)
return 0;
return -1;
}
static void
insert_template (guint handle, GArray *template)
{
ObjectData *data;
data = g_new0 (ObjectData, 1);
data->handle = handle;
data->template = template;
g_hash_table_insert (the_objects, GUINT_TO_POINTER (handle), template);
the_objects_list = g_slist_append (the_objects_list, data);
}
CK_OBJECT_HANDLE
gkm_mock_module_take_object (GArray *template)
{
......@@ -115,7 +149,7 @@ gkm_mock_module_take_object (GArray *template)
g_return_val_if_fail (token == TRUE, 0);
else
gkm_template_set_boolean (template, CKA_TOKEN, CK_TRUE);
g_hash_table_insert (the_objects, GUINT_TO_POINTER (handle), template);
insert_template (handle, template);
return handle;
}
......@@ -127,14 +161,16 @@ gkm_mock_module_enumerate_objects (CK_SESSION_HANDLE handle, GkmMockEnumerator f
gpointer key;
gpointer value;
Session *session;
ObjectData *data;
GSList *l = NULL;
g_assert (the_objects);
g_assert (func);
/* Token objects */
g_hash_table_iter_init (&iter, the_objects);
while (g_hash_table_iter_next (&iter, &key, &value)) {
if (!(func) (GPOINTER_TO_UINT (key), value, user_data))
for (l = the_objects_list; l != NULL; l = l->next) {
data = (ObjectData *) l->data;
if (!(func) (data->handle, data->template, user_data))
return;
}
......@@ -267,7 +303,7 @@ gkm_mock_C_Initialize (CK_VOID_PTR pInitArgs)
attrs = gkm_template_new (NULL, 0);
gkm_template_set_ulong (attrs, CKA_CLASS, CKO_DATA);
gkm_template_set_string (attrs, CKA_LABEL, "TEST LABEL");
g_hash_table_insert (the_objects, GUINT_TO_POINTER (2), attrs);
insert_template (2, attrs);
/* Private capitalize key */
value = CKM_MOCK_CAPITALIZE;
......@@ -282,7 +318,7 @@ gkm_mock_C_Initialize (CK_VOID_PTR pInitArgs)
gkm_template_set_boolean (attrs, CKA_DERIVE, CK_TRUE);
gkm_template_set_string (attrs, CKA_VALUE, "value");
gkm_template_set_string (attrs, CKA_GNOME_UNIQUE, "unique1");
g_hash_table_insert (the_objects, GUINT_TO_POINTER (PRIVATE_KEY_CAPITALIZE), attrs);
insert_template (PRIVATE_KEY_CAPITALIZE, attrs);
/* Public capitalize key */
value = CKM_MOCK_CAPITALIZE;
......@@ -294,7 +330,7 @@ gkm_mock_C_Initialize (CK_VOID_PTR pInitArgs)
gkm_template_set_boolean (attrs, CKA_PRIVATE, CK_FALSE);
gkm_template_set_string (attrs, CKA_VALUE, "value");
gkm_template_set_string (attrs, CKA_GNOME_UNIQUE, "unique2");
g_hash_table_insert (the_objects, GUINT_TO_POINTER (PUBLIC_KEY_CAPITALIZE), attrs);
insert_template (PUBLIC_KEY_CAPITALIZE, attrs);
/* Private prefix key */
value = CKM_MOCK_PREFIX;
......@@ -307,7 +343,7 @@ gkm_mock_C_Initialize (CK_VOID_PTR pInitArgs)
gkm_template_set_boolean (attrs, CKA_ALWAYS_AUTHENTICATE, CK_TRUE);
gkm_template_set_string (attrs, CKA_VALUE, "value");
gkm_template_set_string (attrs, CKA_GNOME_UNIQUE, "unique3");
g_hash_table_insert (the_objects, GUINT_TO_POINTER (PRIVATE_KEY_PREFIX), attrs);
insert_template (PRIVATE_KEY_PREFIX, attrs);
/* Private prefix key */
value = CKM_MOCK_PREFIX;
......@@ -319,7 +355,7 @@ gkm_mock_C_Initialize (CK_VOID_PTR pInitArgs)
gkm_template_set_boolean (attrs, CKA_PRIVATE, CK_FALSE);
gkm_template_set_string (attrs, CKA_VALUE, "value");
gkm_template_set_string (attrs, CKA_GNOME_UNIQUE, "unique4");
g_hash_table_insert (the_objects, GUINT_TO_POINTER (PUBLIC_KEY_PREFIX), attrs);
insert_template (PUBLIC_KEY_PREFIX, attrs);
initialized = TRUE;
return CKR_OK;
......@@ -336,6 +372,9 @@ gkm_mock_C_Finalize (CK_VOID_PTR pReserved)
g_hash_table_destroy (the_objects);
the_objects = NULL;
g_slist_free_full (the_objects_list, g_free);
the_objects_list = NULL;
g_hash_table_destroy (the_sessions);
the_sessions = NULL;
......@@ -802,7 +841,7 @@ gkm_mock_C_CreateObject (CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate,
*phObject = ++unique_identifier;
if (gkm_template_find_boolean (attrs, CKA_TOKEN, &token) && token)
g_hash_table_insert (the_objects, GUINT_TO_POINTER (*phObject), attrs);
insert_template (*phObject, attrs);
else
g_hash_table_insert (session->objects, GUINT_TO_POINTER (*phObject), attrs);
......@@ -822,6 +861,7 @@ gkm_mock_C_DestroyObject (CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject)
{
GArray *attrs;
Session *session;
GSList *list;
gboolean priv;
session = g_hash_table_lookup (the_sessions, GUINT_TO_POINTER (hSession));
......@@ -836,6 +876,13 @@ gkm_mock_C_DestroyObject (CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject)
}
g_hash_table_remove (the_objects, GUINT_TO_POINTER (hObject));
do {
list = g_slist_find_custom (the_objects_list, GUINT_TO_POINTER (hObject), list_find_handle);
if (list != NULL) {
g_free (list->data);
the_objects_list = g_slist_delete_link (the_objects_list, list);
}
} while (list != NULL);
g_hash_table_remove (session->objects, GUINT_TO_POINTER (hObject));
return CKR_OK;
......
......@@ -244,8 +244,7 @@ gkm_secret_fields_serialize (CK_ATTRIBUTE_PTR attr,
attr->ulValueLen += strlen (schema_name);
attr->ulValueLen += 2;
}
if (keys != NULL)
g_list_free (keys);
g_list_free (keys);
return CKR_OK;
}
......@@ -269,7 +268,6 @@ gkm_secret_fields_serialize (CK_ATTRIBUTE_PTR attr,
rv = gkm_attribute_set_data (attr, result->str, result->len);
g_string_free (result, TRUE);
if (keys != NULL)
g_list_free (keys);
return rv;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment