1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GRANT: calculate pasword hash in sql_acl.cc

Browse Source 
don't do it in the parser, one should not make run-time
decisions (like, checking thd->variables.old_passwords variable)
during parsing.
This commit is contained in:
Sergei Golubchik 2014-11-25 19:05:49 +01:00
parent 7bd9eb1f41
commit b5357f025b
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sql/sql_acl.cc
View File

@ -52,6 +52,7 @@
#include "sql_db.h" #include "sql_db.h"
#include "sql_array.h" #include "sql_array.h"
#include "sql_hset.h" #include "sql_hset.h"
#include "password.h"
#include "sql_plugin_compat.h" #include "sql_plugin_compat.h"
@ -950,7 +951,7 @@ static bool fix_user_plugin_ptr(ACL_USER *user)
username IDENTIFIED VIA mysql_native_password USING xxx username IDENTIFIED VIA mysql_native_password USING xxx
etc etc
*/ */
static bool fix_lex_user(LEX_USER *user) static bool fix_lex_user(THD *thd, LEX_USER *user)
{ {
size_t check_length; size_t check_length;
@ -976,6 +977,30 @@ static bool fix_lex_user(LEX_USER *user)
return true; return true;
} }
if (user->password.length)
{
size_t scramble_length;
void (*make_scramble)(char *, const char *, size_t);
if (thd->variables.old_passwords == 1)
{
scramble_length= SCRAMBLED_PASSWORD_CHAR_LENGTH_323;
make_scramble= my_make_scrambled_password_323;
}
else
{
scramble_length= SCRAMBLED_PASSWORD_CHAR_LENGTH;
make_scramble= my_make_scrambled_password;
}
char *buff= (char *) thd->alloc(scramble_length + 1);
if (buff == NULL)
return true;
make_scramble(buff, user->password.str, user->password.length);
user->auth.str= buff;
user->auth.length= scramble_length;
}
user->password= user->auth.length ? user->auth : null_lex_str; user->password= user->auth.length ? user->auth : null_lex_str;
user->plugin= empty_lex_str; user->plugin= empty_lex_str;
user->auth= empty_lex_str; user->auth= empty_lex_str;
@ -5609,7 +5634,7 @@ static bool has_auth(LEX_USER *user, LEX *lex)
static bool copy_and_check_auth(LEX_USER *to, LEX_USER *from, THD *thd) static bool copy_and_check_auth(LEX_USER *to, LEX_USER *from, THD *thd)
{ {
if (fix_lex_user(from)) if (fix_lex_user(thd, from))
return true; return true;
if (to != from) if (to != from)
@ -9308,7 +9333,7 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list, bool handle_as_role)
if (!user_name->host.str) if (!user_name->host.str)
user_name->host= host_not_specified; user_name->host= host_not_specified;
if (fix_lex_user(user_name)) if (fix_lex_user(thd, user_name))
{ {
append_user(thd, &wrong_users, user_name); append_user(thd, &wrong_users, user_name);
result= TRUE; result= TRUE;

24
sql/sql_yacc.yy
View File

@ -40,7 +40,6 @@
#include "sql_table.h" /* primary_key_name */ #include "sql_table.h" /* primary_key_name */
#include "sql_partition.h" /* mem_alloc_error, partition_info, HASH_PARTITION */ #include "sql_partition.h" /* mem_alloc_error, partition_info, HASH_PARTITION */
#include "sql_acl.h" /* *_ACL */ #include "sql_acl.h" /* *_ACL */
#include "password.h" /* my_make_scrambled_password_323, my_make_scrambled_password */
#include "sql_class.h" /* Key_part_spec, enum_filetype, Diag_condition_item_name */ #include "sql_class.h" /* Key_part_spec, enum_filetype, Diag_condition_item_name */
#include "slave.h" #include "slave.h"
#include "lex_symbol.h" #include "lex_symbol.h"
@ -15525,29 +15524,6 @@ grant_user:
$$=$1; $1->password=$4; $$=$1; $1->password=$4;
if (Lex->sql_command == SQLCOM_REVOKE) if (Lex->sql_command == SQLCOM_REVOKE)
MYSQL_YYABORT; MYSQL_YYABORT;
if ($4.length)
{
if (thd->variables.old_passwords == 1)
{
char *buff=
(char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1);
if (buff == NULL)
MYSQL_YYABORT;
my_make_scrambled_password_323(buff, $4.str, $4.length);
$1->auth.str= buff;
$1->auth.length= SCRAMBLED_PASSWORD_CHAR_LENGTH_323;
}
else
{
char *buff=
(char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1);
if (buff == NULL)
MYSQL_YYABORT;
my_make_scrambled_password(buff, $4.str, $4.length);
$1->auth.str= buff;
$1->auth.length= SCRAMBLED_PASSWORD_CHAR_LENGTH;
}
}
} }
| user IDENTIFIED_SYM BY PASSWORD TEXT_STRING | user IDENTIFIED_SYM BY PASSWORD TEXT_STRING
{ {