/*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
}
bool
-addRadiusAttribute(const gss_eap_attr_provider *provider,
+addRadiusAttribute(const gss_eap_attr_ctx *manager,
+ const gss_eap_attr_provider *provider,
const gss_buffer_t attribute,
void *data)
{
- const gss_eap_shib_attr_provider *shib;
const gss_eap_radius_attr_provider *radius;
+ const gss_eap_shib_attr_provider *shib;
int authenticated, complete, more = -1;
vector <string> attributeIds(1);
SimpleAttribute *a;
assert(radius != NULL && shib != NULL);
string attributeName =
- gss_eap_attr_ctx::composeAttributeName(ATTR_TYPE_RADIUS, attribute);
+ manager->composeAttributeName(ATTR_TYPE_RADIUS, attribute);
attributeIds.push_back(attributeName);
a = new SimpleAttribute(attributeIds);
{
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;
OM_uint32 minor;
-
+#endif
if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx))
return false;
radius = static_cast<const gss_eap_radius_attr_provider *>
(m_manager->getProvider(ATTR_TYPE_RADIUS));
- resolver = ShibbolethResolver::create();
+ 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 &&
gssEapDisplayName(&minor, gssCred->name, &nameBuf, NULL) == GSS_S_COMPLETE) {
resolver->setApplicationID((const char *)nameBuf.value);
gss_release_buffer(&minor, &nameBuf);
}
+#endif
m_authenticated = false;
resolver->getResolvedAttributes().clear();
} catch (exception &e) {
#if 0
- delete resolver;
- throw e;
+ fprintf(stderr, "%s", e.what());
#endif
}
- delete resolver;
return true;
}
}
bool
-gss_eap_shib_attr_provider::setAttribute(int complete,
+gss_eap_shib_attr_provider::setAttribute(int complete GSSEAP_UNUSED,
const gss_buffer_t attr,
const gss_buffer_t value)
{
attribute.value = (void *)((*a)->getId());
attribute.length = strlen((char *)attribute.value);
- if (!addAttribute(this, &attribute, data))
+ if (!addAttribute(m_manager, this, &attribute, data))
return false;
}
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) {
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;
}
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);
delete v;
}
-void
-gss_eap_shib_attr_provider::exportToBuffer(gss_buffer_t buffer) const
+const char *
+gss_eap_shib_attr_provider::prefix(void) const
{
- DDF obj(NULL);
- DDF attrs(NULL);
+ return NULL;
+}
- buffer->length = 0;
- buffer->value = NULL;
+const char *
+gss_eap_shib_attr_provider::name(void) const
+{
+ return "local";
+}
- obj.addmember("version").integer(1);
- obj.addmember("authenticated").integer(m_authenticated);
+JSONObject
+gss_eap_shib_attr_provider::jsonRepresentation(void) const
+{
+ JSONObject obj;
+
+ obj.set("authenticated", m_authenticated);
+
+ JSONObject attrs = JSONObject::array();
- attrs = obj.addmember("attributes").list();
for (vector<Attribute*>::const_iterator a = m_attributes.begin();
a != m_attributes.end(); ++a) {
DDF attr = (*a)->marshall();
- attrs.add(attr);
+ JSONObject jobj(attr);
+ attrs.append(jobj);
}
- ostringstream sink;
- sink << attrs;
- string str = sink.str();
+ obj.set("attributes", attrs);
- duplicateBuffer(str, buffer);
-
- attrs.destroy();
+ return obj;
}
bool
-gss_eap_shib_attr_provider::initFromBuffer(const gss_eap_attr_ctx *ctx,
- const gss_buffer_t buffer)
+gss_eap_shib_attr_provider::initWithJsonObject(const gss_eap_attr_ctx *ctx,
+ JSONObject &obj)
{
- if (!gss_eap_attr_provider::initFromBuffer(ctx, buffer))
+ if (!gss_eap_attr_provider::initWithJsonObject(ctx, obj))
return false;
- if (buffer->length == 0)
- return true;
-
assert(m_authenticated == false);
assert(m_attributes.size() == 0);
- DDF obj(NULL);
- string str((const char *)buffer->value, buffer->length);
- istringstream source(str);
+ m_authenticated = obj["authenticated"].integer();
- source >> obj;
+ JSONObject attrs = obj["attributes"];
+ size_t nelems = attrs.size();
- if (obj["version"].integer() != 1)
- return false;
-
- m_authenticated = (obj["authenticated"].integer() != 0);
-
- DDF attrs = obj["attributes"];
- DDF attr = attrs.first();
- while (!attr.isnull()) {
+ for (size_t i = 0; i < nelems; i++) {
+ DDF attr = attrs.get(i).ddf();
Attribute *attribute = Attribute::unmarshall(attr);
m_attributes.push_back(attribute);
- attr = attrs.next();
}
- attrs.destroy();
-
return true;
}
if (!ShibbolethResolver::init())
return false;
- gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL, NULL, createAttrContext);
+ gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL, createAttrContext);
return true;
}
gssEapLocalAttrProviderFinalize(OM_uint32 *minor)
{
gss_eap_shib_attr_provider::finalize();
+
+ *minor = 0;
return GSS_S_COMPLETE;
}