Merge branch 'master' into tlv-mic

[mech_eap.orig] / util_saml.cpp

diff --git a/util_saml.cpp b/util_saml.cpp
index d02fa73..494aeb9 100644 (file)
--- a/util_saml.cpp
+++ b/util_saml.cpp
@@ -57,6 +57,9 @@ using namespace opensaml;
 using namespace xercesc;
 using namespace std;
 
+static const XMLCh
+base64Binary[] = {'b','a','s','e','6','4','B','i','n','a','r','y',0};
+
 /*
  * gss_eap_saml_assertion_provider is for retrieving the underlying
  * assertion.
@@ -449,11 +452,9 @@ decomposeAttributeName(const gss_buffer_t attr)
 {
     BaseRefVectorOf<XMLCh> *components;
     string str((const char *)attr->value, attr->length);
-    XMLCh qualifiedAttr[str.length() + 1];
-
-    XMLString::transcode(str.c_str(), qualifiedAttr, str.length());
+    auto_ptr_XMLCh qualifiedAttr(str.c_str());
 
-    components = XMLString::tokenizeString(qualifiedAttr);
+    components = XMLString::tokenizeString(qualifiedAttr.get());
 
     if (components->size() != 2) {
         delete components;
@@ -492,11 +493,9 @@ gss_eap_saml_attr_provider::setAttribute(int complete GSSEAP_UNUSED,
     attribute->setNameFormat(components->elementAt(0));
     attribute->setName(components->elementAt(1));
 
-    XMLCh *xmlValue = new XMLCh[value->length + 1];
-    XMLString::transcode((const char *)value->value, xmlValue, attr->length);
-
     attributeValue = saml2::AttributeValueBuilder::buildAttributeValue();
-    attributeValue->setTextContent(xmlValue);
+    auto_ptr_XMLCh unistr((char *)value->value, value->length);
+    attributeValue->setTextContent(unistr.get());
 
     attribute->getAttributeValues().push_back(attributeValue);
 
@@ -504,7 +503,6 @@ gss_eap_saml_attr_provider::setAttribute(int complete GSSEAP_UNUSED,
     attributeStatement->getAttributes().push_back(attribute);
 
     delete components;
-    delete xmlValue;
 
     return true;
 }
@@ -617,6 +615,25 @@ gss_eap_saml_attr_provider::getAttribute(const gss_buffer_t attr,
     return (ret != NULL);
 }
 
+static bool
+isBase64EncodedAttributeValueP(const saml2::AttributeValue *av)
+{
+    const xmltooling::QName *type = av->getSchemaType();
+
+    if (type == NULL)
+        return false;
+
+    if (!type->hasNamespaceURI() ||
+        !XMLString::equals(type->getNamespaceURI(), xmlconstants::XSD_NS))
+        return false;
+
+    if (!type->hasLocalPart() ||
+        !XMLString::equals(type->getLocalPart(), base64Binary))
+        return false;
+
+    return true;
+}
+
 bool
 gss_eap_saml_attr_provider::getAttribute(const gss_buffer_t attr,
                                          int *authenticated,
@@ -638,7 +655,7 @@ gss_eap_saml_attr_provider::getAttribute(const gss_buffer_t attr,
 
     if (i == -1)
         i = 0;
-    else if (i >= nvalues)
+    if (i >= nvalues)
         return false;
 #ifdef __APPLE__
     av = (const saml2::AttributeValue *)((void *)(a->getAttributeValues().at(i)));
@@ -646,11 +663,36 @@ gss_eap_saml_attr_provider::getAttribute(const gss_buffer_t attr,
     av = dynamic_cast<const saml2::AttributeValue *>(a->getAttributeValues().at(i));
 #endif
     if (av != NULL) {
+        bool base64Encoded = isBase64EncodedAttributeValueP(av);
+
         if (value != NULL) {
-            value->value = toUTF8(av->getTextContent(), true);
-            value->length = strlen((char *)value->value);
+            char *stringValue = toUTF8(av->getTextContent(), true);
+            size_t stringValueLen = strlen(stringValue);
+
+            if (base64Encoded) {
+                ssize_t octetLen;
+
+                value->value = GSSEAP_MALLOC(stringValueLen);
+                if (value->value == NULL) {
+                    GSSEAP_FREE(stringValue);
+                    throw new std::bad_alloc;
+                }
+
+                octetLen = base64Decode(stringValue, value->value);
+                if (octetLen < 0) {
+                    GSSEAP_FREE(value->value);
+                    GSSEAP_FREE(stringValue);
+                    value->value = NULL;
+                    return false;
+                }
+                value->length = octetLen;
+                GSSEAP_FREE(stringValue);
+            } else {
+                value->value = stringValue;
+                value->length = stringValueLen;
+            }
         }
-        if (display_value != NULL) {
+        if (display_value != NULL && base64Encoded == false) {
             display_value->value = toUTF8(av->getTextContent(), true);
             display_value->length = strlen((char *)value->value);
         }