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

Launch command line: Escape double quotes in password, and fix broken replacement with stars if password contains double quotes. See http://www.heidisql.com/forum.php?t=11976

Browse Source
This commit is contained in:
Ansgar Becker
2013-01-24 05:55:48 +00:00
parent f5c2f45f11
commit 60618e4124
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/main.pas
View File

@ -2796,7 +2796,7 @@ var
path, p, log, cmd: String;
sep: Char;
Conn: TDBConnection;
rx: TRegExpr;
PasswordStart, PasswordEnd: Integer;
begin
// Launch mysql.exe
Conn := ActiveConnection;
@ -2837,18 +2837,24 @@ begin
end;
p := p + ' --user="'+Conn.Parameters.Username+'"';
if Conn.Parameters.Password <> '' then
p := p + ' --password="'+Conn.Parameters.Password+'"';
// Markers for removing password from log line
PasswordStart := -1;
PasswordEnd := -1;
if Conn.Parameters.Password <> '' then begin
PasswordStart := Length(path + cmd + p) +14;
p := p + ' --password="'+StringReplace(Conn.Parameters.Password, '"', '\"', [rfReplaceAll])+'"';
PasswordEnd := Length(path + cmd + p);
end;
if Conn.Parameters.Compressed then
p := p + ' --compress';
if ActiveDatabase <> '' then
p := p + ' --database="' + ActiveDatabase + '"';
rx := TRegExpr.Create;
rx.Expression := '(\-\-password\=")([^"]*)(")';
log := path + cmd + p;
log := rx.Replace(log, '$1********$3', true);
if PasswordStart > -1 then begin
Delete(log, PasswordStart, PasswordEnd-PasswordStart);
Insert('********', log, PasswordStart);
end;
LogSQL(f_('Launching command line: %s', [log]), lcInfo);
rx.Free;
ShellExec(cmd, path, p);
end;
end;