Handle empty input strings for parameters, update test.html to send all params for...

diff --git a/chrome/test/test.html b/chrome/test/test.html
index 865db9f..c33c395 100644 (file)
--- a/chrome/test/test.html
+++ b/chrome/test/test.html
@@ -235,8 +235,15 @@
                  '#init_sec_context_response');
         };        
 
+/* context_handle, mech_type, req_flags, time_req, input_token */
+
         var params = {
+          context_handle: document.getElementById('init_sec_context_context_handle').value,
           target_name: document.getElementById('init_sec_context_target_name').value,
+          mech_type: document.getElementById('init_sec_context_mech_type').value,
+          req_flags: document.getElementById('init_sec_context_req_flags').value,
+          time_req: document.getElementById('init_sec_context_time_req').value,
+          input_token: document.getElementById('init_sec_context_input_token').value,
           success: function(data, appTag) {
             $('#init_sec_context_context_handle').attr("value",
                                                        data.context_handle);

diff --git a/json_gssapi/src/commands/GSSInitSecContext.cpp b/json_gssapi/src/commands/GSSInitSecContext.cpp
index 7688c1e..e05468c 100644 (file)
--- a/json_gssapi/src/commands/GSSInitSecContext.cpp
+++ b/json_gssapi/src/commands/GSSInitSecContext.cpp
@@ -152,7 +152,9 @@ bool GSSInitSecContext::loadParameters(JSONObject *params)
   // claimant_cred_handle
 
   // context_handle
-  if ( ! params->get("context_handle").isNull() )
+  if (!(params->get("context_handle").isNull() ||
+       (params->get("context_handle").isString() &&
+        "" != params->get("context_handle").string())))
   {
     this->context_handle = GSS_C_NO_CONTEXT;
     if (params->get("context_handle").isString())
@@ -166,7 +168,9 @@ bool GSSInitSecContext::loadParameters(JSONObject *params)
   }
   
   // target_name
-  if ( ! params->get("target_name").isNull() )
+  if (!(params->get("target_name").isNull() ||
+       (params->get("target_name").isString() &&
+        "" == params->get("target_name").string())))
   {
     this->target_name = GSS_C_NO_NAME;
     if (params->get("target_name").isString())
@@ -182,7 +186,9 @@ bool GSSInitSecContext::loadParameters(JSONObject *params)
   }
   
   // mech_type  
-  if ( ! params->get("mech_type").isNull() )
+  if (!(params->get("mech_type").isNull() ||
+       (params->get("mech_type").isString() &&
+        "" == params->get("mech_type").string())))
   {
     key.clear();
     if (params->get("mech_type").isString())
@@ -195,17 +201,17 @@ bool GSSInitSecContext::loadParameters(JSONObject *params)
   }
   
   // req_flags
-  if ( !params->get("req_flags").isNull() )
+  if (!params->get("req_flags").isNull() )
     this->req_flags = params->get("req_flags").integer();
 
   // time_req
-  if ( !params->get("time_req").isNull() )
+  if (!params->get("time_req").isNull() )
     this->time_req = params->get("time_req").integer();
 
-  // input_chennel_bindings
-
   // input_token
-  if ( ! params->get("input_token").isNull() )
+  if (! (params->get("input_token").isNull() ||
+        (params->get("input_token").isString() &&
+         "" == params->get("input_token").string())))
   {
     token = params->get("input_token").string();
     token = (char *)base64_decode(token, &len);