X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=mech_eap%2Futil_shib.cpp;h=b1464f7b59fd13716fed5450f129f6dec22734c0;hb=156cea08f449a20a965e5e004460bbd32361f106;hp=4da9a319a140ce8cea9b827179d3bed01818ad99;hpb=43146f6400fc19e112ed1a7c7d6e8dce3755f008;p=moonshot.git diff --git a/mech_eap/util_shib.cpp b/mech_eap/util_shib.cpp index 4da9a31..b1464f7 100644 --- a/mech_eap/util_shib.cpp +++ b/mech_eap/util_shib.cpp @@ -70,6 +70,7 @@ using namespace std; gss_eap_shib_attr_provider::gss_eap_shib_attr_provider(void) { + m_initialized = false; m_authenticated = false; } @@ -82,12 +83,12 @@ gss_eap_shib_attr_provider::~gss_eap_shib_attr_provider(void) } bool -gss_eap_shib_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *manager, +gss_eap_shib_attr_provider::initWithExistingContext(const gss_eap_attr_ctx *manager, const gss_eap_attr_provider *ctx) { const gss_eap_shib_attr_provider *shib; - if (!gss_eap_attr_provider::initFromExistingContext(manager, ctx)) { + if (!gss_eap_attr_provider::initWithExistingContext(manager, ctx)) { return false; } @@ -99,76 +100,55 @@ gss_eap_shib_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *mana m_authenticated = shib->authenticated(); } + m_initialized = true; + return true; } -bool -addRadiusAttribute(const gss_eap_attr_ctx *manager, - const gss_eap_attr_provider *provider, - const gss_buffer_t attribute, - void *data) +static OM_uint32 +exportMechSecContext(OM_uint32 *minor, + gss_ctx_id_t gssCtx, + gss_buffer_t mechContext) { - const gss_eap_radius_attr_provider *radius; - const gss_eap_shib_attr_provider *shib; - int authenticated, complete, more = -1; - vector attributeIds(1); - SimpleAttribute *a; - - radius = static_cast(provider); - shib = static_cast(data); + OM_uint32 major; + gss_buffer_desc exportedCtx; + unsigned char *p; - assert(radius != NULL && shib != NULL); - - string attributeName = - manager->composeAttributeName(ATTR_TYPE_RADIUS, attribute); - - attributeIds.push_back(attributeName); - a = new SimpleAttribute(attributeIds); - if (a == NULL) - return false; + assert(gssCtx->mechanismUsed != GSS_C_NO_OID); - while (more != 0) { - gss_buffer_desc value = GSS_C_EMPTY_BUFFER; - OM_uint32 minor; + major = gssEapExportSecContext(minor, gssCtx, &exportedCtx); + if (GSS_ERROR(major)) + return major; - 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); + /* + * gss_import_sec_context expects the exported security context token + * to be tagged with the mechanism OID; in Heimdal and MIT, this is + * done by the mechglue, so if we are subverting the mechglue we need + * to add it ourselves. + */ + mechContext->length = 4 + gssCtx->mechanismUsed->length + exportedCtx.length; + mechContext->value = p = (unsigned char *)GSSEAP_MALLOC(mechContext->length); + if (mechContext->value == NULL) { + gss_release_buffer(minor, &exportedCtx); + throw std::bad_alloc(); } - shib->getAttributes().push_back(a); + p = store_oid(gssCtx->mechanismUsed, p); + memcpy(p, exportedCtx.value, exportedCtx.length); - return true; + gss_release_buffer(minor, &exportedCtx); + + return GSS_S_COMPLETE; } bool -gss_eap_shib_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager, +gss_eap_shib_attr_provider::initWithGssContext(const gss_eap_attr_ctx *manager, const gss_cred_id_t gssCred, const gss_ctx_id_t gssCtx) { - const gss_eap_saml_assertion_provider *saml; - const gss_eap_radius_attr_provider *radius; -#if 0 - gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER; - OM_uint32 minor; -#endif - if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx)) + if (!gss_eap_attr_provider::initWithGssContext(manager, gssCred, gssCtx)) return false; - saml = static_cast - (m_manager->getProvider(ATTR_TYPE_SAML_ASSERTION)); - radius = static_cast - (m_manager->getProvider(ATTR_TYPE_RADIUS)); - auto_ptr resolver(ShibbolethResolver::create()); /* @@ -178,6 +158,7 @@ gss_eap_shib_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager, * acceptor. */ #if 0 + gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER; if (gssCred != GSS_C_NO_CREDENTIAL && gssEapDisplayName(&minor, gssCred->name, &nameBuf, NULL) == GSS_S_COMPLETE) { resolver->setApplicationID((const char *)nameBuf.value); @@ -185,17 +166,19 @@ gss_eap_shib_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager, } #endif - m_authenticated = false; - - if (radius != NULL) { - radius->getAttributeTypes(addRadiusAttribute, (void *)this); - m_authenticated = radius->authenticated(); + gss_buffer_desc mechContext = GSS_C_EMPTY_BUFFER; + OM_uint32 major, minor; + major = exportMechSecContext(&minor, gssCtx, &mechContext); + if (major == GSS_S_COMPLETE) { + resolver->addToken(&mechContext); + gss_release_buffer(&minor, &mechContext); } + const gss_eap_saml_assertion_provider *saml; + saml = static_cast + (m_manager->getProvider(ATTR_TYPE_SAML_ASSERTION)); if (saml != NULL && saml->getAssertion() != NULL) { resolver->addToken(saml->getAssertion()); - if (m_authenticated) - m_authenticated = saml->authenticated(); } try { @@ -203,11 +186,12 @@ gss_eap_shib_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager, m_attributes = resolver->getResolvedAttributes(); resolver->getResolvedAttributes().clear(); } catch (exception &e) { -#if 0 - fprintf(stderr, "%s", e.what()); -#endif + return false; } + m_authenticated = true; + m_initialized = true; + return true; } @@ -216,6 +200,8 @@ gss_eap_shib_attr_provider::getAttributeIndex(const gss_buffer_t attr) const { int i = 0; + assert(m_initialized); + for (vector::const_iterator a = m_attributes.begin(); a != m_attributes.end(); ++a) @@ -242,6 +228,8 @@ gss_eap_shib_attr_provider::setAttribute(int complete GSSEAP_UNUSED, vector ids(1, attrStr); SimpleAttribute *a = new SimpleAttribute(ids); + assert(m_initialized); + if (value->length != 0) { string valueStr((char *)value->value, value->length); @@ -259,6 +247,8 @@ gss_eap_shib_attr_provider::deleteAttribute(const gss_buffer_t attr) { int i; + assert(m_initialized); + i = getAttributeIndex(attr); if (i >= 0) m_attributes.erase(m_attributes.begin() + i); @@ -272,6 +262,8 @@ bool gss_eap_shib_attr_provider::getAttributeTypes(gss_eap_attr_enumeration_cb addAttribute, void *data) const { + assert(m_initialized); + for (vector::const_iterator a = m_attributes.begin(); a != m_attributes.end(); ++a) @@ -293,6 +285,8 @@ gss_eap_shib_attr_provider::getAttribute(const gss_buffer_t attr) const { const Attribute *ret = NULL; + assert(m_initialized); + for (vector::const_iterator a = m_attributes.begin(); a != m_attributes.end(); ++a) @@ -325,6 +319,8 @@ gss_eap_shib_attr_provider::getAttribute(const gss_buffer_t attr, gss_buffer_desc buf; int nvalues, i = *more; + assert(m_initialized); + *more = 0; shibAttr = getAttribute(attr); @@ -335,7 +331,7 @@ gss_eap_shib_attr_provider::getAttribute(const gss_buffer_t attr, if (i == -1) i = 0; - else if (i >= nvalues) + if (i >= nvalues) return false; buf.value = (void *)shibAttr->getSerializedValues()[*more].c_str(); @@ -366,6 +362,8 @@ gss_eap_shib_attr_provider::mapToAny(int authenticated, { gss_any_t output; + assert(m_initialized); + if (authenticated && !m_authenticated) return (gss_any_t)NULL; @@ -380,6 +378,8 @@ void gss_eap_shib_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UNUSED, gss_any_t input) const { + assert(m_initialized); + vector *v = ((vector *)input); delete v; } @@ -390,67 +390,59 @@ gss_eap_shib_attr_provider::prefix(void) const return NULL; } -void -gss_eap_shib_attr_provider::exportToBuffer(gss_buffer_t buffer) const +const char * +gss_eap_shib_attr_provider::name(void) const +{ + return "local"; +} + +JSONObject +gss_eap_shib_attr_provider::jsonRepresentation(void) const { - DDF obj(NULL); - DDF attrs(NULL); + JSONObject obj; - buffer->length = 0; - buffer->value = NULL; + if (m_initialized == false) + return obj; /* don't export incomplete context */ - obj.addmember("version").integer(1); - obj.addmember("authenticated").integer(m_authenticated); + JSONObject jattrs = JSONObject::array(); - 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); + JSONObject jattr = JSONObject::ddf(attr); + jattrs.append(jattr); } - ostringstream sink; - sink << obj; - string str = sink.str(); + obj.set("attributes", jattrs); - duplicateBuffer(str, buffer); + obj.set("authenticated", m_authenticated); - attrs.destroy(); + return obj; } bool -gss_eap_shib_attr_provider::initFromBuffer(const gss_eap_attr_ctx *ctx, - const gss_buffer_t buffer) +gss_eap_shib_attr_provider::initWithJsonObject(const gss_eap_attr_ctx *ctx, + JSONObject &obj) { - if (!gss_eap_attr_provider::initFromBuffer(ctx, buffer)) + if (!gss_eap_attr_provider::initWithJsonObject(ctx, obj)) 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; + JSONObject jattrs = obj["attributes"]; + size_t nelems = jattrs.size(); - if (obj["version"].integer() != 1) - return false; - - m_authenticated = (obj["authenticated"].integer() != 0); + for (size_t i = 0; i < nelems; i++) { + JSONObject jattr = jattrs.get(i); - DDF attrs = obj["attributes"]; - DDF attr = attrs.first(); - while (!attr.isnull()) { + DDF attr = jattr.ddf(); Attribute *attribute = Attribute::unmarshall(attr); m_attributes.push_back(attribute); - attr = attrs.next(); } - attrs.destroy(); + m_authenticated = obj["authenticated"].integer(); + m_initialized = true; return true; } @@ -458,7 +450,8 @@ gss_eap_shib_attr_provider::initFromBuffer(const gss_eap_attr_ctx *ctx, bool gss_eap_shib_attr_provider::init(void) { - if (!ShibbolethResolver::init()) + if (SPConfig::getConfig().getFeatures() == 0 && + ShibbolethResolver::init() == false) return false; gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL, createAttrContext); @@ -492,6 +485,8 @@ gss_eap_shib_attr_provider::mapException(OM_uint32 *minor, else return GSS_S_CONTINUE_NEEDED; + gssEapSaveStatusInfo(*minor, "%s", e.what()); + return GSS_S_FAILURE; }