Merge branch 'master' into tlv-mic

diff --git a/mech_eap/util_saml.cpp b/mech_eap/util_saml.cpp
index afce7f7..494aeb9 100644 (file)
--- a/mech_eap/util_saml.cpp
+++ b/mech_eap/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.
@@ -461,25 +464,6 @@ decomposeAttributeName(const gss_buffer_t attr)
     return components;
 }
 
-static bool
-isNotPrintable(const gss_buffer_t value)
-{
-    size_t i;
-    char *p = (char *)value->value;
-
-    if (isgraph(p[0]) &&
-        isgraph(p[value->length - 1]))
-    {
-        for (i = 0; p[i]; i++) {
-            if (!isascii(p[i]) || !isprint(p[i]))
-                return true;
-        }
-        return false;
-    }
-
-    return true;
-}
-
 bool
 gss_eap_saml_attr_provider::setAttribute(int complete GSSEAP_UNUSED,
                                          const gss_buffer_t attr,
@@ -510,18 +494,8 @@ gss_eap_saml_attr_provider::setAttribute(int complete GSSEAP_UNUSED,
     attribute->setName(components->elementAt(1));
 
     attributeValue = saml2::AttributeValueBuilder::buildAttributeValue();
-    if (isNotPrintable(value)) {
-        char *b64;
-
-        if (base64Encode(value->value, value->length, &b64))
-            return false;
-
-        auto_ptr_XMLCh unistr(b64);
-        attributeValue->setTextContent(unistr.get());
-    } else {
-        auto_ptr_XMLCh unistr((char *)value->value);
-        attributeValue->setTextContent(unistr.get());
-    }
+    auto_ptr_XMLCh unistr((char *)value->value, value->length);
+    attributeValue->setTextContent(unistr.get());
 
     attribute->getAttributeValues().push_back(attributeValue);
 
@@ -641,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,
@@ -670,12 +663,14 @@ 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) {
             char *stringValue = toUTF8(av->getTextContent(), true);
             size_t stringValueLen = strlen(stringValue);
 
-            if (base64Valid(stringValue)) {
-                ssize_t binaryLen;
+            if (base64Encoded) {
+                ssize_t octetLen;
 
                 value->value = GSSEAP_MALLOC(stringValueLen);
                 if (value->value == NULL) {
@@ -683,21 +678,21 @@ gss_eap_saml_attr_provider::getAttribute(const gss_buffer_t attr,
                     throw new std::bad_alloc;
                 }
 
-                binaryLen = base64Decode(stringValue, value->value);
-                if (binaryLen < 0) {
+                octetLen = base64Decode(stringValue, value->value);
+                if (octetLen < 0) {
                     GSSEAP_FREE(value->value);
                     GSSEAP_FREE(stringValue);
                     value->value = NULL;
                     return false;
                 }
-                value->length = binaryLen;
+                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);
         }