X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=blobdiff_plain;f=accept_sec_context.c;h=5829ed9bda5f3f9653998e2b2a4526fac23ae539;hp=d9e232e865d61e4e99f0d80c74c66a99f8412d6d;hb=ae79fdae047f980d01b2b4e84ccea52e24d8c7a0;hpb=b3e9b5417e483948e1cafb8be28a24eb4f606132 diff --git a/accept_sec_context.c b/accept_sec_context.c index d9e232e..5829ed9 100644 --- a/accept_sec_context.c +++ b/accept_sec_context.c @@ -42,14 +42,14 @@ static OM_uint32 eapGssSmAcceptGssReauth(OM_uint32 *minor, gss_cred_id_t cred, gss_ctx_id_t ctx, - gss_name_t target __attribute__((__unused__)), - gss_OID mech __attribute__((__unused__)), - OM_uint32 reqFlags __attribute__((__unused__)), - OM_uint32 timeReq __attribute__((__unused__)), + gss_name_t target, + gss_OID mech, + OM_uint32 reqFlags, + OM_uint32 timeReq, gss_channel_bindings_t chanBindings, gss_buffer_t inputToken, gss_buffer_t outputToken, - int *transitionState); + OM_uint32 *smFlags); #endif /* @@ -124,6 +124,57 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) return GSS_S_COMPLETE; } +static OM_uint32 +eapGssSmAcceptAcceptorName(OM_uint32 *minor, + gss_cred_id_t cred GSSEAP_UNUSED, + gss_ctx_id_t ctx, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, + gss_buffer_t inputToken GSSEAP_UNUSED, + gss_buffer_t outputToken, + OM_uint32 *smFlags GSSEAP_UNUSED) +{ + OM_uint32 major; + + /* XXX TODO import and validate name from inputToken */ + + if (ctx->acceptorName != GSS_C_NO_NAME) { + /* Send desired target name to acceptor */ + major = gssEapDisplayName(minor, ctx->acceptorName, + outputToken, NULL); + if (GSS_ERROR(major)) + return major; + } + + return GSS_S_CONTINUE_NEEDED; +} + +#ifdef GSSEAP_DEBUG +static OM_uint32 +eapGssSmAcceptVendorInfo(OM_uint32 *minor, + gss_cred_id_t cred GSSEAP_UNUSED, + gss_ctx_id_t ctx GSSEAP_UNUSED, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, + gss_buffer_t inputToken, + gss_buffer_t outputToken GSSEAP_UNUSED, + OM_uint32 *smFlags GSSEAP_UNUSED) +{ + fprintf(stderr, "GSS-EAP: vendor: %.*s\n", + (int)inputToken->length, (char *)inputToken->value); + + *minor = 0; + return GSS_S_CONTINUE_NEEDED; +} +#endif + + /* * Emit a identity EAP request to force the initiator (peer) to identify * itself. @@ -132,14 +183,14 @@ static OM_uint32 eapGssSmAcceptIdentity(OM_uint32 *minor, gss_cred_id_t cred, gss_ctx_id_t ctx, - gss_name_t target __attribute__((__unused__)), - gss_OID mech __attribute__((__unused__)), - OM_uint32 reqFlags __attribute__((__unused__)), - OM_uint32 timeReq __attribute__((__unused__)), - gss_channel_bindings_t chanBindings __attribute__((__unused__)), + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, gss_buffer_t inputToken, gss_buffer_t outputToken, - int *transitionState) + OM_uint32 *smFlags) { OM_uint32 major; struct wpabuf *reqData; @@ -155,14 +206,6 @@ eapGssSmAcceptIdentity(OM_uint32 *minor, return GSS_S_DEFECTIVE_TOKEN; } - assert(ctx->acceptorName == GSS_C_NO_NAME); - - if (cred->name != GSS_C_NO_NAME) { - major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName); - if (GSS_ERROR(major)) - return major; - } - reqData = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_IDENTITY, 0, EAP_CODE_REQUEST, 0); if (reqData == NULL) { @@ -179,8 +222,10 @@ eapGssSmAcceptIdentity(OM_uint32 *minor, wpabuf_free(reqData); + GSSEAP_SM_TRANSITION_NEXT(ctx); + *minor = 0; - *transitionState = 1; + *smFlags |= SM_FLAG_OUTPUT_TOKEN_CRITICAL; return GSS_S_CONTINUE_NEEDED; } @@ -423,14 +468,14 @@ static OM_uint32 eapGssSmAcceptAuthenticate(OM_uint32 *minor, gss_cred_id_t cred, gss_ctx_id_t ctx, - gss_name_t target __attribute__((__unused__)), - gss_OID mech __attribute__((__unused__)), - OM_uint32 reqFlags __attribute__((__unused__)), - OM_uint32 timeReq __attribute__((__unused__)), - gss_channel_bindings_t chanBindings, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, gss_buffer_t inputToken, gss_buffer_t outputToken, - int *transitionState) + OM_uint32 *smFlags) { OM_uint32 major, tmpMinor; struct rs_connection *rconn; @@ -498,8 +543,8 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, frresp = rs_packet_frpkt(resp); switch (frresp->code) { - case PW_AUTHENTICATION_ACK: case PW_ACCESS_CHALLENGE: + case PW_AUTHENTICATION_ACK: break; case PW_AUTHENTICATION_REJECT: *minor = GSSEAP_RADIUS_AUTH_FAILURE; @@ -531,40 +576,46 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, ctx->acceptorCtx.vps = frresp->vps; frresp->vps = NULL; - rs_conn_destroy(ctx->acceptorCtx.radConn); - ctx->acceptorCtx.radConn = NULL; - major = acceptReadyEap(minor, ctx, cred); if (GSS_ERROR(major)) goto cleanup; - *transitionState = 1; + GSSEAP_SM_TRANSITION_NEXT(ctx); } major = GSS_S_CONTINUE_NEEDED; *minor = 0; + *smFlags |= SM_FLAG_OUTPUT_TOKEN_CRITICAL; cleanup: if (request != NULL) rs_request_destroy(request); if (req != NULL) rs_packet_destroy(req); + if (resp != NULL) + rs_packet_destroy(resp); + if (GSSEAP_SM_STATE(ctx) == GSSEAP_STATE_INITIATOR_EXTS) { + assert(major == GSS_S_CONTINUE_NEEDED); + + rs_conn_destroy(ctx->acceptorCtx.radConn); + ctx->acceptorCtx.radConn = NULL; + } return major; } static OM_uint32 eapGssSmAcceptGssChannelBindings(OM_uint32 *minor, - gss_cred_id_t cred, + gss_cred_id_t cred GSSEAP_UNUSED, gss_ctx_id_t ctx, - gss_name_t target __attribute__((__unused__)), - gss_OID mech __attribute__((__unused__)), - OM_uint32 reqFlags __attribute__((__unused__)), - OM_uint32 timeReq __attribute__((__unused__)), + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, gss_channel_bindings_t chanBindings, gss_buffer_t inputToken, - gss_buffer_t outputToken, - int *transitionState) + gss_buffer_t outputToken GSSEAP_UNUSED, + OM_uint32 *smFlags GSSEAP_UNUSED) { OM_uint32 major, tmpMinor; gss_iov_buffer_desc iov[2]; @@ -579,12 +630,15 @@ eapGssSmAcceptGssChannelBindings(OM_uint32 *minor, major = gssEapUnwrapOrVerifyMIC(minor, ctx, NULL, NULL, iov, 2, TOK_TYPE_WRAP); if (GSS_ERROR(major)) - return GSS_S_BAD_BINDINGS; + return major; if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS && !bufferEqual(&iov[0].buffer, &chanBindings->application_data)) { major = GSS_S_BAD_BINDINGS; *minor = GSSEAP_BINDINGS_MISMATCH; + } else { + major = GSS_S_CONTINUE_NEEDED; + *minor = 0; } gss_release_buffer(&tmpMinor, &iov[0].buffer); @@ -597,14 +651,14 @@ static OM_uint32 eapGssSmAcceptReauthCreds(OM_uint32 *minor, gss_cred_id_t cred, gss_ctx_id_t ctx, - gss_name_t target __attribute__((__unused__)), - gss_OID mech __attribute__((__unused__)), - OM_uint32 reqFlags __attribute__((__unused__)), - OM_uint32 timeReq __attribute__((__unused__)), - gss_channel_bindings_t chanBindings __attribute__((__unused__)), - gss_buffer_t inputToken, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, + gss_buffer_t inputToken GSSEAP_UNUSED, gss_buffer_t outputToken, - int *transitionState) + OM_uint32 *smFlags GSSEAP_UNUSED) { OM_uint32 major; @@ -613,39 +667,79 @@ eapGssSmAcceptReauthCreds(OM_uint32 *minor, * fabricate a ticket from the initiator to ourselves. */ major = gssEapMakeReauthCreds(minor, ctx, cred, outputToken); - if (GSS_ERROR(major)) - return major; + if (major == GSS_S_UNAVAILABLE) + major = GSS_S_COMPLETE; + if (major == GSS_S_COMPLETE) + major = GSS_S_CONTINUE_NEEDED; return major; } #endif static OM_uint32 -eapGssSmAcceptNegoExtFinished(OM_uint32 *minor, - gss_cred_id_t cred, - gss_ctx_id_t ctx, - gss_name_t target __attribute__((__unused__)), - gss_OID mech __attribute__((__unused__)), - OM_uint32 reqFlags __attribute__((__unused__)), - OM_uint32 timeReq __attribute__((__unused__)), - gss_channel_bindings_t chanBindings __attribute__((__unused__)), - gss_buffer_t inputToken, - gss_buffer_t outputToken, - int *transitionState) +eapGssSmAcceptCompleteInitiatorExts(OM_uint32 *minor, + gss_cred_id_t cred GSSEAP_UNUSED, + gss_ctx_id_t ctx, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, + gss_buffer_t inputToken GSSEAP_UNUSED, + gss_buffer_t outputToken GSSEAP_UNUSED, + OM_uint32 *smFlags GSSEAP_UNUSED) { + GSSEAP_SM_TRANSITION_NEXT(ctx); + *minor = 0; - *transitionState = 1; + + return GSS_S_CONTINUE_NEEDED; +} + +static OM_uint32 +eapGssSmAcceptCompleteAcceptorExts(OM_uint32 *minor, + gss_cred_id_t cred GSSEAP_UNUSED, + gss_ctx_id_t ctx, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, + gss_buffer_t inputToken GSSEAP_UNUSED, + gss_buffer_t outputToken GSSEAP_UNUSED, + OM_uint32 *smFlags) +{ + GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_ESTABLISHED); + + *minor = 0; + *smFlags |= SM_FLAG_FORCE_SEND_TOKEN; + return GSS_S_COMPLETE; } static struct gss_eap_sm eapGssAcceptorSm[] = { + { + ITOK_TYPE_ACCEPTOR_NAME_REQ, + ITOK_TYPE_ACCEPTOR_NAME_RESP, + GSSEAP_STATE_INITIAL, + 0, + eapGssSmAcceptAcceptorName + }, +#ifdef GSSEAP_DEBUG + { + ITOK_TYPE_VENDOR_INFO, + ITOK_TYPE_NONE, + GSSEAP_STATE_INITIAL, + 0, + eapGssSmAcceptVendorInfo, + }, +#endif #ifdef GSSEAP_ENABLE_REAUTH { ITOK_TYPE_REAUTH_REQ, ITOK_TYPE_REAUTH_RESP, GSSEAP_STATE_INITIAL, - 0, /* critical */ - 0, /* required */ + 0, eapGssSmAcceptGssReauth, }, #endif @@ -653,43 +747,45 @@ static struct gss_eap_sm eapGssAcceptorSm[] = { ITOK_TYPE_NONE, ITOK_TYPE_EAP_REQ, GSSEAP_STATE_INITIAL, - 1, /* critical */ - 1, /* required */ + SM_ITOK_FLAG_REQUIRED, eapGssSmAcceptIdentity, }, { ITOK_TYPE_EAP_RESP, ITOK_TYPE_EAP_REQ, GSSEAP_STATE_AUTHENTICATE, - 1, /* critical */ - 1, /* required */ + SM_ITOK_FLAG_REQUIRED, eapGssSmAcceptAuthenticate }, { ITOK_TYPE_GSS_CHANNEL_BINDINGS, ITOK_TYPE_NONE, - GSSEAP_STATE_NEGO_EXT, - 1, /* critical */ - 1, /* required */ + GSSEAP_STATE_INITIATOR_EXTS, + SM_ITOK_FLAG_REQUIRED, eapGssSmAcceptGssChannelBindings, }, + { + ITOK_TYPE_NONE, + ITOK_TYPE_NONE, + GSSEAP_STATE_INITIATOR_EXTS, + 0, + eapGssSmAcceptCompleteInitiatorExts, + }, #ifdef GSSEAP_ENABLE_REAUTH { ITOK_TYPE_NONE, ITOK_TYPE_REAUTH_CREDS, - GSSEAP_STATE_NEGO_EXT, - 0, /* critical */ - 0, /* required */ + GSSEAP_STATE_ACCEPTOR_EXTS, + 0, eapGssSmAcceptReauthCreds, }, #endif { ITOK_TYPE_NONE, ITOK_TYPE_NONE, - GSSEAP_STATE_NEGO_EXT, - 1, /* critical */ - 1, /* required */ - eapGssSmAcceptNegoExtFinished + GSSEAP_STATE_ACCEPTOR_EXTS, + 0, + eapGssSmAcceptCompleteAcceptorExts }, }; @@ -752,6 +848,12 @@ gss_accept_sec_context(OM_uint32 *minor, GSSEAP_MUTEX_LOCK(&cred->mutex); + if (cred->name != GSS_C_NO_NAME) { + major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName); + if (GSS_ERROR(major)) + goto cleanup; + } + major = gssEapSmStep(minor, cred, ctx, @@ -789,7 +891,7 @@ gss_accept_sec_context(OM_uint32 *minor, } } - assert(ctx->state == GSSEAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED); + assert(CTX_IS_ESTABLISHED(ctx) || major == GSS_S_CONTINUE_NEEDED); cleanup: if (cred != GSS_C_NO_CREDENTIAL) @@ -817,34 +919,26 @@ acceptReadyKrb(OM_uint32 *minor, if (GSS_ERROR(major)) return major; - if (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 = GSSEAP_STATE_NEGO_EXT; /* skip */ - *minor = 0; - return GSS_S_COMPLETE; /* advance state */ + return GSS_S_COMPLETE; } static OM_uint32 eapGssSmAcceptGssReauth(OM_uint32 *minor, gss_cred_id_t cred, gss_ctx_id_t ctx, - gss_name_t target __attribute__((__unused__)), + gss_name_t target GSSEAP_UNUSED, gss_OID mech, - OM_uint32 reqFlags __attribute__((__unused__)), - OM_uint32 timeReq __attribute__((__unused__)), + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, gss_channel_bindings_t chanBindings, gss_buffer_t inputToken, gss_buffer_t outputToken, - int *transitionState) + OM_uint32 *smFlags) { OM_uint32 major, tmpMinor; gss_name_t krbInitiator = GSS_C_NO_NAME; @@ -873,11 +967,19 @@ eapGssSmAcceptGssReauth(OM_uint32 *minor, if (major == GSS_S_COMPLETE) { major = acceptReadyKrb(minor, ctx, cred, krbInitiator, mech, timeRec); - *transitionState = 1; + if (major == GSS_S_COMPLETE) { + GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_ESTABLISHED); + } + ctx->gssFlags = gssFlags; + } else if (GSS_ERROR(major) && + (*smFlags & SM_FLAG_INPUT_TOKEN_CRITICAL) == 0) { + /* pretend reauthentication attempt never happened */ + gssDeleteSecContext(&tmpMinor, &ctx->kerberosCtx, GSS_C_NO_BUFFER); + ctx->flags &= ~(CTX_FLAG_KRB_REAUTH); + GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_INITIAL); + major = GSS_S_CONTINUE_NEEDED; } - ctx->gssFlags = gssFlags; - gssReleaseName(&tmpMinor, &krbInitiator); return major;