*/
/*
* Copyright 2001-2009 Internet2
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* limitations under the License.
*/
-#include "gssapiP_eap.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 <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 <shibresolver/resolver.h>
-#include "resolver.h"
+#include <sstream>
+
+#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;
gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
- ShibbolethResolver *resolver = NULL;
+ ShibbolethResolver *resolver;
OM_uint32 minor;
if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx))
radius = static_cast<const gss_eap_radius_attr_provider *>
(manager->getProvider(ATTR_TYPE_RADIUS));
+ resolver = ShibbolethResolver::create();
+
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);
m_authenticated = false;
m_authenticated = saml->authenticated();
}
- resolver->resolveAttributes(m_attributes);
+ resolver->resolve();
+
+ m_attributes = resolver->getResolvedAttributes();
+ resolver->getResolvedAttributes().clear();
gss_release_buffer(&minor, &nameBuf);
const gss_buffer_t value)
{
string attrStr((char *)attr->value, attr->length);
- vector <string> ids(1);
-
- ids.push_back(attrStr);
-
+ vector <string> ids(1, attrStr);
SimpleAttribute *a = new SimpleAttribute(ids);
if (value->length != 0) {
string valueStr((char *)value->value, value->length);
- a->getValues().push_back(valueStr);
+ a->getValues().push_back(valueStr);
}
m_attributes.push_back(a);
duplicateBuffer(buf, display_value);
}
- if (authenticated != NULL)
+ if (authenticated != NULL)
*authenticated = m_authenticated;
if (complete != NULL)
*complete = false;
{
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::finalize(void)
{
- ShibbolethResolver::term();
gss_eap_attr_ctx::unregisterProvider(ATTR_TYPE_LOCAL);
+ ShibbolethResolver::term();
}
gss_eap_attr_provider *
Attribute *
gss_eap_shib_attr_provider::duplicateAttribute(const Attribute *src)
{
- Attribute *attribute;
-
DDF obj = src->marshall();
- attribute = Attribute::unmarshall(obj);
+ Attribute *attribute = Attribute::unmarshall(obj);
obj.destroy();
return attribute;
return dst;
}
+
+OM_uint32
+gssEapLocalAttrProviderInit(OM_uint32 *minor)
+{
+ return gss_eap_shib_attr_provider::init()
+ ? GSS_S_COMPLETE : GSS_S_FAILURE;
+}
+
+OM_uint32
+gssEapLocalAttrProviderFinalize(OM_uint32 *minor)
+{
+ gss_eap_shib_attr_provider::finalize();
+ return GSS_S_COMPLETE;
+}