opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Quick fix for user@host combinations displayed as if they had no password: use password or authentication_string based on its content, use the first non-empty one. See https://www.heidisql.com/forum.php?t=22805

Browse Source
This commit is contained in:
Ansgar Becker
2018-05-01 09:55:46 +02:00
parent 774830cad0
commit 3bcc6f4749
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/usermanager.pas
View File

@ -243,8 +243,9 @@ var
Version: Integer; Version: Integer;
Users: TDBQuery; Users: TDBQuery;
U: TUser; U: TUser;
tmp, PasswordCol: String; tmp, PasswordExpr: String;
SkipNameResolve: Boolean; SkipNameResolve, HasPassword, HasAuthString: Boolean;
UserTableColumns: TStringList;
function InitPrivList(Values: String): TStringList; function InitPrivList(Values: String): TStringList;
begin begin
@ -261,7 +262,6 @@ begin
PrivsTable := InitPrivList('ALTER,CREATE,DELETE,DROP,GRANT,INDEX'); PrivsTable := InitPrivList('ALTER,CREATE,DELETE,DROP,GRANT,INDEX');
PrivsRoutine := InitPrivList('GRANT'); PrivsRoutine := InitPrivList('GRANT');
PrivsColumn := InitPrivList('INSERT,SELECT,UPDATE,REFERENCES'); PrivsColumn := InitPrivList('INSERT,SELECT,UPDATE,REFERENCES');
PasswordCol := 'password';
if Version >= 40002 then begin if Version >= 40002 then begin
PrivsGlobal.Add('REPLICATION CLIENT'); PrivsGlobal.Add('REPLICATION CLIENT');
@ -294,10 +294,6 @@ begin
PrivsDb.Add('PROXY'); PrivsDb.Add('PROXY');
end; end;
} }
if Version >= 50706 then begin
PasswordCol := 'authentication_string';
end;
PrivsTable.AddStrings(PrivsColumn); PrivsTable.AddStrings(PrivsColumn);
PrivsDb.AddStrings(PrivsTable); PrivsDb.AddStrings(PrivsTable);
@ -320,9 +316,25 @@ begin
try try
tmp := FConnection.GetVar('SHOW VARIABLES LIKE '+FConnection.EscapeString('skip_name_resolve'), 1); tmp := FConnection.GetVar('SHOW VARIABLES LIKE '+FConnection.EscapeString('skip_name_resolve'), 1);
SkipNameResolve := LowerCase(tmp) = 'on'; SkipNameResolve := LowerCase(tmp) = 'on';
FConnection.Query('FLUSH PRIVILEGES'); FConnection.Query('FLUSH PRIVILEGES');
// Peek into user table structure, and find out where the password hash is stored
UserTableColumns := FConnection.GetCol('SHOW COLUMNS FROM '+FConnection.QuoteIdent('mysql')+'.'+FConnection.QuoteIdent('user'));
HasPassword := UserTableColumns.IndexOf('password') > -1;
HasAuthString := UserTableColumns.IndexOf('authentication_string') > -1;
if HasPassword and (not HasAuthString) then
PasswordExpr := 'password'
else if (not HasPassword) and HasAuthString then
PasswordExpr := 'authentication_string'
else if HasPassword and HasAuthString then
PasswordExpr := 'IF(LENGTH(password)>0, password, authentication_string)'
else
Raise Exception.Create(_('No password hash column available'));
PasswordExpr := PasswordExpr + ' AS ' + FConnection.QuoteIdent('password');
Users := FConnection.GetResults( Users := FConnection.GetResults(
'SELECT '+FConnection.QuoteIdent('user')+', '+FConnection.QuoteIdent('host')+', '+FConnection.QuoteIdent(PasswordCol)+' '+ 'SELECT '+FConnection.QuoteIdent('user')+', '+FConnection.QuoteIdent('host')+', '+PasswordExpr+' '+
'FROM '+FConnection.QuoteIdent('mysql')+'.'+FConnection.QuoteIdent('user') 'FROM '+FConnection.QuoteIdent('mysql')+'.'+FConnection.QuoteIdent('user')
); );
FUsers := TUserList.Create(True); FUsers := TUserList.Create(True);
@ -330,7 +342,7 @@ begin
U := TUser.Create; U := TUser.Create;
U.Username := Users.Col('user'); U.Username := Users.Col('user');
U.Host := Users.Col('host'); U.Host := Users.Col('host');
U.Password := Users.Col(PasswordCol); U.Password := Users.Col('password');
U.Problem := upNone; U.Problem := upNone;
if Length(U.Password) = 0 then if Length(U.Password) = 0 then
U.Problem := upEmptyPassword; U.Problem := upEmptyPassword;