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

Issue 2302 – Incorrect "Credentials were not specified" error when authentication fails due to incorrect password with FTP protocol

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

Source commit: 480d0c63ad07cffc824177e867fc0cff57fddadd
This commit is contained in:
Martin Prikryl
2024-07-12 13:34:11 +00:00
parent 5e33daf15f
commit 3086bbd89f
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/core/FtpFileSystem.cpp
View File

@@ -462,6 +462,7 @@ void __fastcall TFTPFileSystem::Open()
}
FPasswordFailed = false;
FAnyPassword = !Password.IsEmpty();
FStoredPasswordTried = false;
bool PromptedForCredentials = false;
@@ -511,7 +512,12 @@ void __fastcall TFTPFileSystem::Open()
if (!FTerminal->PromptUser(Data, pkPassword, LoadStr(PASSWORD_TITLE), L"",
LoadStr(PASSWORD_PROMPT), false, 0, Password))
{
FTerminal->FatalError(NULL, LoadStr(CREDENTIALS_NOT_SPECIFIED));
int Message = FAnyPassword ? AUTHENTICATION_FAILED : CREDENTIALS_NOT_SPECIFIED;
FTerminal->FatalError(NULL, LoadStr(Message));
}
else if (!Password.IsEmpty())
{
FAnyPassword = true;
}
}
@@ -3555,7 +3561,9 @@ void __fastcall TFTPFileSystem::HandleReplyStatus(UnicodeString Response)
{
FStoredPasswordTried = true;
// 530 = "Not logged in."
if (FLastCode == 530)
// 501 = "Login incorrect." (ProFTPD empty password code)
if ((FLastCode == 530) ||
(FLastCode == 501))
{
FPasswordFailed = true;
}
@@ -4348,6 +4356,10 @@ bool __fastcall TFTPFileSystem::HandleAsynchRequestNeedPass(
LoadStr(PASSWORD_PROMPT), false, 0, Password))
{
RequestResult = TFileZillaIntf::REPLY_OK;
if (!Password.IsEmpty())
{
FAnyPassword = true;
}
}
else
{