/*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* limitations under the License.
*/
-#include "gssapiP_eap.h"
+/*
+ * Local attribute provider implementation.
+ */
+
+#include <xmltooling/XMLObject.h>
+
+#include <saml/saml2/core/Assertions.h>
-#include <shibsp/Application.h>
#include <shibsp/exceptions.h>
-#include <shibsp/SPConfig.h>
-#include <shibsp/ServiceProvider.h>
-#include <shibsp/attribute/Attribute.h>
#include <shibsp/attribute/SimpleAttribute.h>
-#include <shibsp/attribute/resolver/ResolutionContext.h>
-#include <shibsp/handler/AssertionConsumerService.h>
-#include <shibsp/metadata/MetadataProviderCriteria.h>
-#include <shibsp/util/SPConstants.h>
+#include <shibresolver/resolver.h>
-#include <saml/saml1/core/Assertions.h>
-#include <saml/saml2/core/Assertions.h>
-#include <saml/saml2/metadata/Metadata.h>
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xmltooling/XMLToolingConfig.h>
-#include <xmltooling/util/XMLHelper.h>
+#include <sstream>
-#include "resolver.h"
+#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;
gss_eap_shib_attr_provider::gss_eap_shib_attr_provider(void)
{
const gss_eap_saml_assertion_provider *saml;
const gss_eap_radius_attr_provider *radius;
+#if 0
gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
- ShibbolethResolver *resolver = NULL;
OM_uint32 minor;
-
+#endif
if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx))
return false;
saml = static_cast<const gss_eap_saml_assertion_provider *>
- (manager->getProvider(ATTR_TYPE_SAML_ASSERTION));
+ (m_manager->getProvider(ATTR_TYPE_SAML_ASSERTION));
radius = static_cast<const gss_eap_radius_attr_provider *>
- (manager->getProvider(ATTR_TYPE_RADIUS));
+ (m_manager->getProvider(ATTR_TYPE_RADIUS));
+ auto_ptr<ShibbolethResolver> resolver(ShibbolethResolver::create());
+
+ /*
+ * For now, leave ApplicationID defaulted.
+ * Later on, we could allow this via config option to the mechanism
+ * or rely on an SPRequest interface to pass in a URI identifying the
+ * acceptor.
+ */
+#if 0
if (gssCred != GSS_C_NO_CREDENTIAL &&
- gss_display_name(&minor, gssCred->name, &nameBuf, NULL) == GSS_S_COMPLETE)
+ gssEapDisplayName(&minor, gssCred->name, &nameBuf, NULL) == GSS_S_COMPLETE) {
resolver->setApplicationID((const char *)nameBuf.value);
+ gss_release_buffer(&minor, &nameBuf);
+ }
+#endif
m_authenticated = false;
m_authenticated = saml->authenticated();
}
- resolver->resolveAttributes(m_attributes);
-
- gss_release_buffer(&minor, &nameBuf);
-
- delete resolver;
-
-#ifdef GSSEAP_DEBUG
- gss_buffer_desc testattr = {
- sizeof("urn:greet:greeting") - 1, (void *)"urn:greet:greeting" };
- gss_buffer_desc testval =
- { sizeof("Hello, GSS EAP.") - 1, (void *)"Hello, GSS EAP." };
- setAttribute(true, &testattr, &testval);
-#endif /* GSSEAP_DEBUG */
+ try {
+ resolver->resolve();
+ m_attributes = resolver->getResolvedAttributes();
+ resolver->getResolvedAttributes().clear();
+ } catch (exception &e) {
+ //fprintf(stderr, "%s", e.what());
+ }
return true;
}
-int
+ssize_t
gss_eap_shib_attr_provider::getAttributeIndex(const gss_buffer_t attr) const
{
int i = 0;
return -1;
}
-void
-gss_eap_shib_attr_provider::setAttribute(int complete,
+bool
+gss_eap_shib_attr_provider::setAttribute(int complete GSSEAP_UNUSED,
const gss_buffer_t attr,
const gss_buffer_t value)
{
m_attributes.push_back(a);
m_authenticated = false;
+
+ return true;
}
-void
+bool
gss_eap_shib_attr_provider::deleteAttribute(const gss_buffer_t attr)
{
int i;
m_attributes.erase(m_attributes.begin() + i);
m_authenticated = false;
+
+ return true;
}
bool
else if (i >= nvalues)
return false;
- buf.value = (void *)shibAttr->getString(*more);
+ buf.value = (void *)shibAttr->getSerializedValues()[*more].c_str();
buf.length = strlen((char *)buf.value);
if (buf.length != 0) {
if (authenticated != NULL)
*authenticated = m_authenticated;
if (complete != NULL)
- *complete = false;
+ *complete = true;
if (nvalues > ++i)
*more = i;
gss_any_t
gss_eap_shib_attr_provider::mapToAny(int authenticated,
- gss_buffer_t type_id) const
+ gss_buffer_t type_id GSSEAP_UNUSED) const
{
gss_any_t output;
+ if (authenticated && !m_authenticated)
+ return (gss_any_t)NULL;
+
vector <Attribute *>v = duplicateAttributes(m_attributes);
output = (gss_any_t)new vector <Attribute *>(v);
}
void
-gss_eap_shib_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id,
+gss_eap_shib_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UNUSED,
gss_any_t input) const
{
vector <Attribute *> *v = ((vector <Attribute *> *)input);
bool
gss_eap_shib_attr_provider::init(void)
{
-#if 1
- SPConfig& conf=SPConfig::getConfig();
- conf.setFeatures(
- SPConfig::Metadata |
- SPConfig::Trust |
- SPConfig::AttributeResolution |
- SPConfig::Credentials |
- SPConfig::OutOfProcess
- );
- if (!conf.init())
- return false;
- if (!conf.instantiate()) {
- conf.term();
- return false;
- }
-#else
if (!ShibbolethResolver::init())
return false;
-#endif
- gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL,
- NULL,
- gss_eap_shib_attr_provider::createAttrContext);
+ gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL, NULL, createAttrContext);
return true;
}
ShibbolethResolver::term();
}
+OM_uint32
+gss_eap_shib_attr_provider::mapException(OM_uint32 *minor,
+ std::exception &e) const
+{
+ if (typeid(e) == typeid(AttributeException))
+ *minor = GSSEAP_SHIB_ATTR_FAILURE;
+ else if (typeid(e) == typeid(AttributeExtractionException))
+ *minor = GSSEAP_SHIB_ATTR_EXTRACT_FAILURE;
+ else if (typeid(e) == typeid(AttributeFilteringException))
+ *minor = GSSEAP_SHIB_ATTR_FILTER_FAILURE;
+ else if (typeid(e) == typeid(AttributeResolutionException))
+ *minor = GSSEAP_SHIB_ATTR_RESOLVE_FAILURE;
+ else if (typeid(e) == typeid(ConfigurationException))
+ *minor = GSSEAP_SHIB_CONFIG_FAILURE;
+ else if (typeid(e) == typeid(ListenerException))
+ *minor = GSSEAP_SHIB_LISTENER_FAILURE;
+ else
+ return GSS_S_CONTINUE_NEEDED;
+
+ return GSS_S_FAILURE;
+}
+
gss_eap_attr_provider *
gss_eap_shib_attr_provider::createAttrContext(void)
{
OM_uint32
gssEapLocalAttrProviderInit(OM_uint32 *minor)
{
- return gss_eap_shib_attr_provider::init()
- ? GSS_S_COMPLETE : GSS_S_FAILURE;
+ 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();
+
+ *minor = 0;
return GSS_S_COMPLETE;
}