mirror of
https://github.com/s3fs-fuse/s3fs-fuse.git
synced 2024-09-28 17:29:02 +00:00
enforce exact key match in IBM IAM response
This commit is contained in:
parent
3c5b35b3b9
commit
041b4ec05c
@ -1686,11 +1686,14 @@ bool S3fsCurl::CheckIAMCredentialUpdate()
|
|||||||
if(time(NULL) + IAM_EXPIRE_MERGIN <= S3fsCurl::AWSAccessTokenExpire){
|
if(time(NULL) + IAM_EXPIRE_MERGIN <= S3fsCurl::AWSAccessTokenExpire){
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
S3FS_PRN_INFO("IAM Access Token refreshing...");
|
||||||
// update
|
// update
|
||||||
S3fsCurl s3fscurl;
|
S3fsCurl s3fscurl;
|
||||||
if(0 != s3fscurl.GetIAMCredentials()){
|
if(0 != s3fscurl.GetIAMCredentials()){
|
||||||
|
S3FS_PRN_ERR("IAM Access Token refresh failed");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
S3FS_PRN_INFO("IAM Access Token refreshed");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4272,8 +4272,8 @@ static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_ar
|
|||||||
if(0 == strcmp(arg, "ibm_iam_auth")){
|
if(0 == strcmp(arg, "ibm_iam_auth")){
|
||||||
S3fsCurl::SetIsIBMIAMAuth(true);
|
S3fsCurl::SetIsIBMIAMAuth(true);
|
||||||
S3fsCurl::SetIAMCredentialsURL("https://iam.bluemix.net/oidc/token");
|
S3fsCurl::SetIAMCredentialsURL("https://iam.bluemix.net/oidc/token");
|
||||||
S3fsCurl::SetIAMTokenField("access_token");
|
S3fsCurl::SetIAMTokenField("\"access_token\"");
|
||||||
S3fsCurl::SetIAMExpiryField("expiration");
|
S3fsCurl::SetIAMExpiryField("\"expiration\"");
|
||||||
S3fsCurl::SetIAMFieldCount(2);
|
S3fsCurl::SetIAMFieldCount(2);
|
||||||
is_ibm_iam_auth = true;
|
is_ibm_iam_auth = true;
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user