From: Andrea Zagli Date: Tue, 31 Aug 2010 08:20:22 +0000 (+0200) Subject: Added functions Autoz::role_is_child and Autoz::resource_is_child. X-Git-Tag: 0.0.1~1 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=e1a0b73cd842c65283ce2e223578ef5f083ac360;p=zakautho%2Flibzakautho Added functions Autoz::role_is_child and Autoz::resource_is_child. Added parameter "exclude_null" to Autoz::is_allowed to exclude roles that are allowed to every resource. --- diff --git a/docs/reference/autoz-decl-list.txt b/docs/reference/autoz-decl-list.txt index 0cbb355..f40c403 100644 --- a/docs/reference/autoz-decl-list.txt +++ b/docs/reference/autoz-decl-list.txt @@ -75,11 +75,13 @@ autoz_add_role autoz_add_role_with_parents autoz_add_parent_to_role autoz_add_parents_to_role +autoz_role_is_child autoz_get_role_from_id autoz_add_resource autoz_add_resource_with_parents autoz_add_parent_to_resource autoz_add_parents_to_resource +autoz_resource_is_child autoz_get_resource_from_id autoz_allow autoz_deny diff --git a/docs/reference/autoz-decl.txt b/docs/reference/autoz-decl.txt index 31bb465..5020b46 100644 --- a/docs/reference/autoz-decl.txt +++ b/docs/reference/autoz-decl.txt @@ -73,6 +73,11 @@ Autoz *autoz, AutozIRole *irole, AutozIRole *irole_parent Autoz *autoz, AutozIRole *irole, ... +autoz_role_is_child +gboolean +Autoz *autoz, AutozIRole *irole, AutozIRole *irole_parent + + autoz_get_role_from_id AutozIRole * Autoz *autoz, const gchar *role_id @@ -98,6 +103,11 @@ Autoz *autoz, AutozIResource *iresource, AutozIResource *iresource_parent Autoz *autoz, AutozIResource *iresource, ... +autoz_resource_is_child +gboolean +Autoz *autoz, AutozIResource *iresource, AutozIResource *iresource_parent + + autoz_get_resource_from_id AutozIResource * Autoz *autoz, const gchar *resource_id @@ -115,7 +125,7 @@ Autoz *autoz, AutozIRole *irole, AutozIResource *iresource autoz_is_allowed gboolean -Autoz *autoz, AutozIRole *irole, AutozIResource *iresource +Autoz *autoz, AutozIRole *irole, AutozIResource *iresource, gboolean exclude_null autoz_clear diff --git a/docs/reference/autoz-undeclared.txt b/docs/reference/autoz-undeclared.txt new file mode 100644 index 0000000..e69de29 diff --git a/docs/reference/autoz-undocumented.txt b/docs/reference/autoz-undocumented.txt new file mode 100644 index 0000000..945bc29 --- /dev/null +++ b/docs/reference/autoz-undocumented.txt @@ -0,0 +1,59 @@ +2% symbol docs coverage. +1 symbols documented. +5 symbols incomplete. +51 not documented. + + +AUTOZ +AUTOZ_CLASS +AUTOZ_GET_CLASS +Autoz +AutozClass () +AutozIResource +AutozIResourceIface () +AutozIRole +AutozIRoleIface () +AutozResource +AutozResourceClass () +AutozRole +AutozRoleClass () +IS_AUTOZ +IS_AUTOZ_CLASS +TYPE_AUTOZ +autoz_add_parent_to_resource +autoz_add_parent_to_role +autoz_add_parents_to_resource +autoz_add_parents_to_role +autoz_add_resource +autoz_add_resource_with_parents +autoz_add_role +autoz_add_role_with_parents +autoz_allow +autoz_clear +autoz_deny +autoz_get_resource_from_id +autoz_get_role_from_id +autoz_get_type +autoz_get_xml +autoz_iresource_get_resource_id +autoz_irole_get_role_id +autoz_is_allowed +autoz_load_fro_xml +autoz_load_from_db +autoz_new +autoz_resource_is_child +autoz_resource_new +autoz_role_is_child +autoz_role_new +autoz_save_to_db + + +autoz:Short_Description +resource:Long_Description +resource:Short_Description +resource_interface:Long_Description +resource_interface:Short_Description +role:Long_Description +role:Short_Description +role_interface:Long_Description +role_interface:Short_Description diff --git a/docs/reference/autoz-unused.txt b/docs/reference/autoz-unused.txt new file mode 100644 index 0000000..a3dce13 --- /dev/null +++ b/docs/reference/autoz-unused.txt @@ -0,0 +1,12 @@ +autoz_add_parent_to_resource +autoz_add_parent_to_role +autoz_add_parents_to_resource +autoz_add_parents_to_role +autoz_clear +autoz_deny +autoz_get_xml +autoz_load_from_db +autoz_load_from_xml +autoz_resource_is_child +autoz_role_is_child +autoz_save_to_db diff --git a/docs/reference/autoz.args b/docs/reference/autoz.args new file mode 100644 index 0000000..e69de29 diff --git a/docs/reference/autoz.hierarchy b/docs/reference/autoz.hierarchy new file mode 100644 index 0000000..c92c2ab --- /dev/null +++ b/docs/reference/autoz.hierarchy @@ -0,0 +1,8 @@ +GObject + Autoz + AutozResource + AutozRole +GInterface + GTypePlugin + AutozIResource + AutozIRole diff --git a/docs/reference/autoz.interfaces b/docs/reference/autoz.interfaces new file mode 100644 index 0000000..642b295 --- /dev/null +++ b/docs/reference/autoz.interfaces @@ -0,0 +1,2 @@ +AutozResource AutozIResource +AutozRole AutozIRole diff --git a/docs/reference/autoz.prerequisites b/docs/reference/autoz.prerequisites new file mode 100644 index 0000000..8b67f96 --- /dev/null +++ b/docs/reference/autoz.prerequisites @@ -0,0 +1,2 @@ +AutozIResource GObject +AutozIRole GObject diff --git a/docs/reference/autoz.signals b/docs/reference/autoz.signals new file mode 100644 index 0000000..e69de29 diff --git a/docs/reference/tmpl/autoz.sgml b/docs/reference/tmpl/autoz.sgml index 2b5281e..edf7356 100644 --- a/docs/reference/tmpl/autoz.sgml +++ b/docs/reference/tmpl/autoz.sgml @@ -174,6 +174,7 @@ Autoz @autoz: @irole: @iresource: +@exclude_null: @Returns: diff --git a/src/autoz.c b/src/autoz.c index dba3689..84cb842 100644 --- a/src/autoz.c +++ b/src/autoz.c @@ -58,7 +58,7 @@ typedef enum AutozIsAllowed static void autoz_class_init (AutozClass *class); static void autoz_init (Autoz *autoz); -static AutozIsAllowed _autoz_is_allowed_role (Autoz *autoz, Role *role, Resource *resource); +static AutozIsAllowed _autoz_is_allowed_role (Autoz *autoz, Role *role, Resource *resource, gboolean exclude_null); static AutozIsAllowed _autoz_is_allowed_resource (Autoz *autoz, Role *role, Resource *resource); static gboolean _autoz_delete_table_content (GdaConnection *gdacon, const gchar *table_prefix); @@ -273,6 +273,63 @@ autoz_add_parents_to_role (Autoz *autoz, AutozIRole *irole, ...) } } +/** + * autoz_role_is_child: + * @autoz: an #Autoz object. + * @irole: an #AutozIRole object. + * @irole_parent: an #AutozIRole object. + * + * Returns: #TRUE if @irole is a @irole_parent's child; #FALSE otherwise. + */ +gboolean +autoz_role_is_child (Autoz *autoz, AutozIRole *irole, AutozIRole *irole_parent) +{ + AutozPrivate *priv; + gboolean ret; + + Role *role; + Role *role_parent; + const gchar *role_id_parent; + GList *parent; + + g_return_val_if_fail (IS_AUTOZ (autoz), FALSE); + g_return_val_if_fail (AUTOZ_IS_IROLE (irole), FALSE); + g_return_val_if_fail (AUTOZ_IS_IROLE (irole_parent), FALSE); + + ret = FALSE; + priv = AUTOZ_GET_PRIVATE (autoz); + + role = g_hash_table_lookup (priv->roles, autoz_irole_get_role_id (irole)); + if (role == NULL) + { + g_warning ("Role «%s» not found.", autoz_irole_get_role_id (irole)); + return ret; + } + role_id_parent = autoz_irole_get_role_id (irole_parent); + role_parent = g_hash_table_lookup (priv->roles, role_id_parent); + if (role_parent == NULL) + { + g_warning ("Role parent «%s» not found.", role_id_parent); + return ret; + } + + parent = g_list_first (role->parents); + while (parent != NULL) + { + /* TODO recursion */ + role_parent = (Role *)parent->data; + if (g_strcmp0 (role_id_parent, autoz_irole_get_role_id (role_parent->irole)) == 0) + { + ret = TRUE; + break; + } + + parent = g_list_next (parent); + } + + return ret; +} + /** * autoz_get_role_from_id: * @autoz: an #Autoz object. @@ -378,8 +435,8 @@ autoz_add_resource_with_parents (Autoz *autoz, AutozIResource *iresource, ...) /** * autoz_add_parent_to_resource: * @autoz: an #Autoz object. - * @iresource: - * @iresource_parent: + * @iresource: an #AutozIResource object. + * @iresource_parent: an #AutozIResource object. * */ void @@ -449,6 +506,63 @@ autoz_add_parents_to_resource (Autoz *autoz, AutozIResource *iresource, ...) } } +/** + * autoz_resource_is_child: + * @autoz: an #Autoz object. + * @iresource: an #AutozIResource object. + * @iresource_parent: an #AutozIResource object. + * + * Returns: #TRUE if @iresource is a @iresource_parent's child; #FALSE otherwise. + */ +gboolean +autoz_resource_is_child (Autoz *autoz, AutozIResource *iresource, AutozIResource *iresource_parent) +{ + AutozPrivate *priv; + gboolean ret; + + Resource *resource; + Resource *resource_parent; + const gchar *resource_id_parent; + GList *parent; + + g_return_val_if_fail (IS_AUTOZ (autoz), FALSE); + g_return_val_if_fail (AUTOZ_IS_IRESOURCE (iresource), FALSE); + g_return_val_if_fail (AUTOZ_IS_IRESOURCE (iresource_parent), FALSE); + + ret = FALSE; + priv = AUTOZ_GET_PRIVATE (autoz); + + resource = g_hash_table_lookup (priv->resources, autoz_iresource_get_resource_id (iresource)); + if (resource == NULL) + { + g_warning ("Resource «%s» not found.", autoz_iresource_get_resource_id (iresource)); + return ret; + } + resource_id_parent = autoz_iresource_get_resource_id (iresource_parent); + resource_parent = g_hash_table_lookup (priv->resources, resource_id_parent); + if (resource_parent == NULL) + { + g_warning ("Resource parent «%s» not found.", resource_id_parent); + return ret; + } + + parent = g_list_first (resource->parents); + while (parent != NULL) + { + /* TODO recursion */ + resource_parent = (Resource *)parent->data; + if (g_strcmp0 (resource_id_parent, autoz_iresource_get_resource_id (resource_parent->iresource)) == 0) + { + ret = TRUE; + break; + } + + parent = g_list_next (parent); + } + + return ret; +} + /** * autoz_get_resource_from_id: * @autoz: an #Autoz object. @@ -602,7 +716,7 @@ autoz_deny (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) } static AutozIsAllowed -_autoz_is_allowed_role (Autoz *autoz, Role *role, Resource *resource) +_autoz_is_allowed_role (Autoz *autoz, Role *role, Resource *resource, gboolean exclude_null) { AutozIsAllowed ret; @@ -612,20 +726,23 @@ _autoz_is_allowed_role (Autoz *autoz, Role *role, Resource *resource) ret = AUTOZ_NOT_FOUND; - /* first trying for a rule for every resource */ - str_id = g_strconcat (autoz_irole_get_role_id (role->irole), - "|NULL", - NULL); - - if (g_hash_table_lookup (priv->rules_deny, str_id) != NULL) + if (!exclude_null) { - ret = AUTOZ_DENIED; - return ret; - } - if (g_hash_table_lookup (priv->rules_allow, str_id) != NULL) - { - ret = AUTOZ_ALLOWED; - return ret; + /* first trying for a rule for every resource */ + str_id = g_strconcat (autoz_irole_get_role_id (role->irole), + "|NULL", + NULL); + + if (g_hash_table_lookup (priv->rules_deny, str_id) != NULL) + { + ret = AUTOZ_DENIED; + return ret; + } + if (g_hash_table_lookup (priv->rules_allow, str_id) != NULL) + { + ret = AUTOZ_ALLOWED; + return ret; + } } /* and after for specific resource */ @@ -671,7 +788,7 @@ _autoz_is_allowed_role (Autoz *autoz, Role *role, Resource *resource) parents = g_list_first (role->parents); while (parents != NULL) { - ret = _autoz_is_allowed_role (autoz, (Role *)parents->data, resource); + ret = _autoz_is_allowed_role (autoz, (Role *)parents->data, resource, exclude_null); if (ret != AUTOZ_NOT_FOUND) { break; @@ -734,12 +851,13 @@ _autoz_is_allowed_resource (Autoz *autoz, Role *role, Resource *resource) /** * autoz_is_allowed: * @autoz: an #Autoz object. - * @irole: - * @iresource: + * @irole: an #AutozIRole object. + * @iresource: an #AutozIResource object. + * @exclude_null: whether or not to exclude roles allowed to every resource. * */ gboolean -autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) +autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource, gboolean exclude_null) { gboolean ret; AutozIsAllowed isAllowed; @@ -772,20 +890,23 @@ autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) return ret; } - /* first trying for a rule for every resource */ - str_id = g_strconcat (autoz_irole_get_role_id (role->irole), - "|NULL", - NULL); - - if (g_hash_table_lookup (priv->rules_deny, str_id) != NULL) + if (!exclude_null) { - ret = FALSE; - return ret; - } - if (g_hash_table_lookup (priv->rules_allow, str_id) != NULL) - { - ret = TRUE; - return ret; + /* first trying for a rule for every resource */ + str_id = g_strconcat (autoz_irole_get_role_id (role->irole), + "|NULL", + NULL); + + if (g_hash_table_lookup (priv->rules_deny, str_id) != NULL) + { + ret = FALSE; + return ret; + } + if (g_hash_table_lookup (priv->rules_allow, str_id) != NULL) + { + ret = TRUE; + return ret; + } } /* and after for specific resource */ @@ -837,7 +958,7 @@ autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) parents = g_list_first (role->parents); while (parents != NULL) { - isAllowed = _autoz_is_allowed_role (autoz, (Role *)parents->data, resource); + isAllowed = _autoz_is_allowed_role (autoz, (Role *)parents->data, resource, exclude_null); if (isAllowed == AUTOZ_DENIED) { ret = FALSE; diff --git a/src/autoz.h b/src/autoz.h index a1cbd4c..0beaf67 100644 --- a/src/autoz.h +++ b/src/autoz.h @@ -63,6 +63,8 @@ void autoz_add_role_with_parents (Autoz *autoz, AutozIRole *irole, ...); void autoz_add_parent_to_role (Autoz *autoz, AutozIRole *irole, AutozIRole *irole_parent); void autoz_add_parents_to_role (Autoz *autoz, AutozIRole *irole, ...); +gboolean autoz_role_is_child (Autoz *autoz, AutozIRole *irole, AutozIRole *irole_parent); + AutozIRole *autoz_get_role_from_id (Autoz *autoz, const gchar *role_id); void autoz_add_resource (Autoz *autoz, AutozIResource *iresource); @@ -70,12 +72,14 @@ void autoz_add_resource_with_parents (Autoz *autoz, AutozIResource *iresource, . void autoz_add_parent_to_resource (Autoz *autoz, AutozIResource *iresource, AutozIResource *iresource_parent); void autoz_add_parents_to_resource (Autoz *autoz, AutozIResource *iresource, ...); +gboolean autoz_resource_is_child (Autoz *autoz, AutozIResource *iresource, AutozIResource *iresource_parent); + AutozIResource *autoz_get_resource_from_id (Autoz *autoz, const gchar *resource_id); void autoz_allow (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource); void autoz_deny (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource); -gboolean autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource); +gboolean autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource, gboolean exclude_null); gboolean autoz_clear (Autoz *autoz); diff --git a/tests/test.c b/tests/test.c index 959556f..2f9985f 100644 --- a/tests/test.c +++ b/tests/test.c @@ -79,21 +79,21 @@ main (int argc, char **argv) } g_message ("super-admin %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), AUTOZ_IRESOURCE (resource_page)) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), AUTOZ_IRESOURCE (resource_page), FALSE) ? "is" : "isn't")); g_message ("super-admin %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), AUTOZ_IRESOURCE (autoz_get_resource_from_id (autoz, "paragraph"))) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), AUTOZ_IRESOURCE (autoz_get_resource_from_id (autoz, "paragraph")), FALSE) ? "is" : "isn't")); g_message ("writer %s allowed to page.", - (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer), AUTOZ_IRESOURCE (resource_page)) ? "is" : "isn't")); + (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer), AUTOZ_IRESOURCE (resource_page), FALSE) ? "is" : "isn't")); g_message ("writer-child %s allowed to page.", - (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer_child), AUTOZ_IRESOURCE (resource_page)) ? "is" : "isn't")); + (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer_child), AUTOZ_IRESOURCE (resource_page), FALSE) ? "is" : "isn't")); g_message ("writer %s allowed to paragraph.", - (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer), AUTOZ_IRESOURCE (autoz_get_resource_from_id (autoz, "paragraph"))) ? "is" : "isn't")); + (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer), AUTOZ_IRESOURCE (autoz_get_resource_from_id (autoz, "paragraph")), FALSE) ? "is" : "isn't")); g_message ("writer-child %s allowed to paragraph.", - (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer_child), AUTOZ_IRESOURCE (autoz_get_resource_from_id (autoz, "paragraph"))) ? "is" : "isn't")); + (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer_child), AUTOZ_IRESOURCE (autoz_get_resource_from_id (autoz, "paragraph")), FALSE) ? "is" : "isn't")); g_message ("read-only %s allowed to page.", - (autoz_is_allowed (autoz, AUTOZ_IROLE (role_read_only), AUTOZ_IRESOURCE (resource_page)) ? "is" : "isn't")); + (autoz_is_allowed (autoz, AUTOZ_IROLE (role_read_only), AUTOZ_IRESOURCE (resource_page), FALSE) ? "is" : "isn't")); g_message ("read-only %s allowed to paragraph.", - (autoz_is_allowed (autoz, AUTOZ_IROLE (role_read_only), AUTOZ_IRESOURCE (autoz_get_resource_from_id (autoz, "paragraph"))) ? "is" : "isn't")); + (autoz_is_allowed (autoz, AUTOZ_IROLE (role_read_only), AUTOZ_IRESOURCE (autoz_get_resource_from_id (autoz, "paragraph")), FALSE) ? "is" : "isn't")); return 0; } diff --git a/tests/test_from_xml.c b/tests/test_from_xml.c index ed60550..c85f904 100644 --- a/tests/test_from_xml.c +++ b/tests/test_from_xml.c @@ -32,7 +32,7 @@ main (int argc, char **argv) autoz = autoz_new (); - if (argc == 0) + if (argc <= 1) { g_error ("You must specified an xml file to load."); return 0; @@ -59,21 +59,33 @@ main (int argc, char **argv) } g_message ("super-admin %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "page")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); g_message ("super-admin %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "paragraph")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); + g_message ("super-admin %s allowed to paragraph (exclude_null).", + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "paragraph"), TRUE) ? "is" : "isn't")); g_message ("writer %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer"), autoz_get_resource_from_id (autoz, "page")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); g_message ("writer-child %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_resource_from_id (autoz, "page")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); g_message ("writer %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer"), autoz_get_resource_from_id (autoz, "paragraph")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); g_message ("writer-child %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_resource_from_id (autoz, "paragraph")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); g_message ("read-only %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_resource_from_id (autoz, "page")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); g_message ("read-only %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_resource_from_id (autoz, "paragraph")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); + + g_message ("writer-child %s child of writer", + (autoz_role_is_child (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_role_from_id (autoz, "writer")) ? "is" : "isn't")); + g_message ("read-only %s child of super-admin", + (autoz_role_is_child (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_role_from_id (autoz, "super-admin")) ? "is" : "isn't")); + + g_message ("page %s child of paragraph", + (autoz_resource_is_child (autoz, autoz_get_resource_from_id (autoz, "page"), autoz_get_resource_from_id (autoz, "paragraph")) ? "is" : "isn't")); + g_message ("paragraph %s child of page", + (autoz_resource_is_child (autoz, autoz_get_resource_from_id (autoz, "paragraph"), autoz_get_resource_from_id (autoz, "page")) ? "is" : "isn't")); return 0; } diff --git a/tests/test_from_xml_to_db.c b/tests/test_from_xml_to_db.c index 567cf58..7f214f4 100644 --- a/tests/test_from_xml_to_db.c +++ b/tests/test_from_xml_to_db.c @@ -84,21 +84,21 @@ main (int argc, char **argv) } g_message ("super-admin %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "page")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); g_message ("super-admin %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "paragraph")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); g_message ("writer %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer"), autoz_get_resource_from_id (autoz, "page")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); g_message ("writer-child %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_resource_from_id (autoz, "page")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); g_message ("writer %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer"), autoz_get_resource_from_id (autoz, "paragraph")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); g_message ("writer-child %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_resource_from_id (autoz, "paragraph")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); g_message ("read-only %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_resource_from_id (autoz, "page")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); g_message ("read-only %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_resource_from_id (autoz, "paragraph")) ? "is" : "isn't")); + (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); return 0; }