sysutils/winscp
1
0
Fork 0
mirror of https://github.com/winscp/winscp.git synced 2026-10-24 02:28:55 +03:00
Code Activity

Bug 1906" *nix shell special characters were unintentionally escaped in in PuTTY/SSH terminal command patterns

Browse Source 
https://winscp.net/tracker/1906

Source commit: de45a015f542df489fea2045683e3a74b8ee1edc
This commit is contained in:
Martin Prikryl
2020-09-25 14:12:12 +00:00
parent 3241540ae8
commit 79f75ac151
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/windows/GUITools.cpp
View File

@@ -171,16 +171,16 @@ void __fastcall OpenSessionInPutty(const UnicodeString PuttyPath,
Password = SessionData->Password;
}
}
TCustomCommandData Data(SessionData, SessionData->UserName, Password);
TRemoteCustomCommand RemoteCustomCommand(Data, SessionData->RemoteDirectory);
TCustomCommandData Data(SessionData, L"domain\\username"/*SessionData->UserName*/, Password);
TLocalCustomCommand LocalCustomCommand(Data, SessionData->RemoteDirectory, SessionData->LocalDirectory);
TWinInteractiveCustomCommand InteractiveCustomCommand(
&RemoteCustomCommand, L"PuTTY", UnicodeString());
&LocalCustomCommand, L"PuTTY", UnicodeString());
UnicodeString Params =
RemoteCustomCommand.Complete(InteractiveCustomCommand.Complete(AParams, false), true);
LocalCustomCommand.Complete(InteractiveCustomCommand.Complete(AParams, false), true);
UnicodeString PuttyParams;
if (!RemoteCustomCommand.IsSiteCommand(AParams))
if (!LocalCustomCommand.IsSiteCommand(AParams))
{
{
bool SessionList = false;
@@ -272,7 +272,7 @@ void __fastcall OpenSessionInPutty(const UnicodeString PuttyPath,
}
}
if (!Password.IsEmpty() && !RemoteCustomCommand.IsPasswordCommand(AParams))
if (!Password.IsEmpty() && !LocalCustomCommand.IsPasswordCommand(AParams))
{
Password = NormalizeString(Password); // if password is empty, we should quote it always
AddToList(PuttyParams, FORMAT(L"-pw %s", (EscapePuttyCommandParam(Password))), L" ");