opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

User manager: Check grants *before* tree node has focus. Could be a non-flushed user, since we just SELECT them from mysql.user. Catch such "There is no such grant defined for user" errors and disable tree node in that case. See http://www.heidisql.com/forum.php?t=10364

Browse Source
This commit is contained in:
Ansgar Becker
2012-03-24 07:40:26 +00:00
parent 7948055261
commit 500472970a
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/usermanager.pas
View File

@@ -154,6 +154,7 @@ type
FUsers: TUserList;
FModified, FAdded: Boolean;
CloneGrants: TStringList;
FFocusedUserGrants: TStringList;
FPrivObjects: TPrivObjList;
PrivsGlobal, PrivsDb, PrivsTable, PrivsRoutine, PrivsColumn: TStringList;
FConnection: TDBConnection;
@@ -411,10 +412,33 @@ end;
procedure TUserManagerForm.listUsersFocusChanging(Sender: TBaseVirtualTree; OldNode,
NewNode: PVirtualNode; OldColumn, NewColumn: TColumnIndex; var Allowed: Boolean);
var
User: PUser;
Msg: String;
begin
// Allow selecting a user? Also, set allowed to false if new node is the same as
// the old one, otherwise OnFocusChanged will be triggered.
Allowed := (NewNode <> OldNode) and (not Assigned(NewNode) or (not (vsDisabled in NewNode.States)));
if Allowed and (not FAdded) and Assigned(NewNode) then begin
// Check grants before node has focus. Could be a non-yet flushed user which throws
// "There is no such grant defined for user"
// when firing SHOW GRANTS. See http://www.heidisql.com/forum.php?t=10364
User := Sender.GetNodeData(NewNode);
try
FFocusedUserGrants := FConnection.GetCol('SHOW GRANTS FOR '+esc(User.Username)+'@'+esc(User.Host));
except
on E:EDatabaseError do begin
Allowed := False;
Include(NewNode.States, vsDisabled);
Msg := FConnection.LastError;
if FConnection.LastErrorCode = 1141 then
Msg := Msg + CRLF + CRLF + 'You need to run FLUSH PRIVILEGES before you can edit this user.';
MessageDialog(Msg, mtError, [mbOK]);
end;
end;
end;
if Allowed and FModified then begin
case MessageDialog('Save modified user?', mtConfirmation, [mbYes, mbNo, mbCancel]) of
mrYes: begin
@@ -486,7 +510,7 @@ begin
Grants.Add('GRANT USAGE ON *.* TO '+UserHost);
end;
end else
Grants := FConnection.GetCol('SHOW GRANTS FOR '+esc(User.Username)+'@'+esc(User.Host));
Grants := FFocusedUserGrants;
{ GRANT USAGE ON *.* TO 'newbie'@'%' IDENTIFIED BY PASSWORD '*99D8973ECC09819DF81624F051BFF4FC6695140B' REQUIRE (NONE | ssl_option [[AND] ssl_option] ...) WITH GRANT OPTION
GRANT SELECT ON `avtoserver`.* TO 'newbie'@'%'