send a composite name token instead of a sec context to shib

[moonshot.git] / mech_eap / util_shib.cpp

diff --git a/mech_eap/util_shib.cpp b/mech_eap/util_shib.cpp
index 5086c0d..3d2aa2c 100644 (file)
--- a/mech_eap/util_shib.cpp
+++ b/mech_eap/util_shib.cpp
@@ -83,12 +83,12 @@ gss_eap_shib_attr_provider::~gss_eap_shib_attr_provider(void)
 }
 
 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;
     }
 
@@ -105,60 +105,14 @@ gss_eap_shib_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *mana
     return true;
 }
 
-static OM_uint32
-exportMechSecContext(OM_uint32 *minor,
-                     gss_ctx_id_t gssCtx,
-                     gss_buffer_t mechContext)
-{
-    OM_uint32 major;
-    gss_buffer_desc exportedCtx;
-    unsigned char *p;
-
-    assert(gssCtx->mechanismUsed != GSS_C_NO_OID);
-
-    major = gssEapExportSecContext(minor, gssCtx, &exportedCtx);
-    if (GSS_ERROR(major))
-        return major;
-
-    /*
-     * gss_import_sec_context expects the exported security context token
-     * to be tagged with the mechanism OID; in Heimdal and MIT, this is
-     * done by the mechglue, so if we are subverting the mechglue we need
-     * to add it ourselves.
-     */
-    mechContext->length = 4 + gssCtx->mechanismUsed->length + exportedCtx.length;
-    mechContext->value = p = (unsigned char *)GSSEAP_MALLOC(mechContext->length);
-    if (mechContext->value == NULL) {
-        gss_release_buffer(minor, &exportedCtx);
-        throw new std::bad_alloc;
-    }
-
-    p = store_oid(gssCtx->mechanismUsed, p);
-    memcpy(p, exportedCtx.value, exportedCtx.length);
-
-    gss_release_buffer(minor, &exportedCtx);
-
-    return GSS_S_COMPLETE;
-}
-
 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 mechContext = 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());
 
     /*
@@ -168,6 +122,7 @@ gss_eap_shib_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager,
      * 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);
@@ -175,12 +130,20 @@ gss_eap_shib_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager,
     }
 #endif
 
-    major = exportMechSecContext(&minor, gssCtx, &mechContext);
+    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(&mechContext);
-        gss_release_buffer(&minor, &mechContext);
+        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());
     }
@@ -190,6 +153,7 @@ gss_eap_shib_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager,
         m_attributes = resolver->getResolvedAttributes();
         resolver->getResolvedAttributes().clear();
     } catch (exception &e) {
+        return false;
     }
 
     m_authenticated = true;
@@ -334,7 +298,7 @@ gss_eap_shib_attr_provider::getAttribute(const gss_buffer_t attr,
 
     if (i == -1)
         i = 0;
-    else if (i >= nvalues)
+    if (i >= nvalues)
         return false;
 
     buf.value = (void *)shibAttr->getSerializedValues()[*more].c_str();
@@ -411,13 +375,9 @@ gss_eap_shib_attr_provider::jsonRepresentation(void) const
 
     for (vector<Attribute*>::const_iterator a = m_attributes.begin();
          a != m_attributes.end(); ++a) {
-        try {
-            DDF attr = (*a)->marshall();
-            JSONObject jattr = JSONObject::ddf(attr);
-            jattrs.append(jattr);
-        } catch (AttributeException &e) {
-            /* XXX FIXME ignore attribute exceptions? */
-        }
+        DDF attr = (*a)->marshall();
+        JSONObject jattr = JSONObject::ddf(attr);
+        jattrs.append(jattr);
     }
 
     obj.set("attributes", jattrs);
@@ -443,13 +403,9 @@ gss_eap_shib_attr_provider::initWithJsonObject(const gss_eap_attr_ctx *ctx,
     for (size_t i = 0; i < nelems; i++) {
         JSONObject jattr = jattrs.get(i);
 
-        try {
-            DDF attr = jattr.ddf();
-            Attribute *attribute = Attribute::unmarshall(attr);
-            m_attributes.push_back(attribute);
-        } catch (AttributeException &e) {
-            return false;
-        }
+        DDF attr = jattr.ddf();
+        Attribute *attribute = Attribute::unmarshall(attr);
+        m_attributes.push_back(attribute);
     }
 
     m_authenticated = obj["authenticated"].integer();
@@ -461,7 +417,8 @@ gss_eap_shib_attr_provider::initWithJsonObject(const gss_eap_attr_ctx *ctx,
 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);
@@ -495,6 +452,8 @@ gss_eap_shib_attr_provider::mapException(OM_uint32 *minor,
     else
         return GSS_S_CONTINUE_NEEDED;
 
+    gssEapSaveStatusInfo(*minor, "%s", e.what());
+
     return GSS_S_FAILURE;
 }