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

Implement input box for user/password prompt from plink process. Password prompt hides characters, like advised on https://stackoverflow.com/a/21122864/4110077 . Closes #129.

Browse Source
This commit is contained in:
Ansgar Becker
2019-01-02 20:30:47 +01:00
parent a4e20cc9bc
commit 06df04b45e
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/dbconnection.pas
View File

@@ -851,7 +851,7 @@ end;
procedure TPlink.Connect;
var
PlinkCmd, PlinkCmdDisplay: String;
OutText, ErrorText: String;
OutText, ErrorText, UserInput: String;
rx: TRegExpr;
StartupInfo: TStartupInfo;
ExitCode: LongWord;
@@ -925,17 +925,31 @@ begin
if ExitCode <> STILL_ACTIVE then
raise EDatabaseError.CreateFmt(_('PLink exited unexpected. Command line was: %s'), [CRLF+PlinkCmdDisplay]);
OutText := ReadPipe(FOutPipe);
OutText := Trim(ReadPipe(FOutPipe));
ErrorText := ReadPipe(FErrorPipe);
if (OutText <> '') or (ErrorText <> '') then
ReturnedSomethingAt := Waited;
FConnection.Log(lcDebug, 'plink OutText:'+OutText+' ErrorText:'+ErrorText);
if OutText <> '' then begin
rx.Expression := '^[^\.]+\.';
if rx.Exec(OutText) then
MessageDialog('PLink: '+rx.Match[0], OutText, mtInformation, [mbOK])
else
MessageDialog('PLink:', OutText, mtInformation, [mbOK]);
if ExecRegExpr('login as\s*\:', OutText) then begin
// Prompt for username
UserInput := InputBox('PLink:', OutText, '');
SendText(UserInput + CRLF);
end else if ExecRegExpr('password\s*\:', OutText) then begin
// Prompt for password. Send * as first char of prompt param so InputBox hides input characters
UserInput := InputBox('PLink:', #31+OutText, '');
SendText(UserInput + CRLF);
end else begin
// Informational message box
rx.Expression := '^[^\.]+\.';
if rx.Exec(OutText) then begin // First words end with a dot - use it as caption
MessageDialog('PLink: '+rx.Match[0], OutText, mtInformation, [mbOK])
end else begin
MessageDialog('PLink:', OutText, mtInformation, [mbOK]);
end;
end;
end;
if ErrorText <> '' then begin