X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=util_name.c;h=e64ebdd722b57dc25fbea1f5fb0c9907e075d9fa;hb=cff9dae64ddb2ead188889c9164961bd364e8cd2;hp=5b4491d7fa73264d801765e053e2967c1422b7a2;hpb=44a5d48b05987057141dd2fa5039e43f89514e39;p=mech_eap.git

diff --git a/util_name.c b/util_name.c
index 5b4491d..e64ebdd 100644
--- a/util_name.c
+++ b/util_name.c
@@ -57,7 +57,7 @@
 
 static gss_OID_desc gssEapNtPrincipalName = {
     /* 1.3.6.1.4.1.5322.21.2.1  */
-    12, "\x06\x0A\x2B\x06\x01\x04\x01\xA9\x4A\x15\x02\x01"
+    10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x02\x01"
 };
 
 gss_OID GSS_EAP_NT_PRINCIPAL_NAME = &gssEapNtPrincipalName;
@@ -106,8 +106,7 @@ gssEapReleaseName(OM_uint32 *minor, gss_name_t *pName)
     GSSEAP_KRB_INIT(&krbContext);
     krb5_free_principal(krbContext, name->krbPrincipal);
 
-    radiusFreeAVPs(&tmpMinor, name->avps);
-    samlFreeAssertion(&tmpMinor, name->assertion);
+    gssEapReleaseAttrContext(&tmpMinor, name);
 
     GSSEAP_MUTEX_DESTROY(&name->mutex);
     GSSEAP_FREE(name);
@@ -149,7 +148,7 @@ importServiceName(OM_uint32 *minor,
                   const gss_buffer_t nameBuffer,
                   gss_name_t *pName)
 {
-    OM_uint32 major, tmpMinor;
+    OM_uint32 major;
     krb5_context krbContext;
     krb5_principal krbPrinc;
     char *service, *host;
@@ -164,7 +163,7 @@ importServiceName(OM_uint32 *minor,
     if (host != NULL) {
         *host = '\0';
         host++;
-    }    
+    }
 
     /* XXX this is probably NOT what we want to be doing */
     *minor = krb5_sname_to_principal(krbContext, host, service,
@@ -188,21 +187,28 @@ importUserName(OM_uint32 *minor,
                const gss_buffer_t nameBuffer,
                gss_name_t *pName)
 {
-    OM_uint32 major, tmpMinor;
+    OM_uint32 major;
     krb5_context krbContext;
     krb5_principal krbPrinc;
     char *nameString;
 
     GSSEAP_KRB_INIT(&krbContext);
 
-    major = bufferToString(minor, nameBuffer, &nameString);
-    if (GSS_ERROR(major))
-        return major;
-
-    *minor = krb5_parse_name(krbContext, nameString, &krbPrinc);
-    if (*minor != 0) {
-        GSSEAP_FREE(nameString);
-        return GSS_S_FAILURE;
+    if (nameBuffer == GSS_C_NO_BUFFER) {
+        *minor = krb5_copy_principal(krbContext,
+                                     krb5_anonymous_principal(), &krbPrinc);
+        if (*minor != 0)
+            return GSS_S_FAILURE;
+    } else {
+        major = bufferToString(minor, nameBuffer, &nameString);
+        if (GSS_ERROR(major))
+            return major;
+
+        *minor = krb5_parse_name(krbContext, nameString, &krbPrinc);
+        if (*minor != 0) {
+            GSSEAP_FREE(nameString);
+            return GSS_S_FAILURE;
+        }
     }
 
     major = krbPrincipalToName(minor, &krbPrinc, pName);
@@ -214,77 +220,107 @@ importUserName(OM_uint32 *minor,
     return major;
 }
 
-static OM_uint32
-importExportedName(OM_uint32 *minor,
-                   const gss_buffer_t nameBuffer,
-                   gss_name_t *pName)
+#define UPDATE_REMAIN(n)    do {            \
+        p += (n);                           \
+        remain -= (n);                      \
+    } while (0)
+
+#define CHECK_REMAIN(n)     do {        \
+        if (remain < (n)) {             \
+            *minor = ERANGE;            \
+            major = GSS_S_BAD_NAME;     \
+            goto cleanup;               \
+        }                               \
+    } while (0)
+
+OM_uint32
+gssEapImportNameInternal(OM_uint32 *minor,
+                         const gss_buffer_t nameBuffer,
+                         gss_name_t *pName,
+                         unsigned int flags)
 {
     OM_uint32 major, tmpMinor;
     krb5_context krbContext;
     unsigned char *p;
-    int composite = 0;
     size_t len, remain;
     gss_buffer_desc buf;
-    enum gss_eap_token_type tok_type;
+    enum gss_eap_token_type tokType;
+    gss_name_t name = GSS_C_NO_NAME;
 
     GSSEAP_KRB_INIT(&krbContext);
 
     p = (unsigned char *)nameBuffer->value;
     remain = nameBuffer->length;
 
-    if (remain < 6 + GSS_EAP_MECHANISM->length + 4)
-        return GSS_S_BAD_NAME;
-
-    /* TOK_ID */
-    tok_type = load_uint16_be(p);
-    if (tok_type != TOK_TYPE_EXPORT_NAME &&
-        tok_type != TOK_TYPE_EXPORT_NAME_COMPOSITE)
-        return GSS_S_BAD_NAME;
-    p += 2;
-    remain -= 2;
-
-    /* MECH_OID_LEN */
-    len = load_uint16_be(p);
-    if (len != 2 + GSS_EAP_MECHANISM->length)
-        return GSS_S_BAD_NAME;
-    p += 2;
-    remain -= 2;
-
-    /* MECH_OID */
-    if (p[0] != 0x06)
-        return GSS_S_BAD_NAME;
-    if (p[1] != GSS_EAP_MECHANISM->length)
-        return GSS_S_BAD_MECH;
-    if (memcmp(&p[2], GSS_EAP_MECHANISM->elements, GSS_EAP_MECHANISM->length))
-        return GSS_S_BAD_MECH;
-    p += 2 + GSS_EAP_MECHANISM->length;
-    remain -= 2 + GSS_EAP_MECHANISM->length;
+    if (flags & EXPORT_NAME_FLAG_OID) {
+        if (remain < 6 + GSS_EAP_MECHANISM->length + 4)
+            return GSS_S_BAD_NAME;
+
+        if (flags & EXPORT_NAME_FLAG_COMPOSITE)
+            tokType = TOK_TYPE_EXPORT_NAME_COMPOSITE;
+        else
+            tokType = TOK_TYPE_EXPORT_NAME;
+
+        /* TOK_ID */
+        if (load_uint16_be(p) != tokType)
+            return GSS_S_BAD_NAME;
+        UPDATE_REMAIN(2);
+
+        /* MECH_OID_LEN */
+        len = load_uint16_be(p);
+        if (len != 2 + GSS_EAP_MECHANISM->length)
+            return GSS_S_BAD_NAME;
+        UPDATE_REMAIN(2);
+
+        /* MECH_OID */
+        if (p[0] != 0x06)
+            return GSS_S_BAD_NAME;
+        if (p[1] != GSS_EAP_MECHANISM->length)
+            return GSS_S_BAD_MECH;
+        if (memcmp(&p[2], GSS_EAP_MECHANISM->elements, GSS_EAP_MECHANISM->length))
+            return GSS_S_BAD_MECH;
+        UPDATE_REMAIN(2 + GSS_EAP_MECHANISM->length);
+    }
 
     /* NAME_LEN */
     len = load_uint32_be(p);
-    p += 4;
-    remain -= 4;
-
-    if (remain < len)
-        return GSS_S_BAD_NAME;
+    UPDATE_REMAIN(4);
 
     /* NAME */
+    CHECK_REMAIN(len);
     buf.length = len;
     buf.value = p;
+    UPDATE_REMAIN(len);
 
-    p += len;
-    remain -= len;
+    major = importUserName(minor, &buf, &name);
+    if (GSS_ERROR(major))
+        goto cleanup;
 
-    if (composite == 0 && remain != 0)
-        return GSS_S_BAD_NAME;
+    if (flags & EXPORT_NAME_FLAG_COMPOSITE) {
+        gss_buffer_desc buf;
 
-    major = importUserName(minor, &buf, pName);
-    if (GSS_ERROR(major))
-        return major;
+        CHECK_REMAIN(4);
+        buf.length = load_uint32_be(p);
+        UPDATE_REMAIN(4);
 
-    /* XXX TODO composite handling */
+        CHECK_REMAIN(buf.length);
+        buf.value = p;
+        UPDATE_REMAIN(buf.length);
 
-    return GSS_S_COMPLETE;
+        major = gssEapImportAttrContext(minor, &buf, name);
+        if (GSS_ERROR(major))
+            goto cleanup;
+    }
+
+    major = GSS_S_COMPLETE;
+
+cleanup:
+    if (GSS_ERROR(major))
+        gssEapReleaseName(&tmpMinor, &name);
+    else
+        *pName = name;
+
+    return major;
 }
 
 OM_uint32
@@ -305,7 +341,14 @@ gssEapImportName(OM_uint32 *minor,
                oidEqual(nameType, GSS_C_NT_HOSTBASED_SERVICE_X))
         major = importServiceName(minor, nameBuffer, name);
     else if (oidEqual(nameType, GSS_C_NT_EXPORT_NAME))
-        major = importExportedName(minor, nameBuffer, name);
+        major = gssEapImportNameInternal(minor, nameBuffer, name,
+                                         EXPORT_NAME_FLAG_OID);
+#ifdef HAVE_GSS_C_NT_COMPOSITE_EXPORT
+    else if (oidEqual(nameType, GSS_C_NT_COMPOSITE_EXPORT))
+        major = gssEapImportNameInternal(minor, nameBuffer, name,
+                                         EXPORT_NAME_FLAG_OID |
+                                         EXPORT_NAME_FLAG_COMPOSITE);
+#endif
     else
         major = GSS_S_BAD_NAMETYPE;
 
@@ -318,14 +361,24 @@ gssEapImportName(OM_uint32 *minor,
 OM_uint32
 gssEapExportName(OM_uint32 *minor,
                  const gss_name_t name,
-                 gss_buffer_t exportedName,
-                 int composite)
+                 gss_buffer_t exportedName)
+{
+    return gssEapExportNameInternal(minor, name, exportedName,
+                                    EXPORT_NAME_FLAG_OID);
+}
+
+OM_uint32
+gssEapExportNameInternal(OM_uint32 *minor,
+                         const gss_name_t name,
+                         gss_buffer_t exportedName,
+                         unsigned int flags)
 {
     OM_uint32 major = GSS_S_FAILURE, tmpMinor;
     krb5_context krbContext;
     char *krbName = NULL;
-    size_t krbNameLen;
+    size_t krbNameLen, exportedNameLen;
     unsigned char *p;
+    gss_buffer_desc attrs = GSS_C_EMPTY_BUFFER;
 
     exportedName->length = 0;
     exportedName->value = NULL;
@@ -333,44 +386,51 @@ gssEapExportName(OM_uint32 *minor,
     GSSEAP_KRB_INIT(&krbContext);
     GSSEAP_MUTEX_LOCK(&name->mutex);
 
-    /*
-     * Don't export a composite name if we don't have any attributes.
-     */
-    if (composite && !NAME_HAS_ATTRIBUTES(name))
-        composite = 0;
-
     *minor = krb5_unparse_name(krbContext, name->krbPrincipal, &krbName);
-    if (*minor != 0)
+    if (*minor != 0) {
+        major = GSS_S_FAILURE;
         goto cleanup;
+    }
     krbNameLen = strlen(krbName);
 
-    exportedName->length = 6 + GSS_EAP_MECHANISM->length + 4 + krbNameLen;
-    if (composite) {
-        /* TODO: export SAML/AVP, this is pending specification */
-        
+    exportedNameLen = 0;
+    if (flags & EXPORT_NAME_FLAG_OID) {
+        exportedNameLen += 6 + GSS_EAP_MECHANISM->length;
+    }
+    exportedNameLen += 4 + krbNameLen;
+    if (flags & EXPORT_NAME_FLAG_COMPOSITE) {
+        major = gssEapExportAttrContext(minor, name, &attrs);
+        if (GSS_ERROR(major))
+            goto cleanup;
+        exportedNameLen += 4 + attrs.length;
     }
 
-    exportedName->value = GSSEAP_MALLOC(exportedName->length);
+    exportedName->value = GSSEAP_MALLOC(exportedNameLen);
     if (exportedName->value == NULL) {
+        major = GSS_S_FAILURE;
         *minor = ENOMEM;
         goto cleanup;
     }
+    exportedName->length = exportedNameLen;
 
-    /* TOK | MECH_OID_LEN */
     p = (unsigned char *)exportedName->value;
-    store_uint16_be(composite
+
+    if (flags & EXPORT_NAME_FLAG_OID) {
+        /* TOK | MECH_OID_LEN */
+        store_uint16_be((flags & EXPORT_NAME_FLAG_COMPOSITE)
                         ? TOK_TYPE_EXPORT_NAME_COMPOSITE
                         : TOK_TYPE_EXPORT_NAME,
-                    p);
-    p += 2;
-    store_uint16_be(GSS_EAP_MECHANISM->length + 2, p);
-    p += 2;
-
-    /* MECH_OID */
-    *p++ = 0x06;
-    *p++ = GSS_EAP_MECHANISM->length & 0xff;
-    memcpy(p, GSS_EAP_MECHANISM->elements, GSS_EAP_MECHANISM->length);
-    p += GSS_EAP_MECHANISM->length;
+                        p);
+        p += 2;
+        store_uint16_be(GSS_EAP_MECHANISM->length + 2, p);
+        p += 2;
+
+        /* MECH_OID */
+        *p++ = 0x06;
+        *p++ = GSS_EAP_MECHANISM->length & 0xff;
+        memcpy(p, GSS_EAP_MECHANISM->elements, GSS_EAP_MECHANISM->length);
+        p += GSS_EAP_MECHANISM->length;
+    }
 
     /* NAME_LEN */
     store_uint32_be(krbNameLen, p);
@@ -380,137 +440,21 @@ gssEapExportName(OM_uint32 *minor,
     memcpy(p, krbName, krbNameLen);
     p += krbNameLen;
 
+    if (flags & EXPORT_NAME_FLAG_COMPOSITE) {
+        store_uint32_be(attrs.length, p);
+        memcpy(&p[4], attrs.value, attrs.length);
+        p += 4 + attrs.length;
+    }
+
     *minor = 0;
     major = GSS_S_COMPLETE;
 
 cleanup:
     GSSEAP_MUTEX_UNLOCK(&name->mutex);
+    gss_release_buffer(&tmpMinor, &attrs);
     if (GSS_ERROR(major))
         gss_release_buffer(&tmpMinor, exportedName);
     krb5_free_unparsed_name(krbContext, krbName);
 
     return major;
 }
-
-static gss_buffer_desc attributePrefixes[] = {
-    {
-        /* ATTR_TYPE_NONE */
-        0,
-        NULL,
-    },
-    {
-        /* ATTR_TYPE_SAML_AAA_ASSERTION */
-        sizeof("urn:ietf:params:gss-eap:saml-aaa-assertion"),
-        "urn:ietf:params:gss-eap:saml-aaa-assertion"
-    },
-    {
-        /* ATTR_TYPE_SAML_ATTR */
-        sizeof("urn:ietf:params:gss-eap:saml-attr"),
-        "urn:ietf:params:gss-eap:saml-attr"
-    },
-    {
-        /* ATTR_TYPE_RADIUS_AVP */
-        sizeof("urn:ietf:params:gss-eap:radius-avp"),
-        "urn:ietf:params:gss-eap:radius-avp",
-    }
-};
-
-enum gss_eap_attribute_type
-gssEapAttributePrefixToType(const gss_buffer_t prefix)
-{
-    enum gss_eap_attribute_type i;
-
-    for (i = ATTR_TYPE_SAML_AAA_ASSERTION;
-         i < sizeof(attributePrefixes) / sizeof(attributePrefixes[0]);
-         i++)
-    {
-        gss_buffer_t p = &attributePrefixes[i];
-
-        if (p->length == prefix->length &&
-            memcmp(p->value, prefix->value, prefix->length) == 0) {
-            return i;
-        }
-    }
-
-    return ATTR_TYPE_NONE;
-}
-
-gss_buffer_t
-gssEapAttributeTypeToPrefix(enum gss_eap_attribute_type type)
-{
-    if (type <= ATTR_TYPE_NONE ||
-        type > ATTR_TYPE_RADIUS_AVP)
-        return GSS_C_NO_BUFFER;
-
-    return &attributePrefixes[type];
-}
-
-OM_uint32
-decomposeAttributeName(OM_uint32 *minor,
-                       const gss_buffer_t attribute,
-                       gss_buffer_t prefix,
-                       gss_buffer_t suffix)
-{
-    char *p = NULL;
-    int i;
-
-    for (i = 0; i < attribute->length; i++) {
-        if (((char *)attribute->value)[i] == ' ') {
-            p = (char *)attribute->value + i + 1;
-            break;
-        }
-    }
-
-    prefix->value = attribute->value;
-    prefix->length = i;
-
-    if (p != NULL && *p != '\0')  {
-        suffix->length = attribute->length - 1 - prefix->length;
-        suffix->value = p;
-    } else {
-        suffix->length = 0;
-        suffix->value = NULL;
-    }
-
-    *minor = 0;
-    return GSS_S_COMPLETE;
-}
-
-OM_uint32
-composeAttributeName(OM_uint32 *minor,
-                       const gss_buffer_t prefix,
-                       const gss_buffer_t suffix,
-                       gss_buffer_t attribute)
-{
-    size_t len = 0;
-    char *p;
-
-    attribute->length = 0;
-    attribute->value = NULL;
-
-    if (prefix == GSS_C_NO_BUFFER || prefix->length == 0)
-        return GSS_S_COMPLETE;
-
-    len = prefix->length;
-    if (suffix != NULL) {
-        len += 1 + suffix->length;
-    }
-
-    p = attribute->value = GSSEAP_MALLOC(len + 1);
-    if (attribute->value == NULL) {
-        *minor = ENOMEM;
-        return GSS_S_FAILURE;
-    }
-    attribute->length = len;
-
-    memcpy(p, prefix->value, prefix->length);
-    if (suffix != NULL) {
-        p[prefix->length] = ' ';
-        memcpy(p + prefix->length + 1, suffix->value, suffix->length);
-    }
-
-    p[attribute->length] = '\0';
-
-    *minor = 0;
-    return GSS_S_COMPLETE;
-}