database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

The acl_roles_mappings in-memory structure holds the following invariant:

Browse Source 
It will only hold _valid_ entries for as long as it held in memory. Any change
regarding acl_users or acl_roles in memory should update the structure
immediately. This is why the rebuild_roles_mappings no longer removes invalid
entries.

In order to keep things consistent with the existing code, the following jobs
are assigned to each function:

The role of rebuild_roles_mappings is to recreate the links between users and
roles. Any other updates are to be done in the functions:

handle_grant_*

This change prepares the code for the next step, which is cascading updates.
This commit is contained in:
Vicențiu Ciorbaru
2013-10-17 15:09:06 -07:00
committed by Sergei Golubchik
parent ba43f3551b
commit 6988e6c56a
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_acl.cc
View File

@@ -2089,14 +2089,26 @@ void rebuild_role_grants(void)
Reset every user's and role's role_grants array Reset every user's and role's role_grants array
*/ */
for (uint i=0; i < acl_users.elements; i++) { for (uint i=0; i < acl_users.elements; i++) {
ACL_USER * user = dynamic_element(&acl_users, i, ACL_USER *); ACL_USER *user= dynamic_element(&acl_users, i, ACL_USER *);
reset_dynamic(&user->role_grants); reset_dynamic(&user->role_grants);
} }
my_hash_iterate(&acl_roles, my_hash_iterate(&acl_roles,
(my_hash_walk_action) acl_user_reset_grant, NULL); (my_hash_walk_action) acl_user_reset_grant, NULL);
my_hash_iterate(&acl_roles_mappings, /*
(my_hash_walk_action) roles_mappings_walk_action, 0); Rebuild the direct links between users and roles in ACL_USER::role_grants
*/
for (uint i=0; i < acl_roles.records; i++) {
ROLE_GRANT_PAIR *mapping= (ROLE_GRANT_PAIR*)
my_hash_element(&acl_roles_mappings, i);
/*
The invariant chosen is that acl_roles_mappings should _always_
only contain valid entries, referencing correct user and role grants.
If add_role_user_mapping detects an invalid entry, it will not add
the mapping into the ACL_USER::role_grants array.
*/
DBUG_ASSERT(add_role_user_mapping(mapping));
}
} }
/* Return true if there is no users that can match the given host */ /* Return true if there is no users that can match the given host */