Remove superfluous variable juggling in the base64 decoding of the input token.

[gssweb.git] / json_gssapi / src / commands / GSSInitSecContext.cpp

diff --git a/json_gssapi/src/commands/GSSInitSecContext.cpp b/json_gssapi/src/commands/GSSInitSecContext.cpp
index e79d440..68cd43a 100644 (file)
--- a/json_gssapi/src/commands/GSSInitSecContext.cpp
+++ b/json_gssapi/src/commands/GSSInitSecContext.cpp
@@ -43,6 +43,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "utils/base64.h"
+
 typedef OM_uint32 (*init_sec_context)(
     OM_uint32 *,        /* minor_status */
     gss_cred_id_t,      /* claimant_cred_handle */
@@ -107,7 +109,6 @@ GSSInitSecContext::execute()
   /* Return */
 }
 
-#if 0
 const char* GSSInitSecContext::getTargetDisplayName()
 {
   /* Variables */
@@ -132,12 +133,12 @@ const char* GSSInitSecContext::getTargetDisplayName()
   /* return */
   return( ret );
 }
-#endif
 
 bool GSSInitSecContext::loadParameters(JSONObject *params)
 {
   /* Variables */
   std::string key;
+  std::string token;
   
   /* Error checking */
   if ( params->isNull() )
@@ -150,7 +151,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() &&
+        std::string("") == params->get("context_handle").string())))
   {
     this->context_handle = GSS_C_NO_CONTEXT;
     if (params->get("context_handle").isString())
@@ -164,7 +167,11 @@ bool GSSInitSecContext::loadParameters(JSONObject *params)
   }
   
   // target_name
-  if ( ! params->get("target_name").isNull() )
+  if (! (  params->get("target_name").isNull() ||
+          (params->get("target_name").isString() &&
+           std::string("") == params->get("target_name").string())
+       )
+     )
   {
     this->target_name = GSS_C_NO_NAME;
     if (params->get("target_name").isString())
@@ -180,7 +187,13 @@ bool GSSInitSecContext::loadParameters(JSONObject *params)
   }
   
   // mech_type  
-  if ( ! params->get("mech_type").isNull() )
+  if (! ( params->get("mech_type").isNull() ||
+         (
+           params->get("mech_type").isString() &&
+           std::string("") == params->get("mech_type").string()
+         )
+       )
+     )
   {
     key.clear();
     if (params->get("mech_type").isString())
@@ -193,21 +206,20 @@ 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() &&
+         std::string("") == params->get("input_token").string())))
   {
-    key = params->get("input_token").string();
-    this->input_token.value = (void *)key.c_str();
-    this->input_token.length = key.length();
+    token = params->get("input_token").string();
+    this->input_token.value = base64_decode(token, &this->input_token.length);
   }
 
   /* Cleanup */
@@ -267,6 +279,7 @@ JSONObject *GSSInitSecContext::toJSON()
 {
   /* Variables */
   // MRW -- values should be scoped to the class, so execute can set error values?
+  std::string output_str((char *)output_token.value, output_token.length);
   JSONObject *values = new JSONObject();
   
   /* Error checking */
@@ -278,7 +291,9 @@ JSONObject *GSSInitSecContext::toJSON()
   values->set("minor_status", this->minor_status);
   values->set("context_handle", this->contextKey.c_str());
   values->set("actual_mech_type", this->getActualMechType().toString().c_str());
-  values->set("output_token", (const char *)this->output_token.value);
+  // MRW -- is output_token.value guaranteed to be null-terminated?
+  //output_str = (char *)output_token.value;
+  values->set("output_token", base64_encode(output_str));
   values->set("ret_flags", this->ret_flags);
   values->set("time_rec", this->time_rec);
   // MRW -- modify for new error handling