return assertion also in display_value; do not assume value

[moonshot.git] / mech_eap / util_saml.cpp

diff --git a/mech_eap/util_saml.cpp b/mech_eap/util_saml.cpp
index ca11172..d02fa73 100644 (file)
--- a/mech_eap/util_saml.cpp
+++ b/mech_eap/util_saml.cpp
@@ -73,7 +73,7 @@ gss_eap_saml_assertion_provider::~gss_eap_saml_assertion_provider(void)
 }
 
 bool
-gss_eap_saml_assertion_provider::initFromExistingContext(const gss_eap_attr_ctx *manager,
+gss_eap_saml_assertion_provider::initWithExistingContext(const gss_eap_attr_ctx *manager,
                                                          const gss_eap_attr_provider *ctx)
 {
     /* Then we may be creating from an existing attribute context */
@@ -81,7 +81,7 @@ gss_eap_saml_assertion_provider::initFromExistingContext(const gss_eap_attr_ctx
 
     assert(m_assertion == NULL);
 
-    if (!gss_eap_attr_provider::initFromExistingContext(manager, ctx))
+    if (!gss_eap_attr_provider::initWithExistingContext(manager, ctx))
         return false;
 
     saml = static_cast<const gss_eap_saml_assertion_provider *>(ctx);
@@ -91,7 +91,7 @@ gss_eap_saml_assertion_provider::initFromExistingContext(const gss_eap_attr_ctx
 }
 
 bool
-gss_eap_saml_assertion_provider::initFromGssContext(const gss_eap_attr_ctx *manager,
+gss_eap_saml_assertion_provider::initWithGssContext(const gss_eap_attr_ctx *manager,
                                                     const gss_cred_id_t gssCred,
                                                     const gss_ctx_id_t gssCtx)
 {
@@ -102,7 +102,7 @@ gss_eap_saml_assertion_provider::initFromGssContext(const gss_eap_attr_ctx *mana
 
     assert(m_assertion == NULL);
 
-    if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx))
+    if (!gss_eap_attr_provider::initWithGssContext(manager, gssCred, gssCtx))
         return false;
 
     /*
@@ -186,7 +186,7 @@ gss_eap_saml_assertion_provider::getAttributeTypes(gss_eap_attr_enumeration_cb a
 
     /* just add the prefix */
     if (m_assertion != NULL)
-        ret = addAttribute(this, GSS_C_NO_BUFFER, data);
+        ret = addAttribute(m_manager, this, GSS_C_NO_BUFFER, data);
     else
         ret = true;
 
@@ -252,6 +252,8 @@ gss_eap_saml_assertion_provider::mapException(OM_uint32 *minor,
     else
         return GSS_S_CONTINUE_NEEDED;
 
+    gssEapSaveStatusInfo(*minor, "%s", e.what());
+
     return GSS_S_FAILURE;
 }
 
@@ -281,7 +283,11 @@ gss_eap_saml_assertion_provider::getAttribute(const gss_buffer_t attr,
 
     XMLHelper::serialize(m_assertion->marshall((DOMDocument *)NULL), str);
 
-    duplicateBuffer(str, value);
+    if (value != NULL)
+        duplicateBuffer(str, value);
+    if (display_value != NULL)
+        duplicateBuffer(str, display_value);
+
     *more = 0;
 
     return true;
@@ -304,26 +310,16 @@ gss_eap_saml_assertion_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSE
     delete ((saml2::Assertion *)input);
 }
 
-void
-gss_eap_saml_assertion_provider::exportToBuffer(gss_buffer_t buffer) const
-{
-    buffer->length = 0;
-    buffer->value = NULL;
-}
-
-bool
-gss_eap_saml_assertion_provider::initFromBuffer(const gss_eap_attr_ctx *ctx GSSEAP_UNUSED,
-                                                const gss_buffer_t buffer GSSEAP_UNUSED)
+const char *
+gss_eap_saml_assertion_provider::prefix(void) const
 {
-    return false;
+    return "urn:ietf:params:gss-eap:saml-aaa-assertion";
 }
 
 bool
 gss_eap_saml_assertion_provider::init(void)
 {
-    gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML_ASSERTION,
-                                       "urn:ietf:params:gss-eap:saml-aaa-assertion",
-                                       createAttrContext);
+    gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML_ASSERTION, createAttrContext);
     return true;
 }
 
@@ -423,18 +419,16 @@ gss_eap_saml_attr_provider::getAttributeTypes(gss_eap_attr_enumeration_cb addAtt
 
         for (vector<saml2::Attribute*>::const_iterator a = attrs.begin(); a != attrs.end(); ++a) {
             const XMLCh *attributeName, *attributeNameFormat;
-            XMLCh *qualifiedName;
             XMLCh space[2] = { ' ', 0 };
             gss_buffer_desc utf8;
-            bool ret;
 
             attributeName = (*a)->getName();
             attributeNameFormat = (*a)->getNameFormat();
             if (attributeNameFormat == NULL || attributeNameFormat[0] == '\0')
                 attributeNameFormat = saml2::Attribute::UNSPECIFIED;
 
-            qualifiedName = new XMLCh[XMLString::stringLen(attributeNameFormat) + 1 +
-                                      XMLString::stringLen(attributeName) + 1];
+            XMLCh qualifiedName[XMLString::stringLen(attributeNameFormat) + 1 +
+                                XMLString::stringLen(attributeName) + 1];
             XMLString::copyString(qualifiedName, attributeNameFormat);
             XMLString::catString(qualifiedName, space);
             XMLString::catString(qualifiedName, attributeName);
@@ -442,12 +436,8 @@ gss_eap_saml_attr_provider::getAttributeTypes(gss_eap_attr_enumeration_cb addAtt
             utf8.value = (void *)toUTF8(qualifiedName);
             utf8.length = strlen((char *)utf8.value);
 
-            ret = addAttribute(this, &utf8, data);
-
-            delete qualifiedName;
-
-            if (!ret)
-                return ret;
+            if (!addAttribute(m_manager, this, &utf8, data))
+                return false;
         }
     }
 
@@ -457,12 +447,13 @@ gss_eap_saml_attr_provider::getAttributeTypes(gss_eap_attr_enumeration_cb addAtt
 static BaseRefVectorOf<XMLCh> *
 decomposeAttributeName(const gss_buffer_t attr)
 {
-    XMLCh *qualifiedAttr = new XMLCh[attr->length + 1];
-    XMLString::transcode((const char *)attr->value, qualifiedAttr, attr->length);
+    BaseRefVectorOf<XMLCh> *components;
+    string str((const char *)attr->value, attr->length);
+    XMLCh qualifiedAttr[str.length() + 1];
 
-    BaseRefVectorOf<XMLCh> *components = XMLString::tokenizeString(qualifiedAttr);
+    XMLString::transcode(str.c_str(), qualifiedAttr, str.length());
 
-    delete qualifiedAttr;
+    components = XMLString::tokenizeString(qualifiedAttr);
 
     if (components->size() != 2) {
         delete components;
@@ -684,26 +675,16 @@ gss_eap_saml_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UN
 {
 }
 
-void
-gss_eap_saml_attr_provider::exportToBuffer(gss_buffer_t buffer) const
-{
-    buffer->length = 0;
-    buffer->value = NULL;
-}
-
-bool
-gss_eap_saml_attr_provider::initFromBuffer(const gss_eap_attr_ctx *ctx GSSEAP_UNUSED,
-                                           const gss_buffer_t buffer GSSEAP_UNUSED)
+const char *
+gss_eap_saml_attr_provider::prefix(void) const
 {
-    return false;
+    return "urn:ietf:params:gss-eap:saml-attr";
 }
 
 bool
 gss_eap_saml_attr_provider::init(void)
 {
-    gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML,
-                                       "urn:ietf:params:gss-eap:saml-attr",
-                                       createAttrContext);
+    gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML, createAttrContext);
     return true;
 }