return GSS_S_COMPLETE;
}
-static krb5_error_code
-gssEapGetDefaultRealm(krb5_context krbContext, char **defaultRealm)
+static char *
+gssEapGetDefaultRealm(krb5_context krbContext)
{
- *defaultRealm = NULL;
+ char *defaultRealm = NULL;
krb5_appdefault_string(krbContext, "eap_gss",
- NULL, "default_realm", "", defaultRealm);
+ NULL, "default_realm", "", &defaultRealm);
- if (*defaultRealm != NULL && (*defaultRealm)[0] == '\0') {
- GSSEAP_FREE(*defaultRealm);
- *defaultRealm = NULL;
- }
-
- return (*defaultRealm != NULL) ? 0 : KRB5_CONFIG_NODEFREALM;
+ return defaultRealm;
}
static OM_uint32
host++;
}
- gssEapGetDefaultRealm(krbContext, &realm);
+ realm = gssEapGetDefaultRealm(krbContext);
code = krb5_build_principal(krbContext,
&krbPrinc,
return major;
}
+#define IMPORT_FLAG_DEFAULT_REALM 0x1
+
+/*
+ * Import an EAP name, possibly appending the default GSS EAP realm,
+ */
static OM_uint32
-importUserName(OM_uint32 *minor,
- const gss_buffer_t nameBuffer,
- gss_name_t *pName)
+importEapNameFlags(OM_uint32 *minor,
+ const gss_buffer_t nameBuffer,
+ OM_uint32 importFlags,
+ gss_name_t *pName)
{
OM_uint32 major;
krb5_context krbContext;
krb5_principal krbPrinc = NULL;
krb5_error_code code;
+ char *nameString;
GSSEAP_KRB_INIT(&krbContext);
if (nameBuffer == GSS_C_NO_BUFFER) {
- code = krb5_copy_principal(krbContext,
- krbAnonymousPrincipal(), &krbPrinc);
- if (code != 0) {
- *minor = code;
- return GSS_S_FAILURE;
- }
+ nameString = "";
+ code = KRB5_PARSE_MALFORMED;
} else {
- char *nameString;
-
major = bufferToString(minor, nameBuffer, &nameString);
if (GSS_ERROR(major))
return major;
/*
* First, attempt to parse the name on the assumption that it includes
- * a qualifying realm.
+ * a qualifying realm. This allows us to avoid accidentally appending
+ * the default Kerberos realm to an unqualified name. (A bug in MIT
+ * Kerberos prevents the default realm being set to an empty value.)
*/
code = krb5_parse_name_flags(krbContext, nameString,
KRB5_PRINCIPAL_PARSE_REQUIRE_REALM, &krbPrinc);
- if (code == KRB5_PARSE_MALFORMED) {
- char *defaultRealm = NULL;
- int flags = 0;
-
- /*
- * We need an explicit appdefaults check because, at least with MIT
- * Kerberos, setting the context realm to NULL will reset it to the
- * default Kerberos realm after the second call to get_default_realm.
- * We want to make sure that the default Kerberos realm does not end
- * up accidentally appended to an unqualified name.
- */
- gssEapGetDefaultRealm(krbContext, &defaultRealm);
-
- if (defaultRealm == NULL)
- flags |= KRB5_PRINCIPAL_PARSE_NO_REALM;
-
- code = krb5_parse_name_flags(krbContext, nameString, flags, &krbPrinc);
-
- if (defaultRealm != NULL)
- GSSEAP_FREE(defaultRealm);
+ }
+
+ if (code == KRB5_PARSE_MALFORMED) {
+ char *defaultRealm = NULL;
+ int parseFlags = 0;
+
+ /* Possibly append the default EAP realm if required */
+ if (importFlags & IMPORT_FLAG_DEFAULT_REALM)
+ defaultRealm = gssEapGetDefaultRealm(krbContext);
+
+ /* If no default realm, leave the realm empty in the parsed name */
+ if (defaultRealm == NULL || defaultRealm[0] == '\0')
+ parseFlags |= KRB5_PRINCIPAL_PARSE_NO_REALM;
+
+ code = krb5_parse_name_flags(krbContext, nameString, parseFlags, &krbPrinc);
+
+#ifdef HAVE_HEIMDAL_VERSION
+ if (code == 0 && KRB_PRINC_REALM(krbPrinc) == NULL) {
+ KRB_PRINC_REALM(krbPrinc) = GSSEAP_CALLOC(1, sizeof(char));
+ if (KRB_PRINC_REALM(krbPrinc) == NULL)
+ code = ENOMEM;
}
+#endif
+ if (defaultRealm != NULL)
+ GSSEAP_FREE(defaultRealm);
+ }
+
+ if (nameBuffer != GSS_C_NO_BUFFER)
GSSEAP_FREE(nameString);
- if (code != 0) {
- *minor = code;
- return GSS_S_FAILURE;
- }
+ if (code != 0) {
+ *minor = code;
+ return GSS_S_FAILURE;
}
assert(krbPrinc != NULL);
}
static OM_uint32
+importEapName(OM_uint32 *minor,
+ const gss_buffer_t nameBuffer,
+ gss_name_t *pName)
+{
+ return importEapNameFlags(minor, nameBuffer, 0, pName);
+}
+
+static OM_uint32
+importUserName(OM_uint32 *minor,
+ const gss_buffer_t nameBuffer,
+ gss_name_t *pName)
+{
+ return importEapNameFlags(minor, nameBuffer, IMPORT_FLAG_DEFAULT_REALM, pName);
+}
+
+static OM_uint32
importAnonymousName(OM_uint32 *minor,
const gss_buffer_t nameBuffer GSSEAP_UNUSED,
gss_name_t *pName)
{
- OM_uint32 major;
- krb5_context krbContext;
- krb5_principal krbPrinc;
-
- GSSEAP_KRB_INIT(&krbContext);
-
- *minor = krb5_copy_principal(krbContext, krbAnonymousPrincipal(),
- &krbPrinc);
- if (*minor != 0)
- return GSS_S_FAILURE;
-
- major = krbPrincipalToName(minor, &krbPrinc, pName);
- if (GSS_ERROR(major)) {
- krb5_free_principal(krbContext, krbPrinc);
- }
-
- return major;
+ return importEapNameFlags(minor, GSS_C_NO_BUFFER, 0, pName);
}
#define UPDATE_REMAIN(n) do { \
gssEapImportNameInternal(OM_uint32 *minor,
const gss_buffer_t nameBuffer,
gss_name_t *pName,
- unsigned int flags)
+ OM_uint32 flags)
{
OM_uint32 major, tmpMinor;
krb5_context krbContext;
unsigned char *p;
size_t len, remain;
gss_buffer_desc buf;
- enum gss_eap_token_type tokType;
gss_name_t name = GSS_C_NO_NAME;
gss_OID mechanismUsed = GSS_C_NO_OID;
if (flags & EXPORT_NAME_FLAG_OID) {
gss_OID_desc mech;
+ enum gss_eap_token_type tokType;
+ uint16_t wireTokType;
/* TOK_ID || MECH_OID_LEN || MECH_OID */
- if (remain < 6)
+ if (remain < 6) {
+ *minor = GSSEAP_BAD_NAME_TOKEN;
return GSS_S_BAD_NAME;
+ }
if (flags & EXPORT_NAME_FLAG_COMPOSITE)
tokType = TOK_TYPE_EXPORT_NAME_COMPOSITE;
tokType = TOK_TYPE_EXPORT_NAME;
/* TOK_ID */
- if (load_uint16_be(p) != tokType)
+ wireTokType = load_uint16_be(p);
+
+ if ((flags & EXPORT_NAME_FLAG_ALLOW_COMPOSITE) &&
+ wireTokType == TOK_TYPE_EXPORT_NAME_COMPOSITE) {
+ tokType = TOK_TYPE_EXPORT_NAME_COMPOSITE;
+ flags |= EXPORT_NAME_FLAG_COMPOSITE;
+ }
+
+ if (wireTokType != tokType) {
+ *minor = GSSEAP_WRONG_TOK_ID;
return GSS_S_BAD_NAME;
+ }
UPDATE_REMAIN(2);
/* MECH_OID_LEN */
len = load_uint16_be(p);
- if (len < 2)
+ if (len < 2) {
+ *minor = GSSEAP_BAD_NAME_TOKEN;
return GSS_S_BAD_NAME;
+ }
UPDATE_REMAIN(2);
/* MECH_OID */
- if (p[0] != 0x06)
+ if (p[0] != 0x06) {
+ *minor = GSSEAP_BAD_NAME_TOKEN;
return GSS_S_BAD_NAME;
+ }
mech.length = p[1];
mech.elements = &p[2];
buf.value = p;
UPDATE_REMAIN(len);
- major = importUserName(minor, &buf, &name);
+ major = importEapNameFlags(minor, &buf, 0, &name);
if (GSS_ERROR(major))
goto cleanup;
gss_name_t *name)
{
return gssEapImportNameInternal(minor, nameBuffer, name,
- EXPORT_NAME_FLAG_OID);
+ EXPORT_NAME_FLAG_OID |
+ EXPORT_NAME_FLAG_ALLOW_COMPOSITE);
}
#ifdef HAVE_GSS_C_NT_COMPOSITE_EXPORT
gss_name_t *pName)
{
struct gss_eap_name_import_provider nameTypes[] = {
- { GSS_EAP_NT_EAP_NAME, importUserName },
+ { GSS_EAP_NT_EAP_NAME, importEapName },
{ GSS_C_NT_USER_NAME, importUserName },
{ GSS_C_NT_HOSTBASED_SERVICE, importServiceName },
{ GSS_C_NT_HOSTBASED_SERVICE_X, importServiceName },
gssEapExportNameInternal(OM_uint32 *minor,
const gss_name_t name,
gss_buffer_t exportedName,
- unsigned int flags)
+ OM_uint32 flags)
{
OM_uint32 major = GSS_S_FAILURE, tmpMinor;
- krb5_context krbContext;
- char *krbName = NULL;
- size_t krbNameLen, exportedNameLen;
+ gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
+ size_t exportedNameLen;
unsigned char *p;
gss_buffer_desc attrs = GSS_C_EMPTY_BUFFER;
gss_OID mech;
else
mech = GSS_EAP_MECHANISM;
- GSSEAP_KRB_INIT(&krbContext);
-
- *minor = krb5_unparse_name(krbContext, name->krbPrincipal, &krbName);
- if (*minor != 0) {
- major = GSS_S_FAILURE;
+ major = gssEapDisplayName(minor, name, &nameBuf, NULL);
+ if (GSS_ERROR(major))
goto cleanup;
- }
- krbNameLen = strlen(krbName);
exportedNameLen = 0;
if (flags & EXPORT_NAME_FLAG_OID) {
exportedNameLen += 6 + mech->length;
}
- exportedNameLen += 4 + krbNameLen;
+ exportedNameLen += 4 + nameBuf.length;
if (flags & EXPORT_NAME_FLAG_COMPOSITE) {
major = gssEapExportAttrContext(minor, name, &attrs);
if (GSS_ERROR(major))
}
/* NAME_LEN */
- store_uint32_be(krbNameLen, p);
+ store_uint32_be(nameBuf.length, p);
p += 4;
/* NAME */
- memcpy(p, krbName, krbNameLen);
- p += krbNameLen;
+ memcpy(p, nameBuf.value, nameBuf.length);
+ p += nameBuf.length;
if (flags & EXPORT_NAME_FLAG_COMPOSITE) {
memcpy(p, attrs.value, attrs.length);
cleanup:
gss_release_buffer(&tmpMinor, &attrs);
+ gss_release_buffer(&tmpMinor, &nameBuf);
if (GSS_ERROR(major))
gss_release_buffer(&tmpMinor, exportedName);
- krb5_free_unparsed_name(krbContext, krbName);
return major;
}
*/
#ifdef HAVE_HEIMDAL_VERSION
if (KRB_PRINC_REALM(name->krbPrincipal) == NULL ||
- KRB_PRINC_REALM(name->krBPrincipal)[0] == '\0')
+ KRB_PRINC_REALM(name->krbPrincipal)[0] == '\0')
#else
if (KRB_PRINC_REALM(name->krbPrincipal)->length == 0)
#endif
krb5_free_unparsed_name(krbContext, krbName);
- if (KRB_PRINC_TYPE(name->krbPrincipal) == KRB5_NT_WELLKNOWN &&
- krb5_principal_compare(krbContext,
- name->krbPrincipal, krbAnonymousPrincipal())) {
+ if (output_name_buffer->length == 0) {
name_type = GSS_C_NT_ANONYMOUS;
+ } else if (name->flags & NAME_FLAG_NAI) {
+ name_type = GSS_C_NT_USER_NAME;
} else {
name_type = GSS_EAP_NT_EAP_NAME;
}
return GSS_S_COMPLETE;
}
+
+OM_uint32
+gssEapCompareName(OM_uint32 *minor,
+ gss_name_t name1,
+ gss_name_t name2,
+ int *name_equal)
+{
+ krb5_context krbContext;
+
+ *minor = 0;
+
+ if (name1 == GSS_C_NO_NAME && name2 == GSS_C_NO_NAME) {
+ *name_equal = 1;
+ } else if (name1 != GSS_C_NO_NAME && name2 != GSS_C_NO_NAME) {
+ GSSEAP_KRB_INIT(&krbContext);
+
+ /* krbPrincipal is immutable, so lock not required */
+ *name_equal = krb5_principal_compare(krbContext,
+ name1->krbPrincipal,
+ name2->krbPrincipal);
+ }
+
+ return GSS_S_COMPLETE;
+}
projects / moonshot.git / blobdiff