diff options
| author | sachin <sachin.setiya@maridb.com> | 2018-05-15 14:01:24 +0530 |
|---|---|---|
| committer | sachin <sachin.setiya@mariadb.com> | 2018-05-18 08:22:41 +0530 |
| commit | 395c8ca708c15e7f4b8dca5c3f5246d03eb557af (patch) | |
| tree | 67debb9d344feff4faac2ee3e74c2b396bc7fc8b /sql/sql_acl.cc | |
| parent | ff0e9b2fce0eac1eb0814bd854f9a01aa3d35461 (diff) | |
| download | mariadb-git-395c8ca708c15e7f4b8dca5c3f5246d03eb557af.tar.gz | |
MDEV-14853 Grant does not work correctly when table contains...
SYSTEM_INVISIBLE or COMPLETELY_INVISIBLE
This commit does multiple things to solve this mdev
1st add field into the parameter of check_column_grant_in_table_ref, so that
we can find out field invisibility.
2nd If field->invisible >= INVISIBLE_SYSTEM skip access check and simple
grant access.
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index adad8622bc3..aec15d38847 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -7782,6 +7782,8 @@ err: table_ref table reference where to check the field name name of field to check length length of name + fld use fld object to check invisibility when it is + not 0, not_found_field, view_ref_found DESCRIPTION Check the access rights to a column depending on the type of table @@ -7796,13 +7798,17 @@ err: */ bool check_column_grant_in_table_ref(THD *thd, TABLE_LIST * table_ref, - const char *name, size_t length) + const char *name, size_t length, + Field *fld) { GRANT_INFO *grant; const char *db_name; const char *table_name; Security_context *sctx= table_ref->security_ctx ? table_ref->security_ctx : thd->security_ctx; + if (fld && fld != not_found_field && fld != view_ref_found + && fld->invisible >= INVISIBLE_SYSTEM) + return false; if (table_ref->view || table_ref->field_translation) { @@ -7878,6 +7884,9 @@ bool check_grant_all_columns(THD *thd, ulong want_access_arg, for (; !fields->end_of_fields(); fields->next()) { + if (fields->field() && + fields->field()->invisible >= INVISIBLE_SYSTEM) + continue; LEX_CSTRING *field_name= fields->name(); if (table_name != fields->get_table_name()) |