Remove debug changes

Author: byrnHDF

java/src/hdf/hdf5lib/structs/H5FD_ros3_fapl_t.java

@@ -54,17 +54,20 @@ public class H5FD_ros3_fapl_t implements Serializable {
     private String secret_id;
     /** key "secret key" or "access key" for authenticating request */
     private String secret_key;
+    /** token "session token" or "access token" for authenticating request */
+    private String session_token;
 
     /**
      * Create a "default" fapl_t structure, for anonymous access.
      */
     public H5FD_ros3_fapl_t()
     {
         /* H5FD_ros3_fapl_t("", "", ""); */ /* defer */
-        this.version    = 1;
+        this.version    = 1; /* H5FD_CURR_ROS3_FAPL_T_VERSION */
         this.aws_region = "";
         this.secret_id  = "";
         this.secret_key = "";
+        this.session_token = "";
     }
 
     /**
@@ -83,6 +86,27 @@ public H5FD_ros3_fapl_t(String region, String id, String key)
         this.aws_region = region;
         this.secret_id  = id;
         this.secret_key = key;
+        this.session_token = "";
+    }
+
+    /**
+     * Create a fapl_t structure with the specified components.
+     * If all are the empty string, is anonymous (non-authenticating).
+     * Region and ID must both be supplied for authentication.
+     *
+     * @param region "aws region" for authenticating request
+     * @param id "secret id" or "access id" for authenticating request
+     * @param key "secret key" or "access key" for authenticating request
+     * @param key "session token" or "access token" for authenticating request
+     */
+    public H5FD_ros3_fapl_t(String region, String id, String key, String token)
+    {
+        this.version = 1; /* must equal H5FD_CURR_ROS3_FAPL_T_VERSION */
+                          /* as found in H5FDros3.h                    */
+        this.aws_region = region;
+        this.secret_id  = id;
+        this.secret_key = key;
+        this.session_token = token;
     }
 
     @Override
@@ -102,6 +126,8 @@ public boolean equals(Object o)
             return false;
         if (!this.secret_id.equals(other.secret_id))
             return false;
+        if (!this.session_token.equals(other.session_token))
+            return false;
         return true;
     }
 
@@ -114,6 +140,7 @@ public int hashCode()
         k += this.aws_region.length();
         k += this.secret_id.length();
         k += this.secret_key.length();
+        k += this.session_token.length();
         return k;
     }
 
@@ -122,6 +149,6 @@ public String toString()
     {
         return "H5FD_ros3_fapl_t (Version:" + this.version + ") {"
             + "\n    aws_region : " + this.aws_region + "\n    secret_id  : " + this.secret_id +
-            "\n    secret_key : " + this.secret_key + "\n}\n";
+            "\n    secret_key : " + this.secret_key + "\n    session_token : " + this.session_token + "\n}\n";
     }
 }

java/src/jni/h5pFAPLImp.c

@@ -796,6 +796,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1ros3(JNIEnv *env, jclass clss, jlong fapl_id)
     jstring          j_aws = NULL;
     jstring          j_id  = NULL;
     jstring          j_key = NULL;
+    jstring          j_tok = NULL;
 #endif /* H5_HAVE_ROS3_VFD */
     jobject ret_obj = NULL;
 
@@ -825,6 +826,12 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1ros3(JNIEnv *env, jclass clss, jlong fapl_id)
     }
     args[2].l = j_key;
 
+    if (NULL == (j_key = ENVPTR->NewStringUTF(ENVONLY, fa.session_token))) {
+        CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
+        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_fapl_ros3: out of memory - can't create session_token string");
+    }
+    args[3].l = j_tok;
+
     CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5FD_ros3_fapl_t",
                      "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", args, ret_obj);
 #else
@@ -921,7 +928,25 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1ros3(JNIEnv *env, jclass clss, jlong fapl_id,
     else
         memset(instance.secret_key, 0, H5FD_ROS3_MAX_SECRET_KEY_LEN + 1);
 
-    if (instance.aws_region[0] != '\0' && instance.secret_id[0] != '\0' && instance.secret_key[0] != '\0')
+    if (NULL == (fid = ENVPTR->GetFieldID(ENVONLY, cls, "session_token", "Ljava/lang/String;")))
+        CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
+
+    if (NULL == (j_str = (jstring)ENVPTR->GetObjectField(ENVONLY, fapl_config, fid)))
+        CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
+
+    if (j_str) {
+        PIN_JAVA_STRING(ENVONLY, j_str, str, NULL, "H5Pset_fapl_ros3: fapl_config session_token not pinned");
+
+        strncpy(instance.session_token, str, H5FD_ROS3_MAX_SESSION_TOKEN_LEN + 1);
+        instance.secret_key[H5FD_ROS3_MAX_SESSION_TOKEN_LEN] = '\0';
+
+        UNPIN_JAVA_STRING(ENVONLY, j_str, str);
+        str = NULL;
+    }
+    else
+        memset(instance.session_token, 0, H5FD_ROS3_MAX_SESSION_TOKEN_LEN + 1);
+
+    if (instance.aws_region[0] != '\0' && instance.secret_id[0] != '\0' && instance.secret_key[0] != '\0' && instance.session_token[0] != '\0')
         instance.authenticate = true;
 
     if (H5Pset_fapl_ros3((hid_t)fapl_id, &instance) < 0)

src/H5FDs3comms.c

@@ -676,7 +676,7 @@ H5FD__s3comms_s3r_getsize(s3r_t *handle)
     /* Parse received headers to extract "Content-Length" from response
      * headers, storing file size at handle->filesize.
      */
-printf("\nHEADER RESPONSE:%s\n",header_response);
+
     if (NULL == (start = HDstrcasestr(header_response, "\r\nContent-Length: ")))
         HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, FAIL, "could not find \"Content-Length\" in response");
 
@@ -1522,7 +1522,6 @@ H5FD__s3comms_parse_url(const char *url, const char *fapl_endpoint)
     if (CURLUE_OK != rc && CURLUE_NO_QUERY != rc)
         HGOTO_ERROR(H5E_VFL, H5E_CANTCREATE, NULL, "unable to get url query");
 
-printf("PURL:\n--%s\n--%s\n--%s\n--%s\n--%s\n",purl->scheme,purl->host,purl->port,purl->path,purl->query);
     ret_value = purl;
 
 done:

tools/lib/h5tools_utils.c

@@ -1050,7 +1050,6 @@ h5tools_parse_ros3_fapl_tuple(const char *tuple_str, int delim, H5FD_ros3_fapl_e
     else {
         ccred[3] = (const char *)s3cred[3];
     }
-    printf("\ncreds:%s::%s::%s::%s:\n",ccred[0],ccred[1],ccred[2],ccred[3]);
 
     if (0 == h5tools_populate_ros3_fapl(fapl_config_out, ccred))
         H5TOOLS_GOTO_ERROR(FAIL, "failed to populate S3 VFD FAPL config");