X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=mech_eap%2Futil_saml.cpp;h=8722b841592ef5d72228e09b365c0782368a25e4;hb=refs%2Fheads%2Fjson-name;hp=922b64c695027c3ad74c19713123044215e569d8;hpb=d85552d05d58ea1be786bf6aa9d12ab8dff155f8;p=moonshot.git diff --git a/mech_eap/util_saml.cpp b/mech_eap/util_saml.cpp index 922b64c..8722b84 100644 --- a/mech_eap/util_saml.cpp +++ b/mech_eap/util_saml.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,17 +30,26 @@ * SUCH DAMAGE. */ +/* + * SAML attribute provider implementation. + */ + #include "gssapiP_eap.h" #include #include +#include #include #include +#include +#include +#include #include #include #include +#include using namespace xmltooling; using namespace opensaml::saml2md; @@ -96,11 +105,14 @@ gss_eap_saml_assertion_provider::initFromGssContext(const gss_eap_attr_ctx *mana if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx)) return false; + /* + * XXX TODO we need to support draft-howlett-radius-saml-attr-00 + */ radius = static_cast (m_manager->getProvider(ATTR_TYPE_RADIUS)); if (radius != NULL && - radius->getFragmentedAttribute(VENDOR_ATTR_SAML_AAA_ASSERTION, - VENDOR_ID_GSS_EAP, + radius->getFragmentedAttribute(PW_SAML_AAA_ASSERTION, + VENDORPEC_UKERNA, &authenticated, &complete, &value)) { setAssertion(&value, authenticated); gss_release_buffer(&minor, &value); @@ -119,10 +131,10 @@ gss_eap_saml_assertion_provider::setAssertion(const saml2::Assertion *assertion, delete m_assertion; if (assertion != NULL) { -#if 0 - m_assertion = dynamic_cast(assertion->clone()); -#else +#ifdef __APPLE__ m_assertion = (saml2::Assertion *)((void *)assertion->clone()); +#else + m_assertion = dynamic_cast(assertion->clone()); #endif m_authenticated = authenticated; } else { @@ -149,17 +161,21 @@ gss_eap_saml_assertion_provider::parseAssertion(const gss_buffer_t buffer) DOMDocument *doc; const XMLObjectBuilder *b; - doc = XMLToolingConfig::getConfig().getParser().parse(istream); - if (doc == NULL) - return NULL; + try { + doc = XMLToolingConfig::getConfig().getParser().parse(istream); + if (doc == NULL) + return NULL; - b = XMLObjectBuilder::getBuilder(doc->getDocumentElement()); + b = XMLObjectBuilder::getBuilder(doc->getDocumentElement()); -#if 0 - return dynamic_cast(b->buildFromDocument(doc)); +#ifdef __APPLE__ + return (saml2::Assertion *)((void *)b->buildFromDocument(doc)); #else - return (saml2::Assertion *)((void *)b->buildFromDocument(doc)); + return dynamic_cast(b->buildFromDocument(doc)); #endif + } catch (exception &e) { + return NULL; + } } bool @@ -170,29 +186,34 @@ gss_eap_saml_assertion_provider::getAttributeTypes(gss_eap_attr_enumeration_cb a /* just add the prefix */ if (m_assertion != NULL) - ret = addAttribute(this, GSS_C_NO_BUFFER, data); + ret = addAttribute(m_manager, this, GSS_C_NO_BUFFER, data); else ret = true; return ret; } -void -gss_eap_saml_assertion_provider::setAttribute(int complete, +bool +gss_eap_saml_assertion_provider::setAttribute(int complete GSSEAP_UNUSED, const gss_buffer_t attr, const gss_buffer_t value) { if (attr == GSS_C_NO_BUFFER || attr->length == 0) { setAssertion(value); + return true; } + + return false; } -void -gss_eap_saml_assertion_provider::deleteAttribute(const gss_buffer_t value) +bool +gss_eap_saml_assertion_provider::deleteAttribute(const gss_buffer_t value GSSEAP_UNUSED) { delete m_assertion; m_assertion = NULL; m_authenticated = false; + + return true; } time_t @@ -212,12 +233,34 @@ gss_eap_saml_assertion_provider::getExpiryTime(void) const return expiryTime; } +OM_uint32 +gss_eap_saml_assertion_provider::mapException(OM_uint32 *minor, + std::exception &e) const +{ + if (typeid(e) == typeid(SecurityPolicyException)) + *minor = GSSEAP_SAML_SEC_POLICY_FAILURE; + else if (typeid(e) == typeid(BindingException)) + *minor = GSSEAP_SAML_BINDING_FAILURE; + else if (typeid(e) == typeid(ProfileException)) + *minor = GSSEAP_SAML_PROFILE_FAILURE; + else if (typeid(e) == typeid(FatalProfileException)) + *minor = GSSEAP_SAML_FATAL_PROFILE_FAILURE; + else if (typeid(e) == typeid(RetryableProfileException)) + *minor = GSSEAP_SAML_RETRY_PROFILE_FAILURE; + else if (typeid(e) == typeid(MetadataException)) + *minor = GSSEAP_SAML_METADATA_FAILURE; + else + return GSS_S_CONTINUE_NEEDED; + + return GSS_S_FAILURE; +} + bool gss_eap_saml_assertion_provider::getAttribute(const gss_buffer_t attr, int *authenticated, int *complete, gss_buffer_t value, - gss_buffer_t display_value, + gss_buffer_t display_value GSSEAP_UNUSED, int *more) const { string str; @@ -246,7 +289,7 @@ gss_eap_saml_assertion_provider::getAttribute(const gss_buffer_t attr, gss_any_t gss_eap_saml_assertion_provider::mapToAny(int authenticated, - gss_buffer_t type_id) const + gss_buffer_t type_id GSSEAP_UNUSED) const { if (authenticated && !m_authenticated) return (gss_any_t)NULL; @@ -255,54 +298,22 @@ gss_eap_saml_assertion_provider::mapToAny(int authenticated, } void -gss_eap_saml_assertion_provider::releaseAnyNameMapping(gss_buffer_t type_id, +gss_eap_saml_assertion_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UNUSED, gss_any_t input) const { delete ((saml2::Assertion *)input); } -void -gss_eap_saml_assertion_provider::exportToBuffer(gss_buffer_t buffer) const +const char * +gss_eap_saml_assertion_provider::prefix(void) const { - ostringstream sink; - string str; - - buffer->length = 0; - buffer->value = NULL; - - if (m_assertion == NULL) - return; - - sink << *m_assertion; - str = sink.str(); - - duplicateBuffer(str, buffer); -} - -bool -gss_eap_saml_assertion_provider::initFromBuffer(const gss_eap_attr_ctx *ctx, - const gss_buffer_t buffer) -{ - if (!gss_eap_attr_provider::initFromBuffer(ctx, buffer)) - return false; - - if (buffer->length == 0) - return true; - - assert(m_assertion == NULL); - - setAssertion(buffer); - /* TODO XXX how to propagate authenticated flag? */ - - return true; + return "urn:ietf:params:gss-eap:saml-aaa-assertion"; } bool gss_eap_saml_assertion_provider::init(void) { - gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML_ASSERTION, - "urn:ietf:params:gss-eap:saml-aaa-assertion", - gss_eap_saml_assertion_provider::createAttrContext); + gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML_ASSERTION, createAttrContext); return true; } @@ -318,14 +329,25 @@ gss_eap_saml_assertion_provider::createAttrContext(void) return new gss_eap_saml_assertion_provider; } +saml2::Assertion * +gss_eap_saml_assertion_provider::initAssertion(void) +{ + delete m_assertion; + m_assertion = saml2::AssertionBuilder::buildAssertion(); + m_authenticated = false; + + return m_assertion; +} + /* * gss_eap_saml_attr_provider is for retrieving the underlying attributes. */ bool gss_eap_saml_attr_provider::getAssertion(int *authenticated, - const saml2::Assertion **pAssertion) const + saml2::Assertion **pAssertion, + bool createIfAbsent) const { - const gss_eap_saml_assertion_provider *saml; + gss_eap_saml_assertion_provider *saml; if (authenticated != NULL) *authenticated = false; @@ -342,15 +364,24 @@ gss_eap_saml_attr_provider::getAssertion(int *authenticated, if (pAssertion != NULL) *pAssertion = saml->getAssertion(); - return (saml->getAssertion() != NULL); + if (saml->getAssertion() == NULL) { + if (createIfAbsent) { + if (authenticated != NULL) + *authenticated = false; + if (pAssertion != NULL) + *pAssertion = saml->initAssertion(); + } else + return false; + } + + return true; } bool gss_eap_saml_attr_provider::getAttributeTypes(gss_eap_attr_enumeration_cb addAttribute, void *data) const { - const saml2::Assertion *assertion; - bool ret = true; + saml2::Assertion *assertion; int authenticated; if (!getAssertion(&authenticated, &assertion)) @@ -370,48 +401,47 @@ gss_eap_saml_attr_provider::getAttributeTypes(gss_eap_attr_enumeration_cb addAtt * query, the retrieved attributes SHOULD be GSS-API name attributes * using the same name syntax. */ - const vector& attrs2 = - const_cast(assertion->getAttributeStatements().front())->getAttributes(); - for (vector::const_iterator a = attrs2.begin(); - a != attrs2.end(); - ++a) - { - const XMLCh *attributeName = (*a)->getName(); - const XMLCh *attributeNameFormat = (*a)->getNameFormat(); - XMLCh *qualifiedName; - XMLCh space[2] = { ' ', 0 }; - gss_buffer_desc utf8; - - qualifiedName = new XMLCh[XMLString::stringLen(attributeNameFormat) + 1 + - XMLString::stringLen(attributeName) + 1]; - XMLString::copyString(qualifiedName, attributeNameFormat); - XMLString::catString(qualifiedName, space); - XMLString::catString(qualifiedName, attributeName); - - utf8.value = (void *)toUTF8(qualifiedName); - utf8.length = strlen((char *)utf8.value); - - ret = addAttribute(this, &utf8, data); - - delete qualifiedName; - - if (!ret) - break; - } + /* For each attribute statement, look for an attribute match */ + const vector &statements = + const_cast(assertion)->getAttributeStatements(); - return ret; -} + for (vector::const_iterator s = statements.begin(); + s != statements.end(); + ++s) { + const vector &attrs = + const_cast(*s)->getAttributes(); -void -gss_eap_saml_attr_provider::setAttribute(int complete, - const gss_buffer_t attr, - const gss_buffer_t value) -{ -} + for (vector::const_iterator a = attrs.begin(); a != attrs.end(); ++a) { + const XMLCh *attributeName, *attributeNameFormat; + XMLCh *qualifiedName; + XMLCh space[2] = { ' ', 0 }; + gss_buffer_desc utf8; + bool ret; -void -gss_eap_saml_attr_provider::deleteAttribute(const gss_buffer_t value) -{ + attributeName = (*a)->getName(); + attributeNameFormat = (*a)->getNameFormat(); + if (attributeNameFormat == NULL || attributeNameFormat[0] == '\0') + attributeNameFormat = saml2::Attribute::UNSPECIFIED; + + qualifiedName = new XMLCh[XMLString::stringLen(attributeNameFormat) + 1 + + XMLString::stringLen(attributeName) + 1]; + XMLString::copyString(qualifiedName, attributeNameFormat); + XMLString::catString(qualifiedName, space); + XMLString::catString(qualifiedName, attributeName); + + utf8.value = (void *)toUTF8(qualifiedName); + utf8.length = strlen((char *)utf8.value); + + ret = addAttribute(m_manager, this, &utf8, data); + + delete qualifiedName; + + if (!ret) + return ret; + } + } + + return true; } static BaseRefVectorOf * @@ -424,16 +454,115 @@ decomposeAttributeName(const gss_buffer_t attr) delete qualifiedAttr; + if (components->size() != 2) { + delete components; + components = NULL; + } + return components; } bool +gss_eap_saml_attr_provider::setAttribute(int complete GSSEAP_UNUSED, + const gss_buffer_t attr, + const gss_buffer_t value) +{ + saml2::Assertion *assertion; + saml2::Attribute *attribute; + saml2::AttributeValue *attributeValue; + saml2::AttributeStatement *attributeStatement; + + if (!getAssertion(NULL, &assertion, true)) + return false; + + if (assertion->getAttributeStatements().size() != 0) { + attributeStatement = assertion->getAttributeStatements().front(); + } else { + attributeStatement = saml2::AttributeStatementBuilder::buildAttributeStatement(); + assertion->getAttributeStatements().push_back(attributeStatement); + } + + /* Check the attribute name consists of name format | whsp | name */ + BaseRefVectorOf *components = decomposeAttributeName(attr); + if (components == NULL) + return false; + + attribute = saml2::AttributeBuilder::buildAttribute(); + attribute->setNameFormat(components->elementAt(0)); + attribute->setName(components->elementAt(1)); + + XMLCh *xmlValue = new XMLCh[value->length + 1]; + XMLString::transcode((const char *)value->value, xmlValue, attr->length); + + attributeValue = saml2::AttributeValueBuilder::buildAttributeValue(); + attributeValue->setTextContent(xmlValue); + + attribute->getAttributeValues().push_back(attributeValue); + + assert(attributeStatement != NULL); + attributeStatement->getAttributes().push_back(attribute); + + delete components; + delete xmlValue; + + return true; +} + +bool +gss_eap_saml_attr_provider::deleteAttribute(const gss_buffer_t attr) +{ + saml2::Assertion *assertion; + bool ret = false; + + if (!getAssertion(NULL, &assertion) || + assertion->getAttributeStatements().size() == 0) + return false; + + /* Check the attribute name consists of name format | whsp | name */ + BaseRefVectorOf *components = decomposeAttributeName(attr); + if (components == NULL) + return false; + + /* For each attribute statement, look for an attribute match */ + const vector &statements = + const_cast(assertion)->getAttributeStatements(); + + for (vector::const_iterator s = statements.begin(); + s != statements.end(); + ++s) { + const vector &attrs = + const_cast(*s)->getAttributes(); + ssize_t index = -1, i = 0; + + /* There's got to be an easier way to do this */ + for (vector::const_iterator a = attrs.begin(); + a != attrs.end(); + ++a) { + if (XMLString::equals((*a)->getNameFormat(), components->elementAt(0)) && + XMLString::equals((*a)->getName(), components->elementAt(1))) { + index = i; + break; + } + ++i; + } + if (index != -1) { + (*s)->getAttributes().erase((*s)->getAttributes().begin() + index); + ret = true; + } + } + + delete components; + + return ret; +} + +bool gss_eap_saml_attr_provider::getAttribute(const gss_buffer_t attr, int *authenticated, int *complete, const saml2::Attribute **pAttribute) const { - const saml2::Assertion *assertion; + saml2::Assertion *assertion; if (authenticated != NULL) *authenticated = false; @@ -447,25 +576,30 @@ gss_eap_saml_attr_provider::getAttribute(const gss_buffer_t attr, /* Check the attribute name consists of name format | whsp | name */ BaseRefVectorOf *components = decomposeAttributeName(attr); - if (components == NULL || components->size() != 2) { - delete components; + if (components == NULL) return false; - } /* For each attribute statement, look for an attribute match */ - const vector &statements = - assertion->getAttributeStatements(); + const vector &statements = + const_cast(assertion)->getAttributeStatements(); const saml2::Attribute *ret = NULL; for (vector::const_iterator s = statements.begin(); s != statements.end(); ++s) { - const vector& attrs = + const vector &attrs = const_cast(*s)->getAttributes(); - for (vector::const_iterator a = attrs.begin(); a != attrs.end(); ++a) { - if (XMLString::equals((*a)->getNameFormat(), components->elementAt(0)) && - XMLString::equals((*a)->getName(), components->elementAt(1))) { + for (vector::const_iterator a = attrs.begin(); a != attrs.end(); ++a) { + const XMLCh *attributeName, *attributeNameFormat; + + attributeName = (*a)->getName(); + attributeNameFormat = (*a)->getNameFormat(); + if (attributeNameFormat == NULL || attributeNameFormat[0] == '\0') + attributeNameFormat = saml2::Attribute::UNSPECIFIED; + + if (XMLString::equals(attributeNameFormat, components->elementAt(0)) && + XMLString::equals(attributeName, components->elementAt(1))) { ret = *a; break; } @@ -505,10 +639,10 @@ gss_eap_saml_attr_provider::getAttribute(const gss_buffer_t attr, i = 0; else if (i >= nvalues) return false; -#if 0 - av = dynamic_cast(a->getAttributeValues().at(i)); -#else +#ifdef __APPLE__ av = (const saml2::AttributeValue *)((void *)(a->getAttributeValues().at(i))); +#else + av = dynamic_cast(a->getAttributeValues().at(i)); #endif if (av != NULL) { if (value != NULL) { @@ -528,38 +662,28 @@ gss_eap_saml_attr_provider::getAttribute(const gss_buffer_t attr, } gss_any_t -gss_eap_saml_attr_provider::mapToAny(int authenticated, - gss_buffer_t type_id) const +gss_eap_saml_attr_provider::mapToAny(int authenticated GSSEAP_UNUSED, + gss_buffer_t type_id GSSEAP_UNUSED) const { return (gss_any_t)NULL; } void -gss_eap_saml_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id, - gss_any_t input) const +gss_eap_saml_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UNUSED, + gss_any_t input GSSEAP_UNUSED) const { } -void -gss_eap_saml_attr_provider::exportToBuffer(gss_buffer_t buffer) const -{ - buffer->length = 0; - buffer->value = NULL; -} - -bool -gss_eap_saml_attr_provider::initFromBuffer(const gss_eap_attr_ctx *ctx, - const gss_buffer_t buffer) +const char * +gss_eap_saml_attr_provider::prefix(void) const { - return gss_eap_attr_provider::initFromBuffer(ctx, buffer); + return "urn:ietf:params:gss-eap:saml-attr"; } bool gss_eap_saml_attr_provider::init(void) { - gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML, - "urn:ietf:params:gss-eap:saml-attr", - gss_eap_saml_attr_provider::createAttrContext); + gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML, createAttrContext); return true; } @@ -578,11 +702,13 @@ gss_eap_saml_attr_provider::createAttrContext(void) OM_uint32 gssEapSamlAttrProvidersInit(OM_uint32 *minor) { - if (gss_eap_saml_assertion_provider::init() && - gss_eap_saml_attr_provider::init()) - return GSS_S_COMPLETE; + if (!gss_eap_saml_assertion_provider::init() || + !gss_eap_saml_attr_provider::init()) { + *minor = GSSEAP_SAML_INIT_FAILURE; + return GSS_S_FAILURE; + } - return GSS_S_FAILURE; + return GSS_S_COMPLETE; } OM_uint32 @@ -590,5 +716,7 @@ gssEapSamlAttrProvidersFinalize(OM_uint32 *minor) { gss_eap_saml_attr_provider::finalize(); gss_eap_saml_assertion_provider::finalize(); + + *minor = 0; return GSS_S_COMPLETE; }