X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=util_shib.cpp;h=a37329fe822e81ec203740112f838afd05e355e3;hb=15c93f06ee6ddefa7e7b095351f6e66698c7cc9e;hp=7d3457782181925e2006e48f18ff3d7b88b36244;hpb=81378d116795fa8a7a56dc8e00c3b2666126682d;p=mech_eap.git diff --git a/util_shib.cpp b/util_shib.cpp index 7d34577..a37329f 100644 --- a/util_shib.cpp +++ b/util_shib.cpp @@ -31,7 +31,7 @@ */ /* * Copyright 2001-2009 Internet2 - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -45,87 +45,151 @@ * limitations under the License. */ -#include "gssapiP_eap.h" - -#include #include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include -#include "resolver.h" +#include + +#include "gssapiP_eap.h" using namespace shibsp; using namespace shibresolver; using namespace opensaml::saml2md; using namespace opensaml; -using namespace xmltooling::logging; using namespace xmltooling; -using namespace xercesc; using namespace std; -static vector -duplicateAttributes(const vector src); +gss_eap_shib_attr_provider::gss_eap_shib_attr_provider(void) +{ + m_authenticated = false; +} -gss_eap_shib_attr_provider::gss_eap_shib_attr_provider(const gss_eap_attr_ctx *ctx, - gss_cred_id_t gssCred, - gss_ctx_id_t gssCtx) - : gss_eap_attr_provider(ctx, gssCred, gssCtx) +gss_eap_shib_attr_provider::~gss_eap_shib_attr_provider(void) { - if (gssCtx == GSS_C_NO_CONTEXT) { - gss_eap_shib_attr_provider *shib; - - shib = dynamic_cast - (ctx->getProvider(ATTR_TYPE_LOCAL)); - if (shib != NULL) - m_attributes = duplicateAttributes(shib->m_attributes); - } else { - gss_eap_saml_assertion_provider *saml; - gss_eap_radius_attr_provider *radius; - gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER; - ShibbolethResolver *resolver = NULL; - OM_uint32 minor; + for_each(m_attributes.begin(), + m_attributes.end(), + xmltooling::cleanup()) + ; +} - saml = dynamic_cast - (ctx->getProvider(ATTR_TYPE_SAML_ASSERTION)); - radius = dynamic_cast - (ctx->getProvider(ATTR_TYPE_RADIUS)); +bool +gss_eap_shib_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *manager, + const gss_eap_attr_provider *ctx) +{ + const gss_eap_shib_attr_provider *shib; - if (radius == NULL) - return; + if (!gss_eap_attr_provider::initFromExistingContext(manager, ctx)) { + return false; + } + + m_authenticated = false; + + shib = static_cast(ctx); + if (shib != NULL) { + m_attributes = duplicateAttributes(shib->getAttributes()); + m_authenticated = shib->authenticated(); + } + + return true; +} + +bool +addRadiusAttribute(const gss_eap_attr_provider *provider, + const gss_buffer_t attribute, + void *data) +{ + const gss_eap_shib_attr_provider *shib; + const gss_eap_radius_attr_provider *radius; + int authenticated, complete, more = -1; + vector attributeIds(1); + SimpleAttribute *a; - if (gssCred != GSS_C_NO_CREDENTIAL && - gss_display_name(&minor, gssCred->name, &nameBuf, NULL) == GSS_S_COMPLETE) - resolver->setApplicationID((const char *)nameBuf.value); + radius = static_cast(provider); + shib = static_cast(data); - if (saml != NULL && saml->getAssertion() != NULL) - resolver->addToken(saml->getAssertion()); + assert(radius != NULL && shib != NULL); - /* TODO inject RADIUS attribute types */ + string attributeName = + gss_eap_attr_ctx::composeAttributeName(ATTR_TYPE_RADIUS, attribute); - resolver->resolveAttributes(m_attributes); + attributeIds.push_back(attributeName); + a = new SimpleAttribute(attributeIds); + if (a == NULL) + return false; - gss_release_buffer(&minor, &nameBuf); + while (more != 0) { + gss_buffer_desc value = GSS_C_EMPTY_BUFFER; + OM_uint32 minor; - delete resolver; + if (!radius->getAttribute(attribute, + &authenticated, + &complete, + &value, + NULL, + &more)) + return false; + + string attributeValue((char *)value.value, value.length); + a->getValues().push_back(attributeValue); + + gss_release_buffer(&minor, &value); } + + shib->getAttributes().push_back(a); + + return true; } -gss_eap_shib_attr_provider::~gss_eap_shib_attr_provider(void) +bool +gss_eap_shib_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager, + const gss_cred_id_t gssCred, + const gss_ctx_id_t gssCtx) { - for_each(m_attributes.begin(), m_attributes.end(), xmltooling::cleanup()); + const gss_eap_saml_assertion_provider *saml; + const gss_eap_radius_attr_provider *radius; + gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER; + ShibbolethResolver *resolver; + OM_uint32 minor; + + if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx)) + return false; + + saml = static_cast + (m_manager->getProvider(ATTR_TYPE_SAML_ASSERTION)); + radius = static_cast + (m_manager->getProvider(ATTR_TYPE_RADIUS)); + + resolver = ShibbolethResolver::create(); + + if (gssCred != GSS_C_NO_CREDENTIAL && + gssEapDisplayName(&minor, gssCred->name, &nameBuf, NULL) == GSS_S_COMPLETE) + resolver->setApplicationID((const char *)nameBuf.value); + + m_authenticated = false; + + if (radius != NULL) { + radius->getAttributeTypes(addRadiusAttribute, (void *)this); + m_authenticated = radius->authenticated(); + } + + if (saml != NULL && saml->getAssertion() != NULL) { + resolver->addToken(saml->getAssertion()); + if (m_authenticated) + m_authenticated = saml->authenticated(); + } + + resolver->resolve(); + + m_attributes = resolver->getResolvedAttributes(); + resolver->getResolvedAttributes().clear(); + + gss_release_buffer(&minor, &nameBuf); + + delete resolver; + + return true; } int @@ -156,19 +220,17 @@ gss_eap_shib_attr_provider::setAttribute(int complete, const gss_buffer_t value) { string attrStr((char *)attr->value, attr->length); - vector ids(1); - - ids.push_back(attrStr); - + vector ids(1, attrStr); SimpleAttribute *a = new SimpleAttribute(ids); if (value->length != 0) { - string valStr((char *)value->value, value->length); + string valueStr((char *)value->value, value->length); - a->getValues().push_back(valStr); + a->getValues().push_back(valueStr); } m_attributes.push_back(a); + m_authenticated = false; } void @@ -179,6 +241,8 @@ gss_eap_shib_attr_provider::deleteAttribute(const gss_buffer_t attr) i = getAttributeIndex(attr); if (i >= 0) m_attributes.erase(m_attributes.begin() + i); + + m_authenticated = false; } bool @@ -236,25 +300,39 @@ gss_eap_shib_attr_provider::getAttribute(const gss_buffer_t attr, { const Attribute *shibAttr = NULL; gss_buffer_desc buf; + int nvalues, i = *more; + + *more = 0; shibAttr = getAttribute(attr); if (shibAttr == NULL) return false; - if (*more == -1) { - *more = 0; - } else if (*more >= (int)shibAttr->valueCount()) { - *more = 0; - return true; - } + nvalues = shibAttr->valueCount(); + + if (i == -1) + i = 0; + else if (i >= nvalues) + return false; buf.value = (void *)shibAttr->getString(*more); buf.length = strlen((char *)buf.value); - duplicateBuffer(buf, value); - - *authenticated = TRUE; - *complete = FALSE; + if (buf.length != 0) { + if (value != NULL) + duplicateBuffer(buf, value); + + if (display_value != NULL) + duplicateBuffer(buf, display_value); + } + + if (authenticated != NULL) + *authenticated = m_authenticated; + if (complete != NULL) + *complete = false; + + if (nvalues > ++i) + *more = i; return true; } @@ -265,6 +343,9 @@ gss_eap_shib_attr_provider::mapToAny(int authenticated, { gss_any_t output; + if (authenticated && !m_authenticated) + return (gss_any_t)NULL; + vector v = duplicateAttributes(m_attributes); output = (gss_any_t)new vector (v); @@ -281,51 +362,108 @@ gss_eap_shib_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id, } void -gss_eap_shib_attr_provider::marshall(gss_buffer_t buffer) const +gss_eap_shib_attr_provider::exportToBuffer(gss_buffer_t buffer) const { + DDF obj(NULL); + DDF attrs(NULL); + + buffer->length = 0; + buffer->value = NULL; + + obj.addmember("version").integer(1); + obj.addmember("authenticated").integer(m_authenticated); + + attrs = obj.addmember("attributes").list(); + for (vector::const_iterator a = m_attributes.begin(); + a != m_attributes.end(); ++a) { + DDF attr = (*a)->marshall(); + attrs.add(attr); + } + + ostringstream sink; + sink << attrs; + string str = sink.str(); + + duplicateBuffer(str, buffer); + + attrs.destroy(); } -gss_eap_attr_provider * -gss_eap_shib_attr_provider::unmarshall(const gss_eap_attr_ctx *ctx, - const gss_buffer_t buffer) +bool +gss_eap_shib_attr_provider::initFromBuffer(const gss_eap_attr_ctx *ctx, + const gss_buffer_t buffer) { - return NULL; + if (!gss_eap_attr_provider::initFromBuffer(ctx, buffer)) + return false; + + if (buffer->length == 0) + return true; + + assert(m_authenticated == false); + assert(m_attributes.size() == 0); + + DDF obj(NULL); + string str((const char *)buffer->value, buffer->length); + istringstream source(str); + + source >> obj; + + if (obj["version"].integer() != 1) + return false; + + m_authenticated = (obj["authenticated"].integer() != 0); + + DDF attrs = obj["attributes"]; + DDF attr = attrs.first(); + while (!attr.isnull()) { + Attribute *attribute = Attribute::unmarshall(attr); + m_attributes.push_back(attribute); + attr = attrs.next(); + } + + attrs.destroy(); + + return true; } bool gss_eap_shib_attr_provider::init(void) { - return ShibbolethResolver::init(); + if (!ShibbolethResolver::init()) + return false; + + gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL, + NULL, + gss_eap_shib_attr_provider::createAttrContext); + + return true; } void gss_eap_shib_attr_provider::finalize(void) { + gss_eap_attr_ctx::unregisterProvider(ATTR_TYPE_LOCAL); ShibbolethResolver::term(); } gss_eap_attr_provider * -gss_eap_shib_attr_provider::createAttrContext(const gss_eap_attr_ctx *ctx, - gss_cred_id_t gssCred, - gss_ctx_id_t gssCtx) +gss_eap_shib_attr_provider::createAttrContext(void) { - return new gss_eap_shib_attr_provider(ctx, gssCred, gssCtx); + return new gss_eap_shib_attr_provider; } -static Attribute * -duplicateAttribute(const Attribute *src) +Attribute * +gss_eap_shib_attr_provider::duplicateAttribute(const Attribute *src) { - Attribute *attribute; - DDF obj = src->marshall(); - attribute = Attribute::unmarshall(obj); + Attribute *attribute = Attribute::unmarshall(obj); obj.destroy(); return attribute; } -static vector -duplicateAttributes(const vector src) +vector +gss_eap_shib_attr_provider::duplicateAttributes(const vector src) { vector dst; @@ -336,3 +474,20 @@ duplicateAttributes(const vector src) return dst; } + +OM_uint32 +gssEapLocalAttrProviderInit(OM_uint32 *minor) +{ + if (!gss_eap_shib_attr_provider::init()) { + *minor = GSSEAP_SHIB_INIT_FAILURE; + return GSS_S_FAILURE; + } + return GSS_S_COMPLETE; +} + +OM_uint32 +gssEapLocalAttrProviderFinalize(OM_uint32 *minor) +{ + gss_eap_shib_attr_provider::finalize(); + return GSS_S_COMPLETE; +}