}
bool
-gss_eap_shib_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *manager,
+gss_eap_shib_attr_provider::initWithExistingContext(const gss_eap_attr_ctx *manager,
const gss_eap_attr_provider *ctx)
{
const gss_eap_shib_attr_provider *shib;
- if (!gss_eap_attr_provider::initFromExistingContext(manager, ctx)) {
+ if (!gss_eap_attr_provider::initWithExistingContext(manager, ctx)) {
return false;
}
}
bool
-gss_eap_shib_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager,
+gss_eap_shib_attr_provider::initWithGssContext(const gss_eap_attr_ctx *manager,
const gss_cred_id_t gssCred,
const gss_ctx_id_t gssCtx)
{
- const gss_eap_saml_assertion_provider *saml;
- gss_buffer_desc exportedCtx = GSS_C_EMPTY_BUFFER;
- OM_uint32 major, minor;
-
-#if 0
- gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
-#endif
- if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx))
+ if (!gss_eap_attr_provider::initWithGssContext(manager, gssCred, gssCtx))
return false;
- saml = static_cast<const gss_eap_saml_assertion_provider *>
- (m_manager->getProvider(ATTR_TYPE_SAML_ASSERTION));
-
auto_ptr<ShibbolethResolver> resolver(ShibbolethResolver::create());
/*
* acceptor.
*/
#if 0
+ gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
if (gssCred != GSS_C_NO_CREDENTIAL &&
gssEapDisplayName(&minor, gssCred->name, &nameBuf, NULL) == GSS_S_COMPLETE) {
resolver->setApplicationID((const char *)nameBuf.value);
}
#endif
- major = gssEapExportSecContext(&minor, gssCtx, &exportedCtx);
+ gss_buffer_desc mechName = GSS_C_EMPTY_BUFFER;
+ OM_uint32 major, minor;
+
+ major = gssEapExportNameInternal(&minor, gssCtx->initiatorName, &mechName,
+ EXPORT_NAME_FLAG_OID |
+ EXPORT_NAME_FLAG_COMPOSITE);
if (major == GSS_S_COMPLETE) {
- resolver->addToken(&exportedCtx);
- gss_release_buffer(&minor, &exportedCtx);
+ resolver->addToken(&mechName);
+ gss_release_buffer(&minor, &mechName);
}
+ const gss_eap_saml_assertion_provider *saml;
+ saml = static_cast<const gss_eap_saml_assertion_provider *>
+ (m_manager->getProvider(ATTR_TYPE_SAML_ASSERTION));
if (saml != NULL && saml->getAssertion() != NULL) {
resolver->addToken(saml->getAssertion());
- m_authenticated = saml->authenticated();
}
try {
m_attributes = resolver->getResolvedAttributes();
resolver->getResolvedAttributes().clear();
} catch (exception &e) {
-#if 0
- fprintf(stderr, "%s", e.what());
-#endif
+ return false;
}
+ m_authenticated = true;
m_initialized = true;
return true;
if (i == -1)
i = 0;
- else if (i >= nvalues)
+ if (i >= nvalues)
return false;
buf.value = (void *)shibAttr->getSerializedValues()[*more].c_str();
if (m_initialized == false)
return obj; /* don't export incomplete context */
- JSONObject attrs = JSONObject::array();
+ JSONObject jattrs = JSONObject::array();
for (vector<Attribute*>::const_iterator a = m_attributes.begin();
a != m_attributes.end(); ++a) {
DDF attr = (*a)->marshall();
- JSONObject jobj(attr);
- attrs.append(jobj);
+ JSONObject jattr = JSONObject::ddf(attr);
+ jattrs.append(jattr);
}
- obj.set("attributes", attrs);
+ obj.set("attributes", jattrs);
obj.set("authenticated", m_authenticated);
assert(m_authenticated == false);
assert(m_attributes.size() == 0);
- JSONObject attrs = obj["attributes"];
- size_t nelems = attrs.size();
+ JSONObject jattrs = obj["attributes"];
+ size_t nelems = jattrs.size();
for (size_t i = 0; i < nelems; i++) {
- DDF attr = attrs.get(i).ddf();
+ JSONObject jattr = jattrs.get(i);
+
+ DDF attr = jattr.ddf();
Attribute *attribute = Attribute::unmarshall(attr);
m_attributes.push_back(attribute);
}
bool
gss_eap_shib_attr_provider::init(void)
{
- if (!ShibbolethResolver::init())
+ if (SPConfig::getConfig().getFeatures() == 0 &&
+ ShibbolethResolver::init() == false)
return false;
gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL, createAttrContext);
else
return GSS_S_CONTINUE_NEEDED;
+ gssEapSaveStatusInfo(*minor, "%s", e.what());
+
return GSS_S_FAILURE;
}