youngkingdom/s3fs-fuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unneeded uses of std::map::operator[] (#2642)

Browse Source 
These unintentionally mutate the map.  Script suggested by @danmar.
This commit is contained in:
Andrew Gaul
2025-02-08 18:21:44 -08:00
committed by GitHub
parent edf4141ad6
commit dc92b1b087
4 changed files with 70 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/s3fs_cred.cpp
View File

@ -514,19 +514,32 @@ bool S3fsCred::SetIAMCredentials(const char* response)
return false;
}
AWSAccessToken = keyval[IAM_token_field];
auto aws_access_token = keyval.find(IAM_token_field);
if(aws_access_token == keyval.end()){
return false;
}
if(is_ibm_iam_auth){
auto access_token_expire = keyval.find(IAM_expiry_field);
off_t tmp_expire = 0;
if(!s3fs_strtoofft(&tmp_expire, keyval[IAM_expiry_field].c_str(), /*base=*/ 10)){
if(access_token_expire == keyval.end() || !s3fs_strtoofft(&tmp_expire, access_token_expire->second.c_str(), /*base=*/ 10)){
return false;
}
AWSAccessTokenExpire = static_cast<time_t>(tmp_expire);
}else{
AWSAccessKeyId = keyval[S3fsCred::IAMCRED_ACCESSKEYID];
AWSSecretAccessKey = keyval[S3fsCred::IAMCRED_SECRETACCESSKEY];
AWSAccessTokenExpire = cvtIAMExpireStringToTime(keyval[IAM_expiry_field].c_str());
auto access_key_id = keyval.find(S3fsCred::IAMCRED_ACCESSKEYID);
auto secret_access_key = keyval.find(S3fsCred::IAMCRED_SECRETACCESSKEY);
auto access_token_expire = keyval.find(IAM_expiry_field);
if(access_key_id == keyval.end() || secret_access_key == keyval.end() || access_token_expire == keyval.end()){
return false;
}
AWSAccessKeyId = access_key_id->second;
AWSSecretAccessKey = secret_access_key->second;
AWSAccessTokenExpire = cvtIAMExpireStringToTime(access_token_expire->second.c_str());
}
AWSAccessToken = aws_access_token->second;
return true;
}