Changed member Autoz's "rule" from GList to GHashTable.

diff --git a/src/autoz.c b/src/autoz.c
index d4556e37702ebdc909372438ef7fa6b9ae3e9270..f4070bb9def949cdb26dbf59430a1b044a38fa4a 100644 (file)
--- a/src/autoz.c
+++ b/src/autoz.c
@@ -65,7 +65,7 @@ struct _AutozPrivate
                GHashTable *roles;
                GHashTable *resources;
 
-               GList *rules;
+               GHashTable *rules;
        };
 
 G_DEFINE_TYPE (Autoz, autoz, G_TYPE_OBJECT)
@@ -89,7 +89,7 @@ autoz_init (Autoz *autoz)
        priv->roles = g_hash_table_new (g_str_hash, g_str_equal);
        priv->resources = g_hash_table_new (g_str_hash, g_str_equal);
 
-       priv->rules = NULL;
+       priv->rules = g_hash_table_new (g_str_hash, g_str_equal);
 }
 
 /**
@@ -175,7 +175,9 @@ autoz_allow (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource)
        Role *role;
        Resource *resource;
 
-       Rule r;
+       Rule *r;
+
+       gchar *str_id;
 
        /* check if exists */
        role = g_hash_table_lookup (priv->roles, autoz_irole_get_role_id (irole));
@@ -184,18 +186,28 @@ autoz_allow (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource)
                        return;
                }
 
+       /* TODO accept also NULL resource (equal to allow to every resource) */
        resource = g_hash_table_lookup (priv->resources, autoz_iresource_get_resource_id (iresource));
        if (resource == NULL)
                {
                        return;
                }
 
-       r.role = role;
-       r.resource = resource;
+       r = (Rule *)g_malloc0 (sizeof (Rule));
+       r->role = role;
+       r->resource = resource;
 
-       priv->rules = g_list_append (priv->rules, g_memdup (&r, sizeof (Rule)));
-}
+       str_id = g_strconcat (autoz_irole_get_role_id (r->role->irole),
+                             "|",
+                             autoz_iresource_get_resource_id (r->resource->iresource),
+                             NULL);
 
+       if (g_hash_table_lookup (priv->rules, str_id) == NULL)
+               {
+                       g_hash_table_insert (priv->rules, str_id, r);
+               }
+}
+       
 gboolean
 autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource)
 {
@@ -204,8 +216,7 @@ autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource)
        Role *role;
        Resource *resource;
 
-       GList *rules;
-       Rule *r;
+       gchar *str_id;
 
        AutozPrivate *priv = AUTOZ_GET_PRIVATE (autoz);
 
@@ -222,21 +233,14 @@ autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource)
                        return ret;
                }
 
-       rules = g_list_first (priv->rules);
-       while (rules != NULL)
-               {
-                       r = (Rule *)rules->data;
-
-                       if (g_strcmp0 (autoz_irole_get_role_id (role->irole), autoz_irole_get_role_id (r->role->irole)) == 0)
-                               {
-                                       if (g_strcmp0 (autoz_iresource_get_resource_id (resource->iresource), autoz_iresource_get_resource_id (r->resource->iresource)) == 0)
-                                               {
-                                                       ret = TRUE;
-                                                       break;
-                                               }
-                               }
+       str_id = g_strconcat (autoz_irole_get_role_id (role->irole),
+                             "|",
+                             autoz_iresource_get_resource_id (resource->iresource),
+                             NULL);
 
-                       rules = g_list_next (rules);
+       if (g_hash_table_lookup (priv->rules, str_id) != NULL)
+               {
+                       ret = TRUE;
                }
 
        return ret;

diff --git a/tests/test.c b/tests/test.c
index 9da593db1dc08d5af7a4b45284fe68939d6eb23e..e8597e25abb4fb848ea6140e4770e5740fd483ff 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -36,7 +36,7 @@ main (int argc, char **argv)
        role_writer = autoz_role_new ("writer");
        autoz_add_role (autoz, AUTOZ_IROLE (role_writer));
 
-       role_writer_child = autoz_role_new ("writer_child");
+       role_writer_child = autoz_role_new ("writer-child");
        autoz_add_role_with_parents (autoz, AUTOZ_IROLE (role_writer_child), AUTOZ_IROLE (role_writer), NULL);
 
        role_read_only = autoz_role_new ("read-only");
@@ -47,14 +47,12 @@ main (int argc, char **argv)
 
        autoz_allow (autoz, AUTOZ_IROLE (role_writer), AUTOZ_IRESOURCE (resource));
 
-       if (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer), AUTOZ_IRESOURCE (resource)))
-               {
-                       g_message ("writer allowed to page.");
-               }
-       if (!autoz_is_allowed (autoz, AUTOZ_IROLE (role_read_only), AUTOZ_IRESOURCE (resource)))
-               {
-                       g_message ("read-only not allowed to page.");
-               }
+       g_message ("writer %s allowed to page.",
+                  (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer), AUTOZ_IRESOURCE (resource)) ? "is" : "isn't"));
+       g_message ("writer-child %s allowed to page.",
+                  (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer_child), AUTOZ_IRESOURCE (resource)) ? "is" : "isn't"));
+       g_message ("read-only %s allowed to page.",
+                  (autoz_is_allowed (autoz, AUTOZ_IROLE (role_read_only), AUTOZ_IRESOURCE (resource)) ? "is" : "isn't"));
 
        return 0;
 }