Browse Source

Session.ScanFingerprint now works even for Amazon S3 protocol

Source commit: 78e1e83d43cccf3cfba40cdaa4f5455dd248a91c
Martin Prikryl 5 years ago
parent
commit
5037da66a6
1 changed files with 2 additions and 2 deletions
  1. 2 2
      source/core/S3FileSystem.cpp

+ 2 - 2
source/core/S3FileSystem.cpp

@@ -90,7 +90,7 @@ void __fastcall TS3FileSystem::Open()
   FLibS3Protocol = (Data->Ftps != ftpsNone) ? S3ProtocolHTTPS : S3ProtocolHTTP;
   FLibS3Protocol = (Data->Ftps != ftpsNone) ? S3ProtocolHTTPS : S3ProtocolHTTP;
 
 
   UnicodeString AccessKeyId = Data->UserNameExpanded;
   UnicodeString AccessKeyId = Data->UserNameExpanded;
-  if (AccessKeyId.IsEmpty())
+  if (AccessKeyId.IsEmpty() && !FTerminal->SessionData->FingerprintScan)
   {
   {
     if (!FTerminal->PromptUser(Data, pkUserName, LoadStr(S3_ACCESS_KEY_ID_TITLE), L"",
     if (!FTerminal->PromptUser(Data, pkUserName, LoadStr(S3_ACCESS_KEY_ID_TITLE), L"",
           LoadStr(S3_ACCESS_KEY_ID_PROMPT), true, 0, AccessKeyId))
           LoadStr(S3_ACCESS_KEY_ID_PROMPT), true, 0, AccessKeyId))
@@ -102,7 +102,7 @@ void __fastcall TS3FileSystem::Open()
   FAccessKeyId = UTF8String(AccessKeyId);
   FAccessKeyId = UTF8String(AccessKeyId);
 
 
   UnicodeString SecretAccessKey = UTF8String(NormalizeString(Data->Password));
   UnicodeString SecretAccessKey = UTF8String(NormalizeString(Data->Password));
-  if (SecretAccessKey.IsEmpty())
+  if (SecretAccessKey.IsEmpty() && !FTerminal->SessionData->FingerprintScan)
   {
   {
     if (!FTerminal->PromptUser(Data, pkPassword, LoadStr(S3_SECRET_ACCESS_KEY_TITLE), L"",
     if (!FTerminal->PromptUser(Data, pkPassword, LoadStr(S3_SECRET_ACCESS_KEY_TITLE), L"",
           LoadStr(S3_SECRET_ACCESS_KEY_PROMPT), false, 0, SecretAccessKey))
           LoadStr(S3_SECRET_ACCESS_KEY_PROMPT), false, 0, SecretAccessKey))