/*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* SUCH DAMAGE.
*/
+/*
+ * SAML attribute provider implementation.
+ */
+
#include "gssapiP_eap.h"
#include <sstream>
#include <xmltooling/util/ParserPool.h>
#include <xmltooling/util/DateTime.h>
+#include <saml/exceptions.h>
#include <saml/saml1/core/Assertions.h>
#include <saml/saml2/core/Assertions.h>
#include <saml/saml2/metadata/Metadata.h>
+#include <saml/saml2/metadata/MetadataProvider.h>
using namespace xmltooling;
using namespace opensaml::saml2md;
radius = static_cast<const gss_eap_radius_attr_provider *>
(m_manager->getProvider(ATTR_TYPE_RADIUS));
if (radius != NULL &&
- radius->getFragmentedAttribute(VENDOR_ATTR_SAML_AAA_ASSERTION,
- VENDOR_ID_UKERNA,
+ radius->getFragmentedAttribute(PW_SAML_AAA_ASSERTION,
+ VENDORPEC_UKERNA,
&authenticated, &complete, &value)) {
setAssertion(&value, authenticated);
gss_release_buffer(&minor, &value);
delete m_assertion;
if (assertion != NULL) {
-#if 0
- XMLObject *tmp = assertion->clone();
- m_assertion = dynamic_cast<saml2::Assertion *>(tmp);
-// m_assertion = dynamic_cast<saml2::Assertion *>(assertion->clone());
-#else
+#ifdef __APPLE__
m_assertion = (saml2::Assertion *)((void *)assertion->clone());
+#else
+ m_assertion = dynamic_cast<saml2::Assertion *>(assertion->clone());
#endif
m_authenticated = authenticated;
} else {
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<saml2::Assertion *>(b->buildFromDocument(doc));
+#ifdef __APPLE__
+ return (saml2::Assertion *)((void *)b->buildFromDocument(doc));
#else
- return (saml2::Assertion *)((void *)b->buildFromDocument(doc));
+ return dynamic_cast<saml2::Assertion *>(b->buildFromDocument(doc));
#endif
+ } catch (exception &e) {
+ return NULL;
+ }
}
bool
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
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;
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;
}
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);
{
gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML_ASSERTION,
"urn:ietf:params:gss-eap:saml-aaa-assertion",
- gss_eap_saml_assertion_provider::createAttrContext);
+ createAttrContext);
return true;
}
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;
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))
* query, the retrieved attributes SHOULD be GSS-API name attributes
* using the same name syntax.
*/
- const vector<saml2::Attribute*>& attrs2 =
- const_cast<const saml2::AttributeStatement*>(assertion->getAttributeStatements().front())->getAttributes();
- for (vector<saml2::Attribute*>::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 <saml2::AttributeStatement *> &statements =
+ const_cast<const saml2::Assertion *>(assertion)->getAttributeStatements();
- return ret;
-}
+ for (vector<saml2::AttributeStatement *>::const_iterator s = statements.begin();
+ s != statements.end();
+ ++s) {
+ const vector<saml2::Attribute*> &attrs =
+ const_cast<const saml2::AttributeStatement*>(*s)->getAttributes();
-void
-gss_eap_saml_attr_provider::setAttribute(int complete,
- const gss_buffer_t attr,
- const gss_buffer_t value)
-{
-}
+ for (vector<saml2::Attribute*>::const_iterator a = attrs.begin(); a != attrs.end(); ++a) {
+ const XMLCh *attributeName = (*a)->getName();
+ const XMLCh *attributeNameFormat = (*a)->getNameFormat();
+ XMLCh *qualifiedName;
+ XMLCh space[2] = { ' ', 0 };
+ gss_buffer_desc utf8;
+ bool ret;
-void
-gss_eap_saml_attr_provider::deleteAttribute(const gss_buffer_t value)
-{
+ 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)
+ return ret;
+ }
+ }
+
+ return true;
}
static BaseRefVectorOf<XMLCh> *
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<XMLCh> *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<XMLCh> *components = decomposeAttributeName(attr);
+ if (components == NULL)
+ return false;
+
+ /* For each attribute statement, look for an attribute match */
+ const vector<saml2::AttributeStatement *> &statements =
+ const_cast<const saml2::Assertion *>(assertion)->getAttributeStatements();
+
+ for (vector<saml2::AttributeStatement *>::const_iterator s = statements.begin();
+ s != statements.end();
+ ++s) {
+ const vector<saml2::Attribute *> &attrs =
+ const_cast<const saml2::AttributeStatement *>(*s)->getAttributes();
+ ssize_t index = -1, i = 0;
+
+ /* There's got to be an easier way to do this */
+ for (vector<saml2::Attribute *>::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;
/* Check the attribute name consists of name format | whsp | name */
BaseRefVectorOf<XMLCh> *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 <saml2::AttributeStatement *>&statements =
- assertion->getAttributeStatements();
+ const vector <saml2::AttributeStatement *> &statements =
+ const_cast<const saml2::Assertion *>(assertion)->getAttributeStatements();
const saml2::Attribute *ret = NULL;
for (vector<saml2::AttributeStatement *>::const_iterator s = statements.begin();
s != statements.end();
++s) {
- const vector<saml2::Attribute*>& attrs =
+ const vector<saml2::Attribute *> &attrs =
const_cast<const saml2::AttributeStatement*>(*s)->getAttributes();
- for (vector<saml2::Attribute*>::const_iterator a = attrs.begin(); a != attrs.end(); ++a) {
+ for (vector<saml2::Attribute *>::const_iterator a = attrs.begin(); a != attrs.end(); ++a) {
if (XMLString::equals((*a)->getNameFormat(), components->elementAt(0)) &&
XMLString::equals((*a)->getName(), components->elementAt(1))) {
ret = *a;
i = 0;
else if (i >= nvalues)
return false;
-#if 0
- av = dynamic_cast<const saml2::AttributeValue *>(a->getAttributeValues().at(i));
-#else
+#ifdef __APPLE__
av = (const saml2::AttributeValue *)((void *)(a->getAttributeValues().at(i)));
+#else
+ av = dynamic_cast<const saml2::AttributeValue *>(a->getAttributeValues().at(i));
#endif
if (av != NULL) {
if (value != NULL) {
}
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
{
}
{
gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML,
"urn:ietf:params:gss-eap:saml-attr",
- gss_eap_saml_attr_provider::createAttrContext);
+ createAttrContext);
return true;
}
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
{
gss_eap_saml_attr_provider::finalize();
gss_eap_saml_assertion_provider::finalize();
+
+ *minor = 0;
return GSS_S_COMPLETE;
}