#include <exception>
#include <new>
+/* 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(void)
+{
+ GSSEAP_ONCE(&gssEapAttrProvidersInitOnce, gssEapAttrProvidersInitInternal);
+ 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];
*/
gss_eap_attr_ctx::gss_eap_attr_ctx(void)
{
+ m_flags = 0;
+
for (unsigned int i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) {
gss_eap_attr_provider *provider;
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 ret = true;
+ m_flags = manager->m_flags;
+
for (unsigned int i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) {
- gss_eap_attr_provider *provider = m_providers[i];
+ gss_eap_attr_provider *provider;
- if (provider == NULL)
+ if (!providerEnabled(i)) {
+ releaseProvider(i);
continue;
+ }
+
+ provider = m_providers[i];
ret = provider->initFromExistingContext(this,
manager->m_providers[i]);
- if (ret == false)
+ if (ret == false) {
+ releaseProvider(i);
break;
+ }
}
return ret;
{
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 = m_providers[i];
+ gss_eap_attr_provider *provider;
- if (provider == NULL)
+ if (!providerEnabled(i)) {
+ releaseProvider(i);
continue;
+ }
+
+ provider = m_providers[i];
ret = provider->initFromGssContext(this, cred, ctx);
- if (ret == false)
+ if (ret == false) {
+ releaseProvider(i);
break;
+ }
}
return ret;
{
bool ret;
gss_eap_attr_provider *primaryProvider = getPrimaryProvider();
+ gss_buffer_desc primaryBuf;
- ret = primaryProvider->initFromBuffer(this, buffer);
+ 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 = m_providers[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)
+ if (ret == false) {
+ releaseProvider(i);
break;
+ }
}
return ret;
gss_eap_attr_provider *
gss_eap_attr_ctx::getPrimaryProvider(void) const
{
- return m_providers[ATTR_TYPE_RADIUS];
+ return m_providers[ATTR_TYPE_MIN];
}
/*
void
gss_eap_attr_ctx::exportToBuffer(gss_buffer_t buffer) const
{
- getPrimaryProvider()->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);
}
/*
if (name->attrCtx == NULL)
return GSS_S_UNAVAILABLE;
+ if (GSS_ERROR(gssEapAttrProvidersInit()))
+ return GSS_S_UNAVAILABLE;
+
try {
if (!name->attrCtx->getAttributeTypes(attrs))
return GSS_S_UNAVAILABLE;
if (name->attrCtx == NULL)
return GSS_S_UNAVAILABLE;
+ if (GSS_ERROR(gssEapAttrProvidersInit()))
+ return GSS_S_UNAVAILABLE;
+
try {
if (!name->attrCtx->getAttribute(attr, authenticated, complete,
value, display_value, more))
if (name->attrCtx == NULL)
return GSS_S_UNAVAILABLE;
+ if (GSS_ERROR(gssEapAttrProvidersInit()))
+ return GSS_S_UNAVAILABLE;
+
try {
name->attrCtx->deleteAttribute(attr);
} catch (std::exception &ex) {
if (name->attrCtx == NULL)
return GSS_S_UNAVAILABLE;
+ if (GSS_ERROR(gssEapAttrProvidersInit()))
+ return GSS_S_UNAVAILABLE;
+
try {
name->attrCtx->setAttribute(complete, attr, value);
} catch (std::exception &ex) {
return GSS_S_COMPLETE;
}
+ if (GSS_ERROR(gssEapAttrProvidersInit()))
+ return GSS_S_UNAVAILABLE;
+
try {
name->attrCtx->exportToBuffer(buffer);
} catch (std::exception &e) {
assert(name->attrCtx == NULL);
+ if (GSS_ERROR(gssEapAttrProvidersInit()))
+ return GSS_S_UNAVAILABLE;
+
if (buffer->length != 0) {
try {
ctx = new gss_eap_attr_ctx();
assert(out->attrCtx == NULL);
+ if (GSS_ERROR(gssEapAttrProvidersInit()))
+ return GSS_S_UNAVAILABLE;
+
try {
if (in->attrCtx != NULL) {
ctx = new gss_eap_attr_ctx();
if (name->attrCtx == NULL)
return GSS_S_UNAVAILABLE;
+ if (GSS_ERROR(gssEapAttrProvidersInit()))
+ return GSS_S_UNAVAILABLE;
+
try {
*output = name->attrCtx->mapToAny(authenticated, type_id);
} catch (std::exception &e) {
if (name->attrCtx == NULL)
return GSS_S_UNAVAILABLE;
+ if (GSS_ERROR(gssEapAttrProvidersInit()))
+ return GSS_S_UNAVAILABLE;
+
try {
if (*input != NULL)
name->attrCtx->releaseAnyNameMapping(type_id, *input);
return GSS_S_COMPLETE;
}
-OM_uint32
-gssEapAttrProvidersInit(OM_uint32 *minor)
-{
- 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);
- }
-
- return 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();
- } catch (std::exception &e) {
- return mapException(minor, e);
- }
-
- 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.
assert(gssCtx != GSS_C_NO_CONTEXT);
+ if (GSS_ERROR(gssEapAttrProvidersInit()))
+ return NULL;
+
ctx = new gss_eap_attr_ctx();
if (!ctx->initFromGssContext(gssCred, gssCtx)) {
delete ctx;
projects / mech_eap.orig / blobdiff