/*
- * Copyright (c) 2014 <copyright holder> <email>
- *
- * For license details, see the LICENSE file in the root of this project.
- *
+ * Copyright (c) 2014, JANET(UK)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of JANET(UK) nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
*/
+// MRW -- Add proper copyright boilerplate to all files
#include "GSSInitSecContext.h"
#include "GSSException.h"
#include <stdlib.h>
#include <string.h>
+#include "util_base64.h"
+
typedef OM_uint32 (*init_sec_context)(
OM_uint32 *, /* minor_status */
gss_cred_id_t, /* claimant_cred_handle */
retVal = gss_release_buffer(&minor_status, &output_token);
/* Main */
+ // MRW -- fix so that this uses all of the vars from the object
retVal = fn(
&minor_status,
GSS_C_NO_CREDENTIAL,
if ( GSS_ERROR(this->retVal) )
{
+ // MRW -- steal code from import name
std::string errMsg;
errMsg += "Cannot init_sec_context: ";
throw GSSException(errMsg.c_str(), this->retVal, this->minor_status, mechType.toGss());
{
/* Variables */
std::string key;
+ std::string token;
/* Error checking */
if ( params->isNull() )
return true;
/* Setup */
- // Should I zeroOut?
/* Main processing */
- // Easy stuff(*params)
- if ( !params->get("time_req").isNull() )
- this->time_req = params->get("time_req").integer();
-
- if ( !params->get("req_flags").isNull() )
- this->req_flags = params->get("req_flags").integer();
-
+ // MRW -- finish parsing all of the variables
+ // 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())
}
// 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())
}
// 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())
throw std::invalid_argument( std::string() + "Could not create a mech_type OID from '" + key + "'");
}
+ // req_flags
+ if (!params->get("req_flags").isNull() )
+ this->req_flags = params->get("req_flags").integer();
+
+ // time_req
+ if (!params->get("time_req").isNull() )
+ this->time_req = params->get("time_req").integer();
+
// 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();
+ input_token.value = base64Decode(token.c_str(), &input_token.length);
}
/* Cleanup */
-
/* Return */
return true;
}
if (this->output_token.length > 0)
gss_release_buffer(&minor, &output_token);
- if (this->input_token.length > 0)
- gss_release_buffer(&minor, &input_token);
+ if (this->input_token.value) {
+ base64Free(input_token.value);
+ input_token.value = NULL;
+ input_token.length = 0;
+ }
}
// Now set things to reasonable defaults
JSONObject *GSSInitSecContext::toJSON()
{
/* Variables */
+ // MRW -- values should be scoped to the class, so execute can set error values?
+ std::string output_str;
JSONObject *values = new JSONObject();
+ base64EncodeStr(output_token.value, output_token.length, output_str);
/* Error checking */
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);
+ values->set("output_token", output_str.c_str());
values->set("ret_flags", this->ret_flags);
values->set("time_rec", this->time_rec);
-
+ // MRW -- modify for new error handling
+
/* Cleanup */
/* Return */
GSSInitSecContext::GSSInitSecContext(
JSONObject *params,
- void *fn) : GSSCommand(params)
+ void *fn)
{
zeroOut(false);
loadParameters(params);
projects / gssweb.git / blobdiff