Răsfoiți Sursa

Bug 2027: When S3 authentication region changes during session, previously visited buckets from the original authentication region could not be accessed anymore

https://winscp.net/tracker/2027

Source commit: aa41c2ac535f69f569119c7a80664defa7ed11c5
Martin Prikryl 4 ani în urmă
părinte
comite
4cfde8e487
1 a modificat fișierele cu 2 adăugiri și 6 ștergeri
  1. 2 6
      source/core/S3FileSystem.cpp

+ 2 - 6
source/core/S3FileSystem.cpp

@@ -593,10 +593,6 @@ TLibS3BucketContext TS3FileSystem::GetBucketContext(const UnicodeString & Bucket
     if (I != FRegions.end())
     {
       Region = I->second;
-      if (Region.IsEmpty())
-      {
-        Region = FAuthRegion;
-      }
     }
     else
     {
@@ -678,8 +674,8 @@ TLibS3BucketContext TS3FileSystem::GetBucketContext(const UnicodeString & Bucket
       // Minio
       else if (Data.Status == S3StatusOK)
       {
-        FTerminal->LogEvent(FORMAT("Will use default region for bucket \"%s\" from now on.", (BucketName)));
-        FRegions.insert(std::make_pair(BucketName, UnicodeString()));
+        FTerminal->LogEvent(FORMAT("Will keep using region \"%s\" for bucket \"%s\" from now on.", (FAuthRegion, BucketName)));
+        FRegions.insert(std::make_pair(BucketName, FAuthRegion));
       }
     }
   }