X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=util_attr.cpp;h=28065ac13c7277077a920e690a33b232d31c3678;hb=ae79fdae047f980d01b2b4e84ccea52e24d8c7a0;hp=1a891bf1e015c2c53e31d15106fc7b23ff42155a;hpb=1cbb489ca748ff49fc42238e0c1b610530ed43d2;p=mech_eap.orig diff --git a/util_attr.cpp b/util_attr.cpp index 1a891bf..28065ac 100644 --- a/util_attr.cpp +++ b/util_attr.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, JANET(UK) + * Copyright (c) 2011, JANET(UK) * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,21 +30,82 @@ * SUCH DAMAGE. */ +/* + * Attribute provider mechanism. + */ + #include "gssapiP_eap.h" +#include #include #include #include -static gss_eap_attr_create_provider gssEapAttrFactories[ATTR_TYPE_MAX]; -static gss_buffer_desc gssEapAttrPrefixes[ATTR_TYPE_MAX]; +/* lazy initialisation */ +static GSSEAP_THREAD_ONCE gssEapAttrProvidersInitOnce = GSSEAP_ONCE_INITIALIZER; +static OM_uint32 gssEapAttrProvidersInitStatus = GSS_S_UNAVAILABLE; + +static void +gssEapAttrProvidersInitInternal(void) +{ + OM_uint32 major, minor; + + assert(gssEapAttrProvidersInitStatus == GSS_S_UNAVAILABLE); + + major = gssEapRadiusAttrProviderInit(&minor); + if (major == GSS_S_COMPLETE) + major = gssEapSamlAttrProvidersInit(&minor); + if (major == GSS_S_COMPLETE) + major = gssEapLocalAttrProviderInit(&minor); + +#ifdef GSSEAP_DEBUG + assert(major == GSS_S_COMPLETE); +#endif + + gssEapAttrProvidersInitStatus = major; +} + +static OM_uint32 +gssEapAttrProvidersInit(OM_uint32 *minor) +{ + GSSEAP_ONCE(&gssEapAttrProvidersInitOnce, gssEapAttrProvidersInitInternal); + if (GSS_ERROR(gssEapAttrProvidersInitStatus)) + *minor = GSSEAP_NO_ATTR_PROVIDERS; + + return gssEapAttrProvidersInitStatus; +} + +OM_uint32 +gssEapAttrProvidersFinalize(OM_uint32 *minor) +{ + OM_uint32 major = GSS_S_COMPLETE; + + if (gssEapAttrProvidersInitStatus == GSS_S_COMPLETE) { + major = gssEapLocalAttrProviderFinalize(minor); + if (major == GSS_S_COMPLETE) + major = gssEapSamlAttrProvidersFinalize(minor); + if (major == GSS_S_COMPLETE) + major = gssEapRadiusAttrProviderFinalize(minor); + + gssEapAttrProvidersInitStatus = GSS_S_UNAVAILABLE; + } + + return major; +} + +static gss_eap_attr_create_provider gssEapAttrFactories[ATTR_TYPE_MAX + 1]; +static gss_buffer_desc gssEapAttrPrefixes[ATTR_TYPE_MAX + 1]; + +/* + * Register a provider for a particular type and prefix + */ void gss_eap_attr_ctx::registerProvider(unsigned int type, const char *prefix, gss_eap_attr_create_provider factory) { - assert(type < ATTR_TYPE_MAX); + assert(type <= ATTR_TYPE_MAX); assert(gssEapAttrFactories[type] == NULL); @@ -58,33 +119,48 @@ gss_eap_attr_ctx::registerProvider(unsigned int type, } } +/* + * Unregister a provider + */ void gss_eap_attr_ctx::unregisterProvider(unsigned int type) { - assert(type < ATTR_TYPE_MAX); + assert(type <= ATTR_TYPE_MAX); gssEapAttrFactories[type] = NULL; gssEapAttrPrefixes[type].value = NULL; gssEapAttrPrefixes[type].length = 0; } +/* + * Create an attribute context, that manages instances of providers + */ gss_eap_attr_ctx::gss_eap_attr_ctx(void) { - for (unsigned int i = 0; i < ATTR_TYPE_MAX; i++) { + m_flags = 0; + + for (unsigned int i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) { gss_eap_attr_provider *provider; - provider = (gssEapAttrFactories[i])(); + if (gssEapAttrFactories[i] != NULL) { + provider = (gssEapAttrFactories[i])(); + } else { + provider = NULL; + } m_providers[i] = provider; } } +/* + * Convert an attribute prefix to a type + */ unsigned int gss_eap_attr_ctx::attributePrefixToType(const gss_buffer_t prefix) { unsigned int i; - for (i = ATTR_TYPE_MIN; i < ATTR_TYPE_LOCAL; i++) { + for (i = ATTR_TYPE_MIN; i < ATTR_TYPE_MAX; i++) { if (bufferEqual(&gssEapAttrPrefixes[i], prefix)) return i; } @@ -92,60 +168,168 @@ gss_eap_attr_ctx::attributePrefixToType(const gss_buffer_t prefix) return ATTR_TYPE_LOCAL; } +/* + * Convert a type to an attribute prefix + */ const gss_buffer_t gss_eap_attr_ctx::attributeTypeToPrefix(unsigned int type) { - if (type < ATTR_TYPE_MIN || type >= ATTR_TYPE_LOCAL) + if (type < ATTR_TYPE_MIN || type >= ATTR_TYPE_MAX) return GSS_C_NO_BUFFER; return &gssEapAttrPrefixes[type]; } bool +gss_eap_attr_ctx::providerEnabled(unsigned int type) const +{ + if (type == ATTR_TYPE_LOCAL && + (m_flags & ATTR_FLAG_DISABLE_LOCAL)) + return false; + + if (m_providers[type] == NULL) + return false; + + return true; +} + +void +gss_eap_attr_ctx::releaseProvider(unsigned int type) +{ + delete m_providers[type]; + m_providers[type] = NULL; +} + +/* + * Initialize a context from an existing context. + */ +bool gss_eap_attr_ctx::initFromExistingContext(const gss_eap_attr_ctx *manager) { - for (unsigned int i = 0; i < ATTR_TYPE_MAX; i++) { + bool ret = true; + + m_flags = manager->m_flags; + + for (unsigned int i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) { gss_eap_attr_provider *provider; + if (!providerEnabled(i)) { + releaseProvider(i); + continue; + } + provider = m_providers[i]; - if (provider != NULL) { - if (!provider->initFromExistingContext(this, manager->m_providers[i])) - return false; + + ret = provider->initFromExistingContext(this, + manager->m_providers[i]); + if (ret == false) { + releaseProvider(i); + break; } } - return true; + return ret; } +/* + * Initialize a context from a GSS credential and context. + */ bool gss_eap_attr_ctx::initFromGssContext(const gss_cred_id_t cred, const gss_ctx_id_t ctx) { - for (unsigned int i = 0; i < ATTR_TYPE_MAX; i++) { + bool ret = true; + + if (cred != GSS_C_NO_CREDENTIAL && + (cred->flags & GSS_EAP_DISABLE_LOCAL_ATTRS_FLAG)) { + m_flags |= ATTR_FLAG_DISABLE_LOCAL; + } + + for (unsigned int i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) { gss_eap_attr_provider *provider; + if (!providerEnabled(i)) { + releaseProvider(i); + continue; + } + provider = m_providers[i]; - if (provider != NULL) { - if (!provider->initFromGssContext(this, cred, ctx)) - return false; + + ret = provider->initFromGssContext(this, cred, ctx); + if (ret == false) { + releaseProvider(i); + 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(); + gss_buffer_desc primaryBuf; + + if (buffer->length < 4) + return false; + + m_flags = load_uint32_be(buffer->value); + + primaryBuf.length = buffer->length - 4; + primaryBuf.value = (char *)buffer->value + 4; + + ret = primaryProvider->initFromBuffer(this, &primaryBuf); + if (ret == false) + return ret; + + for (unsigned int i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) { + gss_eap_attr_provider *provider; + + if (!providerEnabled(i)) { + releaseProvider(i); + continue; + } + + provider = m_providers[i]; + if (provider == primaryProvider) + continue; + + ret = provider->initFromGssContext(this, + GSS_C_NO_CREDENTIAL, + GSS_C_NO_CONTEXT); + if (ret == false) { + releaseProvider(i); + 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]; } +/* + * Locate provider for a given type + */ gss_eap_attr_provider * gss_eap_attr_ctx::getProvider(unsigned int type) const { + assert(type >= ATTR_TYPE_MIN && type <= ATTR_TYPE_MAX); return m_providers[type]; } +/* + * Locate provider for a given prefix + */ gss_eap_attr_provider * gss_eap_attr_ctx::getProvider(const gss_buffer_t prefix) const { @@ -156,7 +340,20 @@ gss_eap_attr_ctx::getProvider(const gss_buffer_t prefix) const return m_providers[type]; } -void +/* + * Get primary provider. Only the primary provider is serialised when + * gss_export_sec_context() or gss_export_name_composite() is called. + */ +gss_eap_attr_provider * +gss_eap_attr_ctx::getPrimaryProvider(void) const +{ + return m_providers[ATTR_TYPE_MIN]; +} + +/* + * Set an attribute + */ +bool gss_eap_attr_ctx::setAttribute(int complete, const gss_buffer_t attr, const gss_buffer_t value) @@ -164,43 +361,53 @@ gss_eap_attr_ctx::setAttribute(int complete, gss_buffer_desc suffix = GSS_C_EMPTY_BUFFER; unsigned int type; gss_eap_attr_provider *provider; + bool ret = false; decomposeAttributeName(attr, &type, &suffix); provider = m_providers[type]; if (provider != NULL) { - provider->setAttribute(complete, - (type == ATTR_TYPE_LOCAL) ? attr : &suffix, - value); - + ret = provider->setAttribute(complete, + (type == ATTR_TYPE_LOCAL) ? attr : &suffix, + value); } + + return ret; } -void +/* + * Delete an attrbiute + */ +bool gss_eap_attr_ctx::deleteAttribute(const gss_buffer_t attr) { gss_buffer_desc suffix = GSS_C_EMPTY_BUFFER; unsigned int type; gss_eap_attr_provider *provider; + bool ret = false; decomposeAttributeName(attr, &type, &suffix); provider = m_providers[type]; if (provider != NULL) { - provider->deleteAttribute(type == ATTR_TYPE_LOCAL ? attr : &suffix); + ret = provider->deleteAttribute(type == ATTR_TYPE_LOCAL ? attr : &suffix); } + + return ret; } +/* + * Enumerate attribute types with callback + */ bool gss_eap_attr_ctx::getAttributeTypes(gss_eap_attr_enumeration_cb cb, void *data) const { bool ret = false; size_t i; - for (i = 0; i < ATTR_TYPE_MAX; i++) { - gss_eap_attr_provider *provider; + for (i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) { + gss_eap_attr_provider *provider = m_providers[i]; - provider = m_providers[i]; if (provider == NULL) continue; @@ -218,12 +425,11 @@ struct eap_gss_get_attr_types_args { }; static bool -addAttribute(const gss_eap_attr_provider *provider, +addAttribute(const gss_eap_attr_provider *provider GSSEAP_UNUSED, const gss_buffer_t attribute, 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; @@ -232,12 +438,15 @@ addAttribute(const gss_eap_attr_provider *provider, 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; } +/* + * Enumerate attribute types, output is buffer set + */ bool gss_eap_attr_ctx::getAttributeTypes(gss_buffer_set_t *attrs) { @@ -254,12 +463,11 @@ gss_eap_attr_ctx::getAttributeTypes(gss_buffer_set_t *attrs) args.attrs = *attrs; - for (i = 0; i < ATTR_TYPE_MAX; i++) { - gss_eap_attr_provider *provider; + for (i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) { + gss_eap_attr_provider *provider = m_providers[i]; args.type = i; - provider = m_providers[i]; if (provider == NULL) continue; @@ -268,13 +476,15 @@ gss_eap_attr_ctx::getAttributeTypes(gss_buffer_set_t *attrs) break; } - if (ret == false) { + if (ret == false) gss_release_buffer_set(&minor, attrs); - } return ret; } +/* + * Get attribute with given name + */ bool gss_eap_attr_ctx::getAttribute(const gss_buffer_t attr, int *authenticated, @@ -291,10 +501,8 @@ gss_eap_attr_ctx::getAttribute(const gss_buffer_t attr, decomposeAttributeName(attr, &type, &suffix); provider = m_providers[type]; - if (provider == NULL) { - *more = 0; + if (provider == NULL) return false; - } ret = provider->getAttribute(type == ATTR_TYPE_LOCAL ? attr : &suffix, authenticated, complete, @@ -303,59 +511,143 @@ gss_eap_attr_ctx::getAttribute(const gss_buffer_t attr, return ret; } +/* + * Map attribute context to C++ object + */ gss_any_t gss_eap_attr_ctx::mapToAny(int authenticated, gss_buffer_t type_id) const { - return NULL; + unsigned int type; + gss_eap_attr_provider *provider; + gss_buffer_desc suffix; + + decomposeAttributeName(type_id, &type, &suffix); + + provider = m_providers[type]; + if (provider == NULL) + return (gss_any_t)NULL; + + return provider->mapToAny(authenticated, &suffix); } +/* + * Release mapped context + */ void gss_eap_attr_ctx::releaseAnyNameMapping(gss_buffer_t type_id, gss_any_t input) const { + unsigned int type; + gss_eap_attr_provider *provider; + gss_buffer_desc suffix; + + decomposeAttributeName(type_id, &type, &suffix); + + provider = m_providers[type]; + if (provider != NULL) + provider->releaseAnyNameMapping(&suffix, input); } +/* + * Export attribute context to buffer + */ void gss_eap_attr_ctx::exportToBuffer(gss_buffer_t buffer) const { - m_providers[ATTR_TYPE_RADIUS]->exportToBuffer(buffer); + const gss_eap_attr_provider *primaryProvider = getPrimaryProvider(); + gss_buffer_desc tmp; + unsigned char *p; + OM_uint32 tmpMinor; + + primaryProvider->exportToBuffer(&tmp); + + buffer->length = 4 + tmp.length; + buffer->value = GSSEAP_MALLOC(buffer->length); + if (buffer->value == NULL) + throw new std::bad_alloc; + + p = (unsigned char *)buffer->value; + store_uint32_be(m_flags, p); + memcpy(p + 4, tmp.value, tmp.length); + + gss_release_buffer(&tmpMinor, &tmp); } -bool -gss_eap_attr_ctx::initFromBuffer(const gss_buffer_t buffer) +/* + * Return soonest expiry time of providers + */ +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++) { + gss_eap_attr_provider *provider = m_providers[i]; + time_t providerExpiryTime; - for (i = ATTR_TYPE_RADIUS + 1; i < ATTR_TYPE_MAX; i++) { + if (provider == NULL) + continue; + + providerExpiryTime = provider->getExpiryTime(); + if (providerExpiryTime == 0) + continue; + + if (expiryTime == 0 || providerExpiryTime < expiryTime) + expiryTime = providerExpiryTime; + } + + return expiryTime; +} + +OM_uint32 +gss_eap_attr_ctx::mapException(OM_uint32 *minor, std::exception &e) const +{ + unsigned int i; + OM_uint32 major; + + /* Errors we handle ourselves */ + major = GSS_S_FAILURE; + + if (typeid(e) == typeid(std::bad_alloc)) { + *minor = ENOMEM; + goto cleanup; + } + + /* Errors we delegate to providers */ + major = GSS_S_CONTINUE_NEEDED; + + for (i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) { gss_eap_attr_provider *provider = m_providers[i]; - ret = provider->initFromGssContext(this, - GSS_C_NO_CREDENTIAL, - GSS_C_NO_CONTEXT); - if (!ret) + if (provider == NULL) + continue; + + major = provider->mapException(minor, e); + if (major != GSS_S_CONTINUE_NEEDED) break; } - return ret; -} + if (major == GSS_S_CONTINUE_NEEDED) { + *minor = GSSEAP_ATTR_CONTEXT_FAILURE; + major = GSS_S_FAILURE; + } -/* - * C wrappers - */ +cleanup: +#if 0 + /* rethrow for now for debugging */ + throw e; +#endif -static OM_uint32 -mapException(OM_uint32 *minor, std::exception &e) -{ - *minor = 0; - return GSS_S_FAILURE; + assert(GSS_ERROR(major)); + + return major; } +/* + * Decompose attribute name into prefix and suffix + */ void gss_eap_attr_ctx::decomposeAttributeName(const gss_buffer_t attribute, gss_buffer_t prefix, @@ -383,6 +675,23 @@ gss_eap_attr_ctx::decomposeAttributeName(const gss_buffer_t attribute, } } +/* + * Decompose attribute name into type and suffix + */ +void +gss_eap_attr_ctx::decomposeAttributeName(const gss_buffer_t attribute, + unsigned int *type, + gss_buffer_t suffix) +{ + gss_buffer_desc prefix = GSS_C_EMPTY_BUFFER; + + decomposeAttributeName(attribute, &prefix, suffix); + *type = attributePrefixToType(&prefix); +} + +/* + * Compose attribute name from prefix, suffix; returns C++ string + */ std::string gss_eap_attr_ctx::composeAttributeName(const gss_buffer_t prefix, const gss_buffer_t suffix) @@ -402,6 +711,9 @@ gss_eap_attr_ctx::composeAttributeName(const gss_buffer_t prefix, return str; } +/* + * Compose attribute name from type, suffix; returns C++ string + */ std::string gss_eap_attr_ctx::composeAttributeName(unsigned int type, const gss_buffer_t suffix) @@ -411,6 +723,9 @@ gss_eap_attr_ctx::composeAttributeName(unsigned int type, return composeAttributeName(prefix, suffix); } +/* + * Compose attribute name from prefix, suffix; returns GSS buffer + */ void gss_eap_attr_ctx::composeAttributeName(const gss_buffer_t prefix, const gss_buffer_t suffix, @@ -426,17 +741,9 @@ gss_eap_attr_ctx::composeAttributeName(const gss_buffer_t prefix, } } -void -gss_eap_attr_ctx::decomposeAttributeName(const gss_buffer_t attribute, - unsigned int *type, - gss_buffer_t suffix) -{ - gss_buffer_desc prefix = GSS_C_EMPTY_BUFFER; - - decomposeAttributeName(attribute, &prefix, suffix); - *type = attributePrefixToType(&prefix); -} - +/* + * Compose attribute name from type, suffix; returns GSS buffer + */ void gss_eap_attr_ctx::composeAttributeName(unsigned int type, const gss_buffer_t suffix, @@ -447,21 +754,32 @@ gss_eap_attr_ctx::composeAttributeName(unsigned int type, return composeAttributeName(prefix, suffix, attribute); } +/* + * C wrappers + */ OM_uint32 gssEapInquireName(OM_uint32 *minor, gss_name_t name, - int *name_is_MN, - gss_OID *MN_mech, + int *name_is_MN GSSEAP_UNUSED, + gss_OID *MN_mech GSSEAP_UNUSED, gss_buffer_set_t *attrs) { - if (name->attrCtx == NULL) + if (name->attrCtx == NULL) { + *minor = GSSEAP_NO_ATTR_CONTEXT; return GSS_S_UNAVAILABLE; + } + + if (GSS_ERROR(gssEapAttrProvidersInit(minor))) { + return GSS_S_UNAVAILABLE; + } try { - if (!name->attrCtx->getAttributeTypes(attrs)) + if (!name->attrCtx->getAttributeTypes(attrs)) { + *minor = GSSEAP_NO_ATTR_CONTEXT; return GSS_S_UNAVAILABLE; + } } catch (std::exception &e) { - return mapException(minor, e); + return name->attrCtx->mapException(minor, e); } return GSS_S_COMPLETE; @@ -490,15 +808,25 @@ gssEapGetNameAttribute(OM_uint32 *minor, display_value->value = NULL; } - if (name->attrCtx == NULL) + if (name->attrCtx == NULL) { + *minor = GSSEAP_NO_ATTR_CONTEXT; return GSS_S_UNAVAILABLE; + } + + if (GSS_ERROR(gssEapAttrProvidersInit(minor))) { + return GSS_S_UNAVAILABLE; + } try { if (!name->attrCtx->getAttribute(attr, authenticated, complete, - value, display_value, more)) + value, display_value, more)) { + *minor = GSSEAP_NO_SUCH_ATTR; + gssEapSaveStatusInfo(*minor, "Unknown naming attribute %.*s", + (int)attr->length, (char *)attr->value); return GSS_S_UNAVAILABLE; + } } catch (std::exception &e) { - return mapException(minor, e); + return name->attrCtx->mapException(minor, e); } return GSS_S_COMPLETE; @@ -509,13 +837,23 @@ gssEapDeleteNameAttribute(OM_uint32 *minor, gss_name_t name, gss_buffer_t attr) { - if (name->attrCtx == NULL) + if (name->attrCtx == NULL) { + *minor = GSSEAP_NO_ATTR_CONTEXT; + return GSS_S_UNAVAILABLE; + } + + if (GSS_ERROR(gssEapAttrProvidersInit(minor))) return GSS_S_UNAVAILABLE; try { - name->attrCtx->deleteAttribute(attr); - } catch (std::exception &ex) { - return mapException(minor, ex); + if (!name->attrCtx->deleteAttribute(attr)) { + *minor = GSSEAP_NO_SUCH_ATTR; + gssEapSaveStatusInfo(*minor, "Unknown naming attribute %.*s", + (int)attr->length, (char *)attr->value); + return GSS_S_UNAVAILABLE; + } + } catch (std::exception &e) { + return name->attrCtx->mapException(minor, e); } return GSS_S_COMPLETE; @@ -528,13 +866,23 @@ gssEapSetNameAttribute(OM_uint32 *minor, gss_buffer_t attr, gss_buffer_t value) { - if (name->attrCtx == NULL) + if (name->attrCtx == NULL) { + *minor = GSSEAP_NO_ATTR_CONTEXT; + return GSS_S_UNAVAILABLE; + } + + if (GSS_ERROR(gssEapAttrProvidersInit(minor))) return GSS_S_UNAVAILABLE; try { - name->attrCtx->setAttribute(complete, attr, value); - } catch (std::exception &ex) { - return mapException(minor, ex); + if (!name->attrCtx->setAttribute(complete, attr, value)) { + *minor = GSSEAP_NO_SUCH_ATTR; + gssEapSaveStatusInfo(*minor, "Unknown naming attribute %.*s", + (int)attr->length, (char *)attr->value); + return GSS_S_UNAVAILABLE; + } + } catch (std::exception &e) { + return name->attrCtx->mapException(minor, e); } return GSS_S_COMPLETE; @@ -552,12 +900,13 @@ gssEapExportAttrContext(OM_uint32 *minor, return GSS_S_COMPLETE; } + if (GSS_ERROR(gssEapAttrProvidersInit(minor))) + 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); + return name->attrCtx->mapException(minor, e); } return GSS_S_COMPLETE; @@ -572,18 +921,22 @@ gssEapImportAttrContext(OM_uint32 *minor, assert(name->attrCtx == NULL); + if (GSS_ERROR(gssEapAttrProvidersInit(minor))) + return GSS_S_UNAVAILABLE; + if (buffer->length != 0) { try { ctx = new gss_eap_attr_ctx(); if (!ctx->initFromBuffer(buffer)) { delete ctx; + *minor = GSSEAP_BAD_ATTR_TOKEN; return GSS_S_DEFECTIVE_TOKEN; } name->attrCtx = ctx; } catch (std::exception &e) { delete ctx; - return mapException(minor, e); + return name->attrCtx->mapException(minor, e); } } @@ -599,18 +952,22 @@ gssEapDuplicateAttrContext(OM_uint32 *minor, assert(out->attrCtx == NULL); + if (GSS_ERROR(gssEapAttrProvidersInit(minor))) + return GSS_S_UNAVAILABLE; + try { if (in->attrCtx != NULL) { ctx = new gss_eap_attr_ctx(); if (!ctx->initFromExistingContext(in->attrCtx)) { delete ctx; + *minor = GSSEAP_ATTR_CONTEXT_FAILURE; return GSS_S_FAILURE; } out->attrCtx = ctx; } } catch (std::exception &e) { delete ctx; - return mapException(minor, e); + return in->attrCtx->mapException(minor, e); } return GSS_S_COMPLETE; @@ -623,10 +980,18 @@ gssEapMapNameToAny(OM_uint32 *minor, gss_buffer_t type_id, gss_any_t *output) { + if (name->attrCtx == NULL) { + *minor = GSSEAP_NO_ATTR_CONTEXT; + return GSS_S_UNAVAILABLE; + } + + if (GSS_ERROR(gssEapAttrProvidersInit(minor))) + return GSS_S_UNAVAILABLE; + try { *output = name->attrCtx->mapToAny(authenticated, type_id); } catch (std::exception &e) { - return mapException(minor, e); + return name->attrCtx->mapException(minor, e); } return GSS_S_COMPLETE; @@ -638,7 +1003,12 @@ gssEapReleaseAnyNameMapping(OM_uint32 *minor, gss_buffer_t type_id, gss_any_t *input) { - if (name->attrCtx == NULL) + if (name->attrCtx == NULL) { + *minor = GSSEAP_NO_ATTR_CONTEXT; + return GSS_S_UNAVAILABLE; + } + + if (GSS_ERROR(gssEapAttrProvidersInit(minor))) return GSS_S_UNAVAILABLE; try { @@ -646,7 +1016,7 @@ gssEapReleaseAnyNameMapping(OM_uint32 *minor, name->attrCtx->releaseAnyNameMapping(type_id, *input); *input = NULL; } catch (std::exception &e) { - return mapException(minor, e); + return name->attrCtx->mapException(minor, e); } return GSS_S_COMPLETE; @@ -659,53 +1029,50 @@ gssEapReleaseAttrContext(OM_uint32 *minor, if (name->attrCtx != NULL) delete name->attrCtx; + *minor = 0; return GSS_S_COMPLETE; } +/* + * Public accessor for initialisng a context from a GSS context. Also + * sets expiry time on GSS context as a side-effect. + */ OM_uint32 -gssEapAttrProvidersInit(OM_uint32 *minor) +gssEapCreateAttrContext(OM_uint32 *minor, + gss_cred_id_t gssCred, + gss_ctx_id_t gssCtx, + struct gss_eap_attr_ctx **pAttrContext, + time_t *pExpiryTime) { - try { - if (gss_eap_radius_attr_provider::init() && - gss_eap_saml_assertion_provider::init() && - gss_eap_saml_attr_provider::init() && - gss_eap_shib_attr_provider::init()) - return GSS_S_COMPLETE; - } catch (std::exception &e) { - return mapException(minor, e); - } + gss_eap_attr_ctx *ctx = NULL; + OM_uint32 major; - return GSS_S_FAILURE; -} + assert(gssCtx != GSS_C_NO_CONTEXT); + + major = gssEapAttrProvidersInit(minor); + if (GSS_ERROR(major)) + return major; + + *minor = GSSEAP_ATTR_CONTEXT_FAILURE; + major = GSS_S_FAILURE; -OM_uint32 -gssEapAttrProvidersFinalize(OM_uint32 *minor) -{ try { - gss_eap_shib_attr_provider::finalize(); - gss_eap_saml_attr_provider::finalize(); - gss_eap_saml_assertion_provider::finalize(); - gss_eap_radius_attr_provider::finalize(); + ctx = new gss_eap_attr_ctx(); + if (ctx->initFromGssContext(gssCred, gssCtx)) { + *minor = 0; + major = GSS_S_COMPLETE; + } else { + delete ctx; + } } catch (std::exception &e) { - return mapException(minor, e); + if (ctx != NULL) + major = ctx->mapException(minor, e); } - return GSS_S_COMPLETE; -} - -struct gss_eap_attr_ctx * -gssEapCreateAttrContext(gss_cred_id_t gssCred, - gss_ctx_id_t gssCtx) -{ - gss_eap_attr_ctx *ctx; - - assert(gssCtx != GSS_C_NO_CONTEXT); - - ctx = new gss_eap_attr_ctx(); - if (!ctx->initFromGssContext(gssCred, gssCtx)) { - delete ctx; - return NULL; + if (major == GSS_S_COMPLETE) { + *pAttrContext = ctx; + *pExpiryTime = ctx->getExpiryTime(); } - return ctx; + return major; }