X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=mech_eap%2Futil_shib.cpp;h=3d2aa2cd55fc53b9c10a5d7e93060aca085d4ea9;hb=7f40c69dab3cb792b9d01ce600257b5541f65eac;hp=4358578e51bb1b9c912d315d8ccf923098d26c63;hpb=a1eb0e40f6dfb3b35579edb0409f176fc474d7ef;p=moonshot.git diff --git a/mech_eap/util_shib.cpp b/mech_eap/util_shib.cpp index 4358578..3d2aa2c 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,27 +100,19 @@ gss_eap_shib_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *mana m_authenticated = shib->authenticated(); } + m_initialized = true; + return true; } 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; - gss_buffer_desc exportedCtx = GSS_C_EMPTY_BUFFER; - OM_uint32 major, minor; - -#if 0 - gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER; -#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)); - auto_ptr resolver(ShibbolethResolver::create()); /* @@ -129,6 +122,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); @@ -136,18 +130,22 @@ gss_eap_shib_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager, } #endif - major = gssEapExportSecContext(&minor, gssCtx, &exportedCtx, - EXPORT_CTX_FLAG_DISABLE_LOCAL_ATTRS); + gss_buffer_desc mechName = GSS_C_EMPTY_BUFFER; + OM_uint32 major, minor; + + major = gssEapExportNameInternal(&minor, gssCtx->initiatorName, &mechName, + EXPORT_NAME_FLAG_OID | + EXPORT_NAME_FLAG_COMPOSITE); if (major == GSS_S_COMPLETE) { - resolver->addToken(&exportedCtx); - gss_release_buffer(&minor, &exportedCtx); + resolver->addToken(&mechName); + gss_release_buffer(&minor, &mechName); } - m_authenticated = true; - + 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()); - m_authenticated = saml->authenticated(); } try { @@ -155,11 +153,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; } @@ -168,6 +167,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) @@ -194,6 +195,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); @@ -211,6 +214,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); @@ -224,6 +229,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) @@ -245,6 +252,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) @@ -277,6 +286,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); @@ -287,7 +298,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(); @@ -318,6 +329,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; @@ -332,6 +345,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; } @@ -353,18 +368,21 @@ gss_eap_shib_attr_provider::jsonRepresentation(void) const { JSONObject obj; - obj.set("authenticated", m_authenticated); + if (m_initialized == false) + return obj; /* don't export incomplete context */ - JSONObject attrs = JSONObject::array(); + JSONObject jattrs = JSONObject::array(); for (vector::const_iterator a = m_attributes.begin(); a != m_attributes.end(); ++a) { DDF attr = (*a)->marshall(); - JSONObject jobj(attr); - attrs.append(jobj); + JSONObject jattr = JSONObject::ddf(attr); + jattrs.append(jattr); } - obj.set("attributes", attrs); + obj.set("attributes", jattrs); + + obj.set("authenticated", m_authenticated); return obj; } @@ -379,24 +397,28 @@ gss_eap_shib_attr_provider::initWithJsonObject(const gss_eap_attr_ctx *ctx, assert(m_authenticated == false); assert(m_attributes.size() == 0); - m_authenticated = obj["authenticated"].integer(); - - JSONObject attrs = obj["attributes"]; - size_t nelems = attrs.size(); + JSONObject jattrs = obj["attributes"]; + size_t nelems = jattrs.size(); for (size_t i = 0; i < nelems; i++) { - DDF attr = attrs.get(i).ddf(); + JSONObject jattr = jattrs.get(i); + + DDF attr = jattr.ddf(); Attribute *attribute = Attribute::unmarshall(attr); m_attributes.push_back(attribute); } + m_authenticated = obj["authenticated"].integer(); + m_initialized = true; + return true; } 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); @@ -430,6 +452,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; }