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 1914: Failure when using S3/AWS access ID or region longer than 32 characters

Browse Source 
https://winscp.net/tracker/1914
(cherry picked from commit 7d5ac75315)

Source commit: 954bc29c9bf32cdb42434e063e601a4e0ba4c7e5
This commit is contained in:
Martin Prikryl
2020-10-22 11:26:44 +00:00
parent a9f5137300
commit e9ec882b35
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/libs3/inc/libs3.h
View File

@@ -246,6 +246,11 @@ extern "C" {
*/
#define S3_DEFAULT_REGION "us-east-1"
// WINSCP
// according to https://docs.aws.amazon.com/IAM/latest/APIReference/API_AccessKey.html max length is nowadays 128
#define S3_MAX_ACCESS_KEY_ID_LENGTH 128
#define S3_MAX_REGION_LENGTH 32
/** **************************************************************************
* Enumerations

5
libs/libs3/inc/util.h
View File

@@ -71,13 +71,12 @@
#define MAX_CANONICALIZED_RESOURCE_SIZE \
(1 + 255 + 1 + MAX_URLENCODED_KEY_SIZE + (sizeof("?torrent") - 1) + 1)
// according to https://docs.aws.amazon.com/IAM/latest/APIReference/API_AccessKey.html max length is nowadays 128
#define MAX_ACCESS_KEY_ID_LENGTH 128
#define MAX_ACCESS_KEY_ID_LENGTH S3_MAX_ACCESS_KEY_ID_LENGTH
// Maximum length of a credential string
// <access key>/<yyyymmdd>/<region>/s3/aws4_request
#define MAX_CREDENTIAL_SIZE \
(MAX_ACCESS_KEY_ID_LENGTH + 1) + 8 + 1 + 32 + sizeof("/s3/aws4_request")
(MAX_ACCESS_KEY_ID_LENGTH + 1) + 8 + 1 + S3_MAX_REGION_LENGTH + sizeof("/s3/aws4_request")
// Utilities -----------------------------------------------------------------

8
source/core/S3FileSystem.cpp
View File

@@ -100,6 +100,10 @@ void __fastcall TS3FileSystem::Open()
}
}
FAccessKeyId = UTF8String(AccessKeyId);
if (FAccessKeyId.Length() > MAX_ACCESS_KEY_ID_LENGTH)
{
FAccessKeyId.SetLength(MAX_ACCESS_KEY_ID_LENGTH);
}
UnicodeString SecretAccessKey = UTF8String(NormalizeString(Data->Password));
if (SecretAccessKey.IsEmpty() && !FTerminal->SessionData->FingerprintScan)
@@ -517,6 +521,10 @@ TLibS3BucketContext TS3FileSystem::GetBucketContext(const UnicodeString & Bucket
Result.secretAccessKey = FSecretAccessKey.c_str();
Result.securityToken = NULL;
Result.AuthRegionBuf = UTF8String(Region);
if (Result.AuthRegionBuf.Length() > S3_MAX_REGION_LENGTH)
{
Result.AuthRegionBuf.SetLength(S3_MAX_REGION_LENGTH);
}
Result.authRegion = Result.AuthRegionBuf.c_str();
if (Retry)

2
source/forms/Login.dfm
View File

@@ -191,7 +191,7 @@ object LoginDialog: TLoginDialog
Top = 139
Width = 159
Height = 21
MaxLength = 100
MaxLength = 128
TabOrder = 7
Text = 'UserNameEdit'
OnChange = DataChange

2
source/forms/SiteAdvanced.dfm
View File

@@ -1021,7 +1021,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
Width = 213
Height = 21
Anchors = [akLeft, akTop, akRight]
MaxLength = 100
MaxLength = 32
TabOrder = 0
Text = 'S3DefaultRegionCombo'
OnChange = DataChange