From 041b4ec05c1556098ebaa1546c3d6c9c29bffedd Mon Sep 17 00:00:00 2001
From: Neeraj Kumar Kashyap <nkashyap@in.ibm.com>
Date: Fri, 25 Sep 2020 00:48:46 -0700
Subject: [PATCH] enforce exact key match in IBM IAM response

---
 src/curl.cpp | 3 +++
 src/s3fs.cpp | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/curl.cpp b/src/curl.cpp
index 0752a68..a78741e 100644
--- a/src/curl.cpp
+++ b/src/curl.cpp
@@ -1686,11 +1686,14 @@ bool S3fsCurl::CheckIAMCredentialUpdate()
     if(time(NULL) + IAM_EXPIRE_MERGIN <= S3fsCurl::AWSAccessTokenExpire){
         return true;
     }
+    S3FS_PRN_INFO("IAM Access Token refreshing...");
     // update
     S3fsCurl s3fscurl;
     if(0 != s3fscurl.GetIAMCredentials()){
+        S3FS_PRN_ERR("IAM Access Token refresh failed");
         return false;
     }
+    S3FS_PRN_INFO("IAM Access Token refreshed");
     return true;
 }
 
diff --git a/src/s3fs.cpp b/src/s3fs.cpp
index 9a89d07..0b8069a 100644
--- a/src/s3fs.cpp
+++ b/src/s3fs.cpp
@@ -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")){
             S3fsCurl::SetIsIBMIAMAuth(true);
             S3fsCurl::SetIAMCredentialsURL("https://iam.bluemix.net/oidc/token");
-            S3fsCurl::SetIAMTokenField("access_token");
-            S3fsCurl::SetIAMExpiryField("expiration");
+            S3fsCurl::SetIAMTokenField("\"access_token\"");
+            S3fsCurl::SetIAMExpiryField("\"expiration\"");
             S3fsCurl::SetIAMFieldCount(2);
             is_ibm_iam_auth = true;
             return 0;