#include "gssapiP_eap.h"
+#include <typeinfo>
#include <string>
#include <exception>
#include <new>
provider = (gssEapAttrFactories[i])();
m_providers[i] = provider;
+
+ /* providers should fail in constructor */
+ assert(m_providers[i] != NULL);
}
}
return &gssEapAttrPrefixes[type];
}
+/*
+ * Initialize a context from an existing context.
+ */
bool
-gss_eap_attr_ctx::initFromExistingContext(const gss_eap_attr_ctx *manager,
- const gss_eap_attr_provider *provider)
+gss_eap_attr_ctx::initFromExistingContext(const gss_eap_attr_ctx *manager)
{
- if (!gss_eap_attr_provider::initFromExistingContext(this, provider))
- return false;
+ bool ret = true;
for (unsigned int i = 0; i < ATTR_TYPE_MAX; i++) {
- gss_eap_attr_provider *provider;
+ gss_eap_attr_provider *provider = m_providers[i];
- provider = m_providers[i];
- if (provider != NULL) {
- if (!provider->initFromExistingContext(this, provider))
- return false;
- }
+ ret = provider->initFromExistingContext(this, manager->m_providers[i]);
+ if (ret == false)
+ break;
}
- return true;
+ return ret;
}
+/*
+ * Initialize a context from a GSS credential and context.
+ */
bool
-gss_eap_attr_ctx::initFromGssContext(const gss_eap_attr_ctx *manager,
- const gss_cred_id_t cred,
+gss_eap_attr_ctx::initFromGssContext(const gss_cred_id_t cred,
const gss_ctx_id_t ctx)
{
- if (!gss_eap_attr_provider::initFromGssContext(this, cred, ctx))
- return false;
+ bool ret = true;
for (unsigned int i = 0; i < ATTR_TYPE_MAX; i++) {
- gss_eap_attr_provider *provider;
+ gss_eap_attr_provider *provider = m_providers[i];
- provider = m_providers[i];
- if (provider != NULL) {
- if (!provider->initFromGssContext(this, cred, ctx))
- return false;
- }
+ ret = provider->initFromGssContext(this, cred, ctx);
+ if (ret == false)
+ break;
}
- return true;
+ return ret;
+}
+
+/*
+ * Initialize a context from an exported context or name token
+ */
+bool
+gss_eap_attr_ctx::initFromBuffer(const gss_buffer_t buffer)
+{
+ bool ret;
+ gss_eap_attr_provider *primaryProvider = getPrimaryProvider();
+
+ ret = primaryProvider->initFromBuffer(this, buffer);
+ if (ret == false)
+ return ret;
+
+ for (unsigned int i = ATTR_TYPE_MIN; i < ATTR_TYPE_MAX; i++) {
+ gss_eap_attr_provider *provider = m_providers[i];
+
+ if (provider == primaryProvider)
+ continue;
+
+ ret = provider->initFromGssContext(this,
+ GSS_C_NO_CREDENTIAL,
+ GSS_C_NO_CONTEXT);
+ if (ret == false)
+ break;
+ }
+
+ return ret;
}
gss_eap_attr_ctx::~gss_eap_attr_ctx(void)
{
- for (unsigned int i = 0; i < ATTR_TYPE_MAX; i++)
+ for (unsigned int i = ATTR_TYPE_MIN; i < ATTR_TYPE_MAX; i++)
delete m_providers[i];
}
return m_providers[type];
}
+gss_eap_attr_provider *
+gss_eap_attr_ctx::getPrimaryProvider(void) const
+{
+ return m_providers[ATTR_TYPE_RADIUS];
+}
+
void
gss_eap_attr_ctx::setAttribute(int complete,
const gss_buffer_t attr,
size_t i;
for (i = 0; i < ATTR_TYPE_MAX; i++) {
- gss_eap_attr_provider *provider;
-
- provider = m_providers[i];
- if (provider == NULL)
- continue;
-
- ret = provider->getAttributeTypes(cb, data);
+ ret = m_providers[i]->getAttributeTypes(cb, data);
if (ret == false)
break;
}
void *data)
{
eap_gss_get_attr_types_args *args = (eap_gss_get_attr_types_args *)data;
- gss_buffer_t prefix = GSS_C_NO_BUFFER;
gss_buffer_desc qualified;
OM_uint32 major, minor;
major = gss_add_buffer_set_member(&minor, &qualified, &args->attrs);
gss_release_buffer(&minor, &qualified);
} else {
- major = gss_add_buffer_set_member(&minor, prefix, &args->attrs);
+ major = gss_add_buffer_set_member(&minor, attribute, &args->attrs);
}
- return GSS_ERROR(major) ? false : true;
+ return GSS_ERROR(major) == false;
}
bool
args.attrs = *attrs;
for (i = 0; i < ATTR_TYPE_MAX; i++) {
- gss_eap_attr_provider *provider;
-
args.type = i;
- provider = m_providers[i];
- if (provider == NULL)
- continue;
-
- ret = provider->getAttributeTypes(addAttribute, (void *)&args);
+ ret = m_providers[i]->getAttributeTypes(addAttribute, (void *)&args);
if (ret == false)
break;
}
- if (ret == false) {
+ if (ret == false)
gss_release_buffer_set(&minor, attrs);
- }
return ret;
}
decomposeAttributeName(attr, &type, &suffix);
provider = m_providers[type];
- if (provider == NULL) {
- *more = 0;
- return false;
- }
ret = provider->getAttribute(type == ATTR_TYPE_LOCAL ? attr : &suffix,
authenticated, complete,
gss_eap_attr_ctx::mapToAny(int authenticated,
gss_buffer_t type_id) const
{
- return NULL;
+ unsigned int type;
+ gss_eap_attr_provider *provider;
+
+ type = attributePrefixToType(type_id);
+
+ provider = m_providers[type];
+
+ return provider->mapToAny(authenticated, type_id);
}
void
gss_eap_attr_ctx::releaseAnyNameMapping(gss_buffer_t type_id,
gss_any_t input) const
{
+ unsigned int type;
+ gss_eap_attr_provider *provider;
+
+ type = attributePrefixToType(type_id);
+
+ provider = m_providers[type];
+
+ provider->releaseAnyNameMapping(type_id, input);
}
void
gss_eap_attr_ctx::exportToBuffer(gss_buffer_t buffer) const
{
- m_providers[ATTR_TYPE_RADIUS]->exportToBuffer(buffer);
+ getPrimaryProvider()->exportToBuffer(buffer);
}
-bool
-gss_eap_attr_ctx::initFromBuffer(const gss_eap_attr_ctx *manager,
- const gss_buffer_t buffer)
+time_t
+gss_eap_attr_ctx::getExpiryTime(void) const
{
unsigned int i;
- bool ret;
+ time_t expiryTime = 0;
- ret = m_providers[ATTR_TYPE_RADIUS]->initFromBuffer(this, buffer);
- if (!ret)
- return false;
+ for (i = ATTR_TYPE_MIN; i < ATTR_TYPE_MAX; i++) {
+ time_t providerExpiryTime = m_providers[i]->getExpiryTime();
- for (i = ATTR_TYPE_RADIUS + 1; i < ATTR_TYPE_MAX; i++) {
- gss_eap_attr_provider *provider = m_providers[i];
+ if (providerExpiryTime == 0)
+ continue;
- ret = provider->initFromGssContext(this,
- GSS_C_NO_CREDENTIAL,
- GSS_C_NO_CONTEXT);
- if (!ret)
- break;
+ if (expiryTime == 0 || providerExpiryTime < expiryTime)
+ expiryTime = providerExpiryTime;
}
- return ret;
+ return expiryTime;
}
-
/*
* C wrappers
*/
static OM_uint32
mapException(OM_uint32 *minor, std::exception &e)
{
- *minor = 0;
- return GSS_S_FAILURE;
+ OM_uint32 major = GSS_S_FAILURE;
+
+ /* XXX TODO implement other mappings */
+ if (typeid(e) == typeid(std::bad_alloc))
+ *minor = ENOMEM;
+ else
+ *minor = 0;
+
+#ifdef GSSEAP_DEBUG
+ /* rethrow for now for debugging */
+ throw e;
+#endif
+
+ return major;
}
void
*authenticated = 0;
*complete = 0;
- value->length = 0;
- value->value = NULL;
+ if (value != NULL) {
+ value->length = 0;
+ value->value = NULL;
+ }
if (display_value != NULL) {
display_value->length = 0;
display_value->value = NULL;
}
- *more = -1;
-
if (name->attrCtx == NULL)
return GSS_S_UNAVAILABLE;
try {
name->attrCtx->exportToBuffer(buffer);
- if (buffer->length == 0)
- return GSS_S_FAILURE;
} catch (std::exception &e) {
return mapException(minor, e);
}
try {
ctx = new gss_eap_attr_ctx();
- if (!ctx->initFromBuffer(NULL, buffer)) {
+ if (!ctx->initFromBuffer(buffer)) {
delete ctx;
return GSS_S_DEFECTIVE_TOKEN;
}
try {
if (in->attrCtx != NULL) {
ctx = new gss_eap_attr_ctx();
- if (!ctx->initFromExistingContext(NULL, in->attrCtx)) {
+ if (!ctx->initFromExistingContext(in->attrCtx)) {
delete ctx;
return GSS_S_FAILURE;
}
gss_buffer_t type_id,
gss_any_t *output)
{
+ if (name->attrCtx == NULL)
+ return GSS_S_UNAVAILABLE;
+
try {
*output = name->attrCtx->mapToAny(authenticated, type_id);
} catch (std::exception &e) {
{
gss_eap_attr_ctx *ctx;
+ assert(gssCtx != GSS_C_NO_CONTEXT);
+
ctx = new gss_eap_attr_ctx();
- if (!ctx->initFromGssContext(NULL, gssCred, gssCtx)) {
+ if (!ctx->initFromGssContext(gssCred, gssCtx)) {
delete ctx;
return NULL;
}
+ gssCtx->expiryTime = ctx->getExpiryTime();
+
return ctx;
}
projects / mech_eap.git / blobdiff