}
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);
m_attributes = resolver->getResolvedAttributes();
resolver->getResolvedAttributes().clear();
} catch (exception &e) {
- //fprintf(stderr, "%s", e.what());
+#if 0
+ fprintf(stderr, "%s", e.what());
+#endif
}
return true;
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;
}
delete v;
}
-void
-gss_eap_shib_attr_provider::exportToBuffer(gss_buffer_t buffer) const
+const char *
+<<<<<<< HEAD
+gss_eap_shib_attr_provider::prefix(void) const
{
- DDF obj(NULL);
- DDF attrs(NULL);
+ return NULL;
+=======
+gss_eap_shib_attr_provider::marshallingKey(void) const
+{
+ return "local";
+>>>>>>> eef7b3b... get DDF marshalling working
+}
- buffer->length = 0;
- buffer->value = NULL;
+DDF
+gss_eap_shib_attr_provider::marshall(void) const
+{
+ DDF obj(NULL);
- obj.addmember("version").integer(1);
obj.addmember("authenticated").integer(m_authenticated);
- attrs = obj.addmember("attributes").list();
+ DDF 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);
}
- ostringstream sink;
- sink << obj;
- string str = sink.str();
-
- 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::unmarshallAndInit(const gss_eap_attr_ctx *ctx,
+ DDF &obj)
{
- if (!gss_eap_attr_provider::initFromBuffer(ctx, buffer))
+ if (!gss_eap_attr_provider::unmarshallAndInit(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);
-
- source >> obj;
-
- if (obj["version"].integer() != 1)
- return false;
-
m_authenticated = (obj["authenticated"].integer() != 0);
DDF attrs = obj["attributes"];
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;
}