X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=accept_sec_context.c;h=eb1a07cc73379062a00141f0cc440c412f84af9a;hb=31355119edb3a282ab302c05e33e23430af67603;hp=bb182bc509c55728f25319438ea388e5ed8f1b2e;hpb=8820bf2eefd0781bf6045b2627f1671759480ecd;p=mech_eap.orig diff --git a/accept_sec_context.c b/accept_sec_context.c index bb182bc..eb1a07c 100644 --- a/accept_sec_context.c +++ b/accept_sec_context.c @@ -36,7 +36,7 @@ * Mark a context as ready for cryptographic operations */ static OM_uint32 -acceptReady(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) +acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) { OM_uint32 major, tmpMinor; VALUE_PAIR *vp; @@ -48,10 +48,6 @@ acceptReady(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) if (GSS_ERROR(major)) return major; - /* - * Now, if we have a username from the identity packet, discard it - * because it's unauthenticated. - */ gssEapReleaseName(&tmpMinor, &ctx->initiatorName); vp = rc_avpair_get(ctx->acceptorCtx.avps, PW_USER_NAME, 0); @@ -70,8 +66,8 @@ acceptReady(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) ctx->initiatorName->attrCtx = gssEapCreateAttrContext(cred, ctx); vp = rc_avpair_get(ctx->acceptorCtx.avps, - RADIUS_VENDOR_ATTR_MS_MPPE_SEND_KEY, - RADIUS_VENDOR_ID_MICROSOFT); + VENDOR_ATTR_MS_MPPE_SEND_KEY, + VENDOR_ID_MICROSOFT); if (ctx->encryptionType != ENCTYPE_NULL && vp != NULL) { major = gssEapDeriveRfc3961Key(minor, (unsigned char *)vp->strvalue, @@ -130,10 +126,10 @@ eapGssSmAcceptIdentity(OM_uint32 *minor, if (GSS_ERROR(major)) return major; - if (ctx->acceptorName == GSS_C_NO_NAME && - cred != GSS_C_NO_CREDENTIAL && - cred->name != GSS_C_NO_NAME) { - major = gss_duplicate_name(minor, cred->name, &ctx->acceptorName); + assert(ctx->acceptorName == GSS_C_NO_NAME); + + if (cred != GSS_C_NO_CREDENTIAL && cred->name != GSS_C_NO_NAME) { + major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName); if (GSS_ERROR(major)) return major; } @@ -156,28 +152,85 @@ eapGssSmAcceptIdentity(OM_uint32 *minor, } static OM_uint32 -importInitiatorIdentity(OM_uint32 *minor, - gss_ctx_id_t ctx, - gss_buffer_t inputToken, - gss_buffer_t nameBuf) +setAcceptorIdentity(OM_uint32 *minor, + gss_ctx_id_t ctx, + VALUE_PAIR **avps) { - OM_uint32 major, tmpMinor; - struct eap_hdr *pdu = (struct eap_hdr *)inputToken->value; - unsigned char *pos = (unsigned char *)(pdu + 1); - gss_name_t name; + OM_uint32 major; + gss_buffer_desc nameBuf; + krb5_context krbContext = NULL; + krb5_principal krbPrinc; + + /* Awaits further specification */ + if (ctx->acceptorName == GSS_C_NO_NAME) + return GSS_S_COMPLETE; + + GSSEAP_KRB_INIT(&krbContext); + + krbPrinc = ctx->acceptorName->krbPrincipal; + assert(krbPrinc != NULL); - assert(pdu->code == EAP_CODE_RESPONSE); - assert(pos[0] == EAP_TYPE_IDENTITY); + if (krb5_princ_size(krbContext, krbPrinc) < 2) + return GSS_S_BAD_NAME; - nameBuf->value = pos + 1; - nameBuf->length = inputToken->length - sizeof(*pdu) - 1; + /* Acceptor-Service-Name */ + krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 0), &nameBuf); - major = gssEapImportName(minor, nameBuf, GSS_C_NT_USER_NAME, &name); + major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps, + VENDOR_ATTR_GSS_ACCEPTOR_SERVICE_NAME, + VENDOR_ID_UKERNA, + &nameBuf); if (GSS_ERROR(major)) return major; - gssEapReleaseName(&tmpMinor, &ctx->initiatorName); - ctx->initiatorName = name; + /* Acceptor-Host-Name */ + krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 1), &nameBuf); + + major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps, + VENDOR_ATTR_GSS_ACCEPTOR_HOST_NAME, + VENDOR_ID_UKERNA, + &nameBuf); + if (GSS_ERROR(major)) + return major; + + if (krb5_princ_size(krbContext, krbPrinc) > 2) { + /* Acceptor-Service-Specific */ + krb5_principal_data ssiPrinc = *krbPrinc; + char *ssi; + + krb5_princ_size(krbContext, &ssiPrinc) -= 2; + krb5_princ_name(krbContext, &ssiPrinc) += 2; + + *minor = krb5_unparse_name_flags(krbContext, &ssiPrinc, + KRB5_PRINCIPAL_UNPARSE_NO_REALM, &ssi); + if (*minor != 0) + return GSS_S_FAILURE; + + nameBuf.value = ssi; + nameBuf.length = strlen(ssi); + + major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps, + VENDOR_ATTR_GSS_ACCEPTOR_SERVICE_SPECIFIC, + VENDOR_ID_UKERNA, + &nameBuf); + + if (GSS_ERROR(major)) { + krb5_free_unparsed_name(krbContext, ssi); + return major; + } + krb5_free_unparsed_name(krbContext, ssi); + } + + krbDataToGssBuffer(krb5_princ_realm(krbContext, krbPrinc), &nameBuf); + if (nameBuf.length != 0) { + /* Acceptor-Realm-Name */ + major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps, + VENDOR_ATTR_GSS_ACCEPTOR_REALM_NAME, + VENDOR_ID_UKERNA, + &nameBuf); + if (GSS_ERROR(major)) + return major; + } return GSS_S_COMPLETE; } @@ -206,21 +259,25 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, if (inputToken->length > sizeof(*pdu) && pdu->code == EAP_CODE_RESPONSE && pos[0] == EAP_TYPE_IDENTITY) { - major = importInitiatorIdentity(minor, ctx, inputToken, &nameBuf); + /* + * XXX TODO do we really need to set User-Name? FreeRADIUS does + * not appear to require it. + */ + major = addAvpFromBuffer(minor, rh, &send, PW_USER_NAME, 0, &nameBuf); if (GSS_ERROR(major)) goto cleanup; - major = addAvpFromBuffer(minor, rh, &send, PW_USER_NAME, &nameBuf); + major = setAcceptorIdentity(minor, ctx, &send); if (GSS_ERROR(major)) goto cleanup; } - major = addAvpFromBuffer(minor, rh, &send, PW_EAP_MESSAGE, inputToken); + major = addAvpFromBuffer(minor, rh, &send, PW_EAP_MESSAGE, 0, inputToken); if (GSS_ERROR(major)) goto cleanup; if (ctx->acceptorCtx.lastStatus == CHALLENGE_RC) { - major = addAvpFromBuffer(minor, rh, &send, PW_STATE, + major = addAvpFromBuffer(minor, rh, &send, PW_STATE, 0, &ctx->acceptorCtx.state); if (GSS_ERROR(major)) goto cleanup; @@ -250,14 +307,14 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, ctx->acceptorCtx.lastStatus = code; - major = getBufferFromAvps(minor, received, PW_EAP_MESSAGE, + major = getBufferFromAvps(minor, received, PW_EAP_MESSAGE, 0, outputToken, TRUE); if ((major == GSS_S_UNAVAILABLE && code != OK_RC) || GSS_ERROR(major)) goto cleanup; if (code == CHALLENGE_RC) { - major = getBufferFromAvps(minor, received, PW_STATE, + major = getBufferFromAvps(minor, received, PW_STATE, 0, &ctx->acceptorCtx.state, TRUE); if (major != GSS_S_UNAVAILABLE && GSS_ERROR(major)) goto cleanup; @@ -265,11 +322,11 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, ctx->acceptorCtx.avps = received; received = NULL; - major = acceptReady(minor, ctx, cred); + major = acceptReadyEap(minor, ctx, cred); if (GSS_ERROR(major)) goto cleanup; - ctx->state = EAP_STATE_GSS_CHANNEL_BINDINGS; + ctx->state = EAP_STATE_EXTENSIONS_REQ; } major = GSS_S_CONTINUE_NEEDED; @@ -282,56 +339,88 @@ cleanup: } static OM_uint32 -eapGssSmAcceptGssChannelBindings(OM_uint32 *minor, - gss_ctx_id_t ctx, - gss_cred_id_t cred, - gss_buffer_t inputToken, - gss_channel_bindings_t chanBindings, - gss_buffer_t outputToken) +acceptGssChannelBindings(OM_uint32 *minor, + gss_ctx_id_t ctx, + gss_cred_id_t cred, + gss_buffer_t inputToken, + gss_channel_bindings_t chanBindings) { - OM_uint32 major; + OM_uint32 major, tmpMinor; gss_iov_buffer_desc iov[2]; - outputToken->length = 0; - outputToken->value = NULL; + iov[0].type = GSS_IOV_BUFFER_TYPE_DATA | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; - if (chanBindings == GSS_C_NO_CHANNEL_BINDINGS) { - ctx->state = EAP_STATE_ESTABLISHED; - return GSS_S_COMPLETE; - } + iov[1].type = GSS_IOV_BUFFER_TYPE_STREAM; + iov[1].buffer = *inputToken; - if (inputToken->length < 14) { - return GSS_S_DEFECTIVE_TOKEN; + major = gssEapUnwrapOrVerifyMIC(minor, ctx, NULL, NULL, + iov, 2, TOK_TYPE_WRAP); + if (GSS_ERROR(major)) + return major; + + if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS && + !bufferEqual(&iov[0].buffer, &chanBindings->application_data)) { + major = GSS_S_BAD_BINDINGS; + } else { + major = GSS_S_CONTINUE_NEEDED; } - iov[0].type = GSS_IOV_BUFFER_TYPE_DATA; - iov[0].buffer.length = 0; - iov[0].buffer.value = NULL; + gss_release_buffer(&tmpMinor, &iov[0].buffer); + + return major; +} + +static OM_uint32 +eapGssSmAcceptExtensionsReq(OM_uint32 *minor, + gss_ctx_id_t ctx, + gss_cred_id_t cred, + gss_buffer_t inputToken, + gss_channel_bindings_t chanBindings, + gss_buffer_t outputToken) +{ + OM_uint32 major; + + outputToken->length = 0; + outputToken->value = NULL; - if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS) - iov[0].buffer = chanBindings->application_data; + major = acceptGssChannelBindings(minor, ctx, cred, inputToken, + chanBindings); + if (GSS_ERROR(major)) + return major; - iov[1].type = GSS_IOV_BUFFER_TYPE_HEADER; - iov[1].buffer.length = 16; - iov[1].buffer.value = (unsigned char *)inputToken->value - 2; + ctx->state = EAP_STATE_EXTENSIONS_RESP; - assert(load_uint16_be(iov[1].buffer.value) == TOK_TYPE_GSS_CB); + return GSS_S_CONTINUE_NEEDED; +} - iov[2].type = GSS_IOV_BUFFER_TYPE_TRAILER; - iov[2].buffer.length = inputToken->length - 14; - iov[2].buffer.value = (unsigned char *)inputToken->value + 14; +static OM_uint32 +eapGssSmAcceptExtensionsResp(OM_uint32 *minor, + gss_ctx_id_t ctx, + gss_cred_id_t cred, + gss_buffer_t inputToken, + gss_channel_bindings_t chanBindings, + gss_buffer_t outputToken) +{ + OM_uint32 major, tmpMinor; + gss_buffer_desc credsToken = GSS_C_EMPTY_BUFFER; - major = gssEapUnwrapOrVerifyMIC(minor, ctx, NULL, NULL, - iov, 3, TOK_TYPE_GSS_CB); - if (major == GSS_S_COMPLETE) { - ctx->state = EAP_STATE_ESTABLISHED; + major = gssEapMakeReauthCreds(minor, ctx, cred, &credsToken); + if (GSS_ERROR(major)) + return major; + + ctx->state = EAP_STATE_ESTABLISHED; + + major = duplicateBuffer(minor, &credsToken, outputToken); + if (GSS_ERROR(major)) { + gss_release_buffer(&tmpMinor, &credsToken); + return major; } -#if 0 - gss_release_buffer(&tmpMinor, &iov[0].buffer); -#endif + gss_release_buffer(&tmpMinor, &credsToken); - return major; + return GSS_S_COMPLETE; } static OM_uint32 @@ -347,6 +436,77 @@ eapGssSmAcceptEstablished(OM_uint32 *minor, return GSS_S_BAD_STATUS; } +static OM_uint32 +acceptReadyKrb(OM_uint32 *minor, + gss_ctx_id_t ctx, + gss_cred_id_t cred, + const gss_name_t initiator, + const gss_OID mech, + OM_uint32 timeRec) +{ + OM_uint32 major; + + major = gssEapGlueToMechName(minor, initiator, &ctx->initiatorName); + if (GSS_ERROR(major)) + return major; + + if (cred != GSS_C_NO_CREDENTIAL && cred->name != GSS_C_NO_NAME) { + major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName); + if (GSS_ERROR(major)) + return major; + } + + major = gssEapReauthComplete(minor, ctx, cred, mech, timeRec); + if (GSS_ERROR(major)) + return major; + + ctx->state = EAP_STATE_ESTABLISHED; + + return GSS_S_COMPLETE; +} + +static OM_uint32 +eapGssSmAcceptGssReauth(OM_uint32 *minor, + gss_ctx_id_t ctx, + gss_cred_id_t cred, + gss_buffer_t inputToken, + gss_channel_bindings_t chanBindings, + gss_buffer_t outputToken) +{ + OM_uint32 major, tmpMinor; + gss_cred_id_t krbCred = GSS_C_NO_CREDENTIAL; + gss_name_t krbInitiator = GSS_C_NO_NAME; + gss_OID mech = GSS_C_NO_OID; + OM_uint32 gssFlags, timeRec = GSS_C_INDEFINITE; + + ctx->flags |= CTX_FLAG_KRB_REAUTH_GSS; + + if (cred != GSS_C_NO_CREDENTIAL) + krbCred = cred->krbCred; + + major = gssAcceptSecContext(minor, + &ctx->kerberosCtx, + krbCred, + inputToken, + chanBindings, + &krbInitiator, + &mech, + outputToken, + &gssFlags, + &timeRec, + NULL); + if (major == GSS_S_COMPLETE) { + major = acceptReadyKrb(minor, ctx, cred, + krbInitiator, mech, timeRec); + } + + ctx->gssFlags = gssFlags & ~(GSS_C_DCE_STYLE); + + gssReleaseName(&tmpMinor, &krbInitiator); + + return major; +} + static struct gss_eap_acceptor_sm { enum gss_eap_token_type inputTokenType; enum gss_eap_token_type outputTokenType; @@ -357,10 +517,12 @@ static struct gss_eap_acceptor_sm { gss_channel_bindings_t, gss_buffer_t); } eapGssAcceptorSm[] = { - { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptIdentity }, - { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptAuthenticate }, - { TOK_TYPE_GSS_CB, TOK_TYPE_NONE, eapGssSmAcceptGssChannelBindings }, - { TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmAcceptEstablished }, + { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptIdentity }, + { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptAuthenticate }, + { TOK_TYPE_EXT_REQ, TOK_TYPE_NONE, eapGssSmAcceptExtensionsReq }, + { TOK_TYPE_NONE, TOK_TYPE_EXT_RESP, eapGssSmAcceptExtensionsResp }, + { TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmAcceptEstablished }, + { TOK_TYPE_GSS_REAUTH, TOK_TYPE_GSS_REAUTH, eapGssSmAcceptGssReauth }, }; OM_uint32 @@ -382,6 +544,8 @@ gss_accept_sec_context(OM_uint32 *minor, struct gss_eap_acceptor_sm *sm = NULL; gss_buffer_desc innerInputToken = GSS_C_EMPTY_BUFFER; gss_buffer_desc innerOutputToken = GSS_C_EMPTY_BUFFER; + enum gss_eap_token_type tokType; + int initialContextToken = 0; *minor = 0; @@ -401,6 +565,7 @@ gss_accept_sec_context(OM_uint32 *minor, if (GSS_ERROR(major)) return major; + initialContextToken = 1; *context_handle = ctx; } @@ -409,12 +574,20 @@ gss_accept_sec_context(OM_uint32 *minor, sm = &eapGssAcceptorSm[ctx->state]; major = gssEapVerifyToken(minor, ctx, input_token, - sm->inputTokenType, &innerInputToken); + &tokType, &innerInputToken); if (GSS_ERROR(major)) goto cleanup; + if (tokType == TOK_TYPE_GSS_REAUTH && initialContextToken) { + ctx->state = EAP_STATE_KRB_REAUTH_GSS; + } else if (tokType != sm->inputTokenType) { + major = GSS_S_DEFECTIVE_TOKEN; + goto cleanup; + } + /* If credentials were provided, check they're usable with this mech */ - if (!gssEapCredAvailable(cred, ctx->mechanismUsed)) { + if (cred != GSS_C_NO_CREDENTIAL && + !gssEapCredAvailable(cred, ctx->mechanismUsed)) { major = GSS_S_BAD_MECH; goto cleanup; } @@ -436,7 +609,7 @@ gss_accept_sec_context(OM_uint32 *minor, if (!gssEapInternalizeOid(ctx->mechanismUsed, mech_type)) duplicateOid(&tmpMinor, ctx->mechanismUsed, mech_type); } - if (innerOutputToken.length != 0) { + if (innerOutputToken.value != NULL) { tmpMajor = gssEapMakeToken(&tmpMinor, ctx, &innerOutputToken, sm->outputTokenType, output_token); if (GSS_ERROR(tmpMajor)) { @@ -452,12 +625,12 @@ gss_accept_sec_context(OM_uint32 *minor, if (major == GSS_S_COMPLETE) { if (src_name != NULL && ctx->initiatorName != GSS_C_NO_NAME) { - major = gss_duplicate_name(&tmpMinor, ctx->initiatorName, src_name); + major = gssEapDuplicateName(&tmpMinor, ctx->initiatorName, src_name); if (GSS_ERROR(major)) goto cleanup; } if (time_rec != NULL) - gss_context_time(&tmpMinor, ctx, time_rec); + gssEapContextTime(&tmpMinor, ctx, time_rec); } assert(ctx->state == EAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED); @@ -472,4 +645,3 @@ cleanup: return major; } -