X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=accept_sec_context.c;h=bdf86eae114f7202635b29c98401202954aa8443;hb=38bac166b545aeea6e9c6d4da1deafa51581fe24;hp=6b0bb6a987f2df047bb07fd32d142520bc8b53fa;hpb=8f57ef91f6f6dc070405104f701aa8bd05789e43;p=mech_eap.orig diff --git a/accept_sec_context.c b/accept_sec_context.c index 6b0bb6a..bdf86ea 100644 --- a/accept_sec_context.c +++ b/accept_sec_context.c @@ -30,6 +30,11 @@ * SUCH DAMAGE. */ +/* + * Establish a security context on the acceptor (server). These functions + * wrap around libradsec and (thus) talk to a RADIUS server or proxy. + */ + #include "gssapiP_eap.h" #ifdef GSSEAP_ENABLE_REAUTH @@ -43,7 +48,7 @@ eapGssSmAcceptGssReauth(OM_uint32 *minor, #endif /* - * Mark a context as ready for cryptographic operations + * Mark an acceptor context as ready for cryptographic operations */ static OM_uint32 acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) @@ -60,10 +65,11 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) gssEapReleaseName(&tmpMinor, &ctx->initiatorName); - vp = rc_avpair_get(ctx->acceptorCtx.avps, PW_USER_NAME, 0); - if (vp != NULL) { - nameBuf.length = vp->lvalue; - nameBuf.value = vp->strvalue; + major = gssEapRadiusGetRawAvp(minor, ctx->acceptorCtx.vps, + PW_USER_NAME, 0, &vp); + if (major == GSS_S_COMPLETE) { + nameBuf.length = vp->length; + nameBuf.value = vp->vp_strvalue; } else { ctx->gssFlags |= GSS_C_ANON_FLAG; } @@ -73,34 +79,26 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) if (GSS_ERROR(major)) return major; - ctx->initiatorName->attrCtx = gssEapCreateAttrContext(cred, ctx); - - vp = rc_avpair_get(ctx->acceptorCtx.avps, - VENDOR_ATTR_MS_MPPE_SEND_KEY, - VENDOR_ID_MICROSOFT); - if (ctx->encryptionType != ENCTYPE_NULL && vp != NULL) { - major = gssEapDeriveRfc3961Key(minor, - (unsigned char *)vp->strvalue, - vp->lvalue, - ctx->encryptionType, - &ctx->rfc3961Key); - if (GSS_ERROR(major)) - return major; - - major = rfc3961ChecksumTypeForKey(minor, &ctx->rfc3961Key, - &ctx->checksumType); - if (GSS_ERROR(major)) - return major; - } else { - /* - * draft-howlett-eap-gss says that integrity/confidentialty should - * always be advertised as available, but if we have no keying - * material it seems confusing to the caller to advertise this. - */ - ctx->gssFlags &= ~(GSS_C_INTEG_FLAG | GSS_C_CONF_FLAG); - ctx->encryptionType = ENCTYPE_NULL; + major = gssEapRadiusGetRawAvp(minor, ctx->acceptorCtx.vps, + PW_MS_MPPE_SEND_KEY, VENDORPEC_MS, &vp); + if (GSS_ERROR(major)) { + *minor = GSSEAP_KEY_UNAVAILABLE; + return GSS_S_UNAVAILABLE; } + major = gssEapDeriveRfc3961Key(minor, + vp->vp_octets, + vp->length, + ctx->encryptionType, + &ctx->rfc3961Key); + if (GSS_ERROR(major)) + return major; + + major = rfc3961ChecksumTypeForKey(minor, &ctx->rfc3961Key, + &ctx->checksumType); + if (GSS_ERROR(major)) + return major; + major = sequenceInit(minor, &ctx->seqState, ctx->recvSeq, ((ctx->gssFlags & GSS_C_REPLAY_FLAG) != 0), @@ -109,9 +107,20 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) if (GSS_ERROR(major)) return major; + major = gssEapCreateAttrContext(minor, cred, ctx, + &ctx->initiatorName->attrCtx, + &ctx->expiryTime); + if (GSS_ERROR(major)) + return major; + + *minor = 0; return GSS_S_COMPLETE; } +/* + * Emit a identity EAP request to force the initiator (peer) to identify + * itself. + */ static OM_uint32 eapGssSmAcceptIdentity(OM_uint32 *minor, gss_ctx_id_t ctx, @@ -127,14 +136,10 @@ eapGssSmAcceptIdentity(OM_uint32 *minor, } pkt; gss_buffer_desc pktBuffer; - if (inputToken != GSS_C_NO_BUFFER && inputToken->length != 0) + if (inputToken != GSS_C_NO_BUFFER && inputToken->length != 0) { + *minor = GSSEAP_WRONG_SIZE; return GSS_S_DEFECTIVE_TOKEN; - - assert(ctx->acceptorCtx.radHandle == NULL); - - major = gssEapRadiusAllocHandle(minor, cred, &ctx->acceptorCtx.radHandle); - if (GSS_ERROR(major)) - return major; + } assert(ctx->acceptorName == GSS_C_NO_NAME); @@ -156,60 +161,71 @@ eapGssSmAcceptIdentity(OM_uint32 *minor, if (GSS_ERROR(major)) return major; - ctx->state = EAP_STATE_AUTHENTICATE; + ctx->state = GSSEAP_STATE_AUTHENTICATE; + *minor = 0; return GSS_S_CONTINUE_NEEDED; } +/* + * Pass the asserted acceptor identity to the authentication server. + */ static OM_uint32 setAcceptorIdentity(OM_uint32 *minor, gss_ctx_id_t ctx, - VALUE_PAIR **avps) + VALUE_PAIR **vps) { OM_uint32 major; gss_buffer_desc nameBuf; krb5_context krbContext = NULL; krb5_principal krbPrinc; + struct rs_context *rc = ctx->acceptorCtx.radContext; + + assert(rc != NULL); - /* Awaits further specification */ - if (ctx->acceptorName == GSS_C_NO_NAME) + if (ctx->acceptorName == GSS_C_NO_NAME) { + *minor = 0; return GSS_S_COMPLETE; + } + + if ((ctx->acceptorName->flags & NAME_FLAG_SERVICE) == 0) { + *minor = GSSEAP_BAD_SERVICE_NAME; + return GSS_S_BAD_NAME; + } GSSEAP_KRB_INIT(&krbContext); krbPrinc = ctx->acceptorName->krbPrincipal; assert(krbPrinc != NULL); - - if (krb5_princ_size(krbContext, krbPrinc) < 2) - return GSS_S_BAD_NAME; + assert(KRB_PRINC_LENGTH(krbPrinc) >= 2); /* Acceptor-Service-Name */ - krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 0), &nameBuf); + krbPrincComponentToGssBuffer(krbPrinc, 0, &nameBuf); - major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps, - VENDOR_ATTR_GSS_ACCEPTOR_SERVICE_NAME, - VENDOR_ID_UKERNA, - &nameBuf); + major = gssEapRadiusAddAvp(minor, vps, + PW_GSS_ACCEPTOR_SERVICE_NAME, + VENDORPEC_UKERNA, + &nameBuf); if (GSS_ERROR(major)) return major; /* Acceptor-Host-Name */ - krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 1), &nameBuf); + krbPrincComponentToGssBuffer(krbPrinc, 1, &nameBuf); - major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps, - VENDOR_ATTR_GSS_ACCEPTOR_HOST_NAME, - VENDOR_ID_UKERNA, - &nameBuf); + major = gssEapRadiusAddAvp(minor, vps, + PW_GSS_ACCEPTOR_HOST_NAME, + VENDORPEC_UKERNA, + &nameBuf); if (GSS_ERROR(major)) return major; - if (krb5_princ_size(krbContext, krbPrinc) > 2) { + if (KRB_PRINC_LENGTH(krbPrinc) > 2) { /* Acceptor-Service-Specific */ krb5_principal_data ssiPrinc = *krbPrinc; char *ssi; - krb5_princ_size(krbContext, &ssiPrinc) -= 2; - krb5_princ_name(krbContext, &ssiPrinc) += 2; + KRB_PRINC_LENGTH(&ssiPrinc) -= 2; + KRB_PRINC_NAME(&ssiPrinc) += 2; *minor = krb5_unparse_name_flags(krbContext, &ssiPrinc, KRB5_PRINCIPAL_UNPARSE_NO_REALM, &ssi); @@ -219,10 +235,10 @@ setAcceptorIdentity(OM_uint32 *minor, nameBuf.value = ssi; nameBuf.length = strlen(ssi); - major = addAvpFromBuffer(minor, ctx->acceptorCtx.radHandle, avps, - VENDOR_ATTR_GSS_ACCEPTOR_SERVICE_SPECIFIC, - VENDOR_ID_UKERNA, - &nameBuf); + major = gssEapRadiusAddAvp(minor, vps, + PW_GSS_ACCEPTOR_SERVICE_SPECIFIC, + VENDORPEC_UKERNA, + &nameBuf); if (GSS_ERROR(major)) { krb5_free_unparsed_name(krbContext, ssi); @@ -231,20 +247,84 @@ setAcceptorIdentity(OM_uint32 *minor, krb5_free_unparsed_name(krbContext, ssi); } - krbDataToGssBuffer(krb5_princ_realm(krbContext, krbPrinc), &nameBuf); + krbPrincRealmToGssBuffer(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); + major = gssEapRadiusAddAvp(minor, vps, + PW_GSS_ACCEPTOR_REALM_NAME, + VENDORPEC_UKERNA, + &nameBuf); if (GSS_ERROR(major)) return major; } + *minor = 0; return GSS_S_COMPLETE; } +/* + * Allocate a RadSec handle + */ +static OM_uint32 +createRadiusHandle(OM_uint32 *minor, + gss_cred_id_t cred, + gss_ctx_id_t ctx) +{ + struct gss_eap_acceptor_ctx *actx = &ctx->acceptorCtx; + const char *configFile = RS_CONFIG_FILE; + const char *configStanza = "gss-eap"; + struct rs_alloc_scheme ralloc; + struct rs_error *err; + + assert(actx->radContext == NULL); + assert(actx->radConn == NULL); + + if (rs_context_create(&actx->radContext, RS_DICT_FILE) != 0) { + *minor = GSSEAP_RADSEC_CONTEXT_FAILURE; + return GSS_S_FAILURE; + } + + if (cred != GSS_C_NO_CREDENTIAL) { + if (cred->radiusConfigFile != NULL) + configFile = cred->radiusConfigFile; + if (cred->radiusConfigStanza != NULL) + configStanza = cred->radiusConfigStanza; + } + + ralloc.calloc = GSSEAP_CALLOC; + ralloc.malloc = GSSEAP_MALLOC; + ralloc.free = GSSEAP_FREE; + ralloc.realloc = GSSEAP_REALLOC; + + rs_context_set_alloc_scheme(actx->radContext, &ralloc); + + if (rs_context_read_config(actx->radContext, configFile) != 0) { + err = rs_err_ctx_pop(actx->radContext); + goto fail; + } + + if (rs_conn_create(actx->radContext, &actx->radConn, configStanza) != 0) { + err = rs_err_conn_pop(actx->radConn); + goto fail; + } + + if (actx->radServer != NULL) { + if (rs_conn_select_server(actx->radConn, actx->radServer) != 0) { + err = rs_err_conn_pop(actx->radConn); + goto fail; + } + } + + *minor = 0; + return GSS_S_COMPLETE; + +fail: + return gssEapRadiusMapError(minor, err); +} + +/* + * Process a EAP response from the initiator. + */ static OM_uint32 eapGssSmAcceptAuthenticate(OM_uint32 *minor, gss_ctx_id_t ctx, @@ -254,130 +334,108 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, gss_buffer_t outputToken) { OM_uint32 major, tmpMinor; - int code; - VALUE_PAIR *send = NULL; - VALUE_PAIR *received = NULL; - rc_handle *rh = ctx->acceptorCtx.radHandle; - char msgBuffer[4096]; - struct eap_hdr *pdu; - unsigned char *pos; - gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER; - - pdu = (struct eap_hdr *)inputToken->value; - pos = (unsigned char *)(pdu + 1); - - if (inputToken->length > sizeof(*pdu) && - pdu->code == EAP_CODE_RESPONSE && - pos[0] == EAP_TYPE_IDENTITY) { - /* - * XXX TODO do we really need to set User-Name? FreeRADIUS does - * not require it but some other RADIUS servers might. - */ - major = addAvpFromBuffer(minor, rh, &send, PW_USER_NAME, 0, &nameBuf); + struct rs_connection *rconn; + struct rs_request *request = NULL; + struct rs_packet *req = NULL, *resp = NULL; + struct radius_packet *frreq, *frresp; + int sendAcceptorIdentity = 0; + + if (ctx->acceptorCtx.radContext == NULL) { + /* May be NULL from an imported partial context */ + major = createRadiusHandle(minor, cred, ctx); if (GSS_ERROR(major)) goto cleanup; - major = setAcceptorIdentity(minor, ctx, &send); + sendAcceptorIdentity = 1; + } + + rconn = ctx->acceptorCtx.radConn; + + if (rs_packet_create_acc_request(rconn, &req, NULL, NULL) != 0) { + major = gssEapRadiusMapError(minor, rs_err_conn_pop(rconn)); + goto cleanup; + } + frreq = rs_packet_frpkt(req); + + if (sendAcceptorIdentity) { + major = setAcceptorIdentity(minor, ctx, &frreq->vps); if (GSS_ERROR(major)) goto cleanup; } - major = addAvpFromBuffer(minor, rh, &send, PW_EAP_MESSAGE, 0, inputToken); + major = gssEapRadiusAddAvp(minor, &frreq->vps, + PW_EAP_MESSAGE, 0, inputToken); if (GSS_ERROR(major)) goto cleanup; - if (ctx->acceptorCtx.lastStatus == CHALLENGE_RC) { - major = addAvpFromBuffer(minor, rh, &send, PW_STATE, 0, - &ctx->acceptorCtx.state); + if (ctx->acceptorCtx.state.length != 0) { + major = gssEapRadiusAddAvp(minor, &frreq->vps, PW_STATE, 0, + &ctx->acceptorCtx.state); if (GSS_ERROR(major)) goto cleanup; gss_release_buffer(&tmpMinor, &ctx->acceptorCtx.state); } - code = rc_auth(rh, 0, send, &received, msgBuffer); - switch (code) { - case OK_RC: - case CHALLENGE_RC: + if (rs_request_create(rconn, &request) != 0 || + rs_request_send(request, req, &resp) != 0) { + major = gssEapRadiusMapError(minor, rs_err_conn_pop(rconn)); + goto cleanup; + } + + assert(resp != NULL); + + frresp = rs_packet_frpkt(resp); + switch (frresp->code) { + case PW_AUTHENTICATION_ACK: + case PW_ACCESS_CHALLENGE: major = GSS_S_CONTINUE_NEEDED; break; - case TIMEOUT_RC: - major = GSS_S_UNAVAILABLE; - break; - case REJECT_RC: + case PW_AUTHENTICATION_REJECT: + *minor = GSSEAP_RADIUS_AUTH_FAILURE; major = GSS_S_DEFECTIVE_CREDENTIAL; + goto cleanup; break; default: + *minor = GSSEAP_UNKNOWN_RADIUS_CODE; major = GSS_S_FAILURE; goto cleanup; + break; } - if (GSS_ERROR(major)) + major = gssEapRadiusGetAvp(minor, frresp->vps, PW_EAP_MESSAGE, 0, + outputToken, TRUE); + if (major == GSS_S_UNAVAILABLE && frresp->code == PW_ACCESS_CHALLENGE) { + *minor = GSSEAP_MISSING_EAP_REQUEST; + major = GSS_S_DEFECTIVE_TOKEN; goto cleanup; - - ctx->acceptorCtx.lastStatus = code; - - major = getBufferFromAvps(minor, received, PW_EAP_MESSAGE, 0, - outputToken, TRUE); - if ((major == GSS_S_UNAVAILABLE && code != OK_RC) || - GSS_ERROR(major)) + } else if (GSS_ERROR(major)) goto cleanup; - if (code == CHALLENGE_RC) { - major = getBufferFromAvps(minor, received, PW_STATE, 0, - &ctx->acceptorCtx.state, TRUE); - if (major != GSS_S_UNAVAILABLE && GSS_ERROR(major)) + if (frresp->code == PW_ACCESS_CHALLENGE) { + major = gssEapRadiusGetAvp(minor, frresp->vps, PW_STATE, 0, + &ctx->acceptorCtx.state, TRUE); + if (GSS_ERROR(major) && *minor != GSSEAP_NO_SUCH_ATTR) goto cleanup; } else { - ctx->acceptorCtx.avps = received; - received = NULL; + 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; - ctx->state = EAP_STATE_EXTENSIONS_REQ; + ctx->state = GSSEAP_STATE_EXTENSIONS_REQ; } + *minor = 0; major = GSS_S_CONTINUE_NEEDED; cleanup: - if (received != NULL) - rc_avpair_free(received); - - return major; -} - -static OM_uint32 -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, tmpMinor; - gss_iov_buffer_desc iov[2]; - - iov[0].type = GSS_IOV_BUFFER_TYPE_DATA | GSS_IOV_BUFFER_FLAG_ALLOCATE; - iov[0].buffer.length = 0; - iov[0].buffer.value = NULL; - - iov[1].type = GSS_IOV_BUFFER_TYPE_STREAM; - iov[1].buffer = *inputToken; - - 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; - } - - gss_release_buffer(&tmpMinor, &iov[0].buffer); + rs_request_destroy(request); return major; } @@ -392,16 +450,16 @@ eapGssSmAcceptExtensionsReq(OM_uint32 *minor, { OM_uint32 major; - outputToken->length = 0; - outputToken->value = NULL; - - major = acceptGssChannelBindings(minor, ctx, cred, inputToken, - chanBindings); + major = gssEapVerifyExtensions(minor, cred, ctx, chanBindings, inputToken); if (GSS_ERROR(major)) return major; - ctx->state = EAP_STATE_EXTENSIONS_RESP; + outputToken->length = 0; + outputToken->value = NULL; + + ctx->state = GSSEAP_STATE_EXTENSIONS_RESP; + *minor = 0; return GSS_S_CONTINUE_NEEDED; } @@ -413,34 +471,15 @@ eapGssSmAcceptExtensionsResp(OM_uint32 *minor, gss_channel_bindings_t chanBindings, gss_buffer_t outputToken) { - OM_uint32 major, tmpMinor; - gss_buffer_desc credsToken = GSS_C_EMPTY_BUFFER; + OM_uint32 major; -#ifdef GSSEAP_ENABLE_REAUTH - /* - * If we're built with fast reauthentication enabled, then - * fabricate a ticket from the initiator to ourselves. - * Otherwise return an empty token. - */ - major = gssEapMakeReauthCreds(minor, ctx, cred, &credsToken); + major = gssEapMakeExtensions(minor, cred, ctx, chanBindings, outputToken); if (GSS_ERROR(major)) return major; -#else - credsToken.value = ""; -#endif /* GSSEAP_ENABLE_REAUTH */ - major = duplicateBuffer(minor, &credsToken, outputToken); - if (GSS_ERROR(major)) { - gss_release_buffer(&tmpMinor, &credsToken); - return major; - } - -#ifdef GSSEAP_ENABLE_REAUTH - gss_release_buffer(&tmpMinor, &credsToken); -#endif - - ctx->state = EAP_STATE_ESTABLISHED; + ctx->state = GSSEAP_STATE_ESTABLISHED; + *minor = 0; return GSS_S_COMPLETE; } @@ -453,10 +492,44 @@ eapGssSmAcceptEstablished(OM_uint32 *minor, gss_buffer_t outputToken) { /* Called with already established context */ - *minor = EINVAL; + *minor = GSSEAP_CONTEXT_ESTABLISHED; return GSS_S_BAD_STATUS; } +static OM_uint32 +makeErrorToken(OM_uint32 *minor, + OM_uint32 majorStatus, + OM_uint32 minorStatus, + gss_buffer_t outputToken) +{ + unsigned char errorData[8]; + gss_buffer_desc errorBuffer; + + assert(GSS_ERROR(majorStatus)); + + /* + * Only return error codes that the initiator could have caused, + * to avoid information leakage. + */ + if (IS_RADIUS_ERROR(minorStatus)) { + /* Squash RADIUS error codes */ + minorStatus = GSSEAP_RADIUS_PROT_FAILURE; + } else if (!IS_WIRE_ERROR(minorStatus)) { + /* Don't return non-wire error codes */ + return GSS_S_COMPLETE; + } + + minorStatus -= ERROR_TABLE_BASE_eapg; + + store_uint32_be(majorStatus, &errorData[0]); + store_uint32_be(minorStatus, &errorData[4]); + + errorBuffer.length = sizeof(errorData); + errorBuffer.value = errorData; + + return duplicateBuffer(minor, &errorBuffer, outputToken); +} + static struct gss_eap_acceptor_sm { enum gss_eap_token_type inputTokenType; enum gss_eap_token_type outputTokenType; @@ -467,13 +540,14 @@ 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_EXT_REQ, TOK_TYPE_NONE, eapGssSmAcceptExtensionsReq }, - { TOK_TYPE_NONE, TOK_TYPE_EXT_RESP, eapGssSmAcceptExtensionsResp }, - { 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_NONE, TOK_TYPE_CONTEXT_ERR, NULL }, #ifdef GSSEAP_ENABLE_REAUTH - { TOK_TYPE_GSS_REAUTH, TOK_TYPE_GSS_REAUTH, eapGssSmAcceptGssReauth }, + { TOK_TYPE_GSS_REAUTH, TOK_TYPE_GSS_REAUTH, eapGssSmAcceptGssReauth }, #endif }; @@ -504,12 +578,8 @@ gss_accept_sec_context(OM_uint32 *minor, output_token->length = 0; output_token->value = NULL; - if (cred != GSS_C_NO_CREDENTIAL && - (cred->flags & CRED_FLAG_ACCEPT) == 0) { - return GSS_S_NO_CRED; - } - if (input_token == GSS_C_NO_BUFFER || input_token->length == 0) { + *minor = GSSEAP_TOK_TRUNC; return GSS_S_DEFECTIVE_TOKEN; } @@ -524,6 +594,17 @@ gss_accept_sec_context(OM_uint32 *minor, GSSEAP_MUTEX_LOCK(&ctx->mutex); + /* Validate and lock credentials */ + if (cred != GSS_C_NO_CREDENTIAL) { + GSSEAP_MUTEX_LOCK(&cred->mutex); + + if ((cred->flags & CRED_FLAG_ACCEPT) == 0) { + *minor = GSSEAP_CRED_USAGE_MISMATCH; + major = GSS_S_NO_CRED; + goto cleanup; + } + } + sm = &eapGssAcceptorSm[ctx->state]; major = gssEapVerifyToken(minor, ctx, input_token, @@ -531,6 +612,12 @@ gss_accept_sec_context(OM_uint32 *minor, if (GSS_ERROR(major)) goto cleanup; + if (!gssEapCredAvailable(cred, ctx->mechanismUsed)) { + *minor = GSSEAP_CRED_MECH_MISMATCH; + major = GSS_S_BAD_MECH; + goto cleanup; + } + #ifdef GSSEAP_ENABLE_REAUTH /* * If we're built with fast reauthentication support, it's valid @@ -539,21 +626,15 @@ gss_accept_sec_context(OM_uint32 *minor, * machine and process Kerberos GSS messages instead. */ if (tokType == TOK_TYPE_GSS_REAUTH && initialContextToken) { - ctx->state = EAP_STATE_KRB_REAUTH_GSS; + ctx->state = GSSEAP_STATE_KRB_REAUTH; } else #endif if (tokType != sm->inputTokenType) { + *minor = GSSEAP_WRONG_TOK_ID; major = GSS_S_DEFECTIVE_TOKEN; goto cleanup; } - /* If credentials were provided, check they're usable with this mech */ - if (cred != GSS_C_NO_CREDENTIAL && - !gssEapCredAvailable(cred, ctx->mechanismUsed)) { - major = GSS_S_BAD_MECH; - goto cleanup; - } - do { sm = &eapGssAcceptorSm[ctx->state]; @@ -563,23 +644,23 @@ gss_accept_sec_context(OM_uint32 *minor, &innerInputToken, input_chan_bindings, &innerOutputToken); - if (GSS_ERROR(major)) - goto cleanup; + if (GSS_ERROR(major)) { + /* Possibly generate an error token */ + tmpMajor = makeErrorToken(&tmpMinor, major, *minor, &innerOutputToken); + if (GSS_ERROR(tmpMajor)) { + major = tmpMajor; + goto cleanup; + } + + sm = &eapGssAcceptorSm[GSSEAP_STATE_ERROR]; + goto send_token; + } } while (major == GSS_S_CONTINUE_NEEDED && innerOutputToken.length == 0); if (mech_type != NULL) { if (!gssEapInternalizeOid(ctx->mechanismUsed, mech_type)) duplicateOid(&tmpMinor, ctx->mechanismUsed, mech_type); } - if (innerOutputToken.value != NULL) { - tmpMajor = gssEapMakeToken(&tmpMinor, ctx, &innerOutputToken, - sm->outputTokenType, output_token); - if (GSS_ERROR(tmpMajor)) { - major = tmpMajor; - *minor = tmpMinor; - goto cleanup; - } - } if (ret_flags != NULL) *ret_flags = ctx->gssFlags; if (delegated_cred_handle != NULL) @@ -591,13 +672,29 @@ gss_accept_sec_context(OM_uint32 *minor, if (GSS_ERROR(major)) goto cleanup; } - if (time_rec != NULL) - gssEapContextTime(&tmpMinor, ctx, time_rec); + if (time_rec != NULL) { + major = gssEapContextTime(&tmpMinor, ctx, time_rec); + if (GSS_ERROR(major)) + goto cleanup; + } } - assert(ctx->state == EAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED); + assert(ctx->state == GSSEAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED); + +send_token: + if (innerOutputToken.value != NULL) { + tmpMajor = gssEapMakeToken(&tmpMinor, ctx, &innerOutputToken, + sm->outputTokenType, output_token); + if (GSS_ERROR(tmpMajor)) { + major = tmpMajor; + *minor = tmpMinor; + goto cleanup; + } + } cleanup: + if (cred != GSS_C_NO_CREDENTIAL) + GSSEAP_MUTEX_UNLOCK(&cred->mutex); GSSEAP_MUTEX_UNLOCK(&ctx->mutex); if (GSS_ERROR(major)) @@ -619,7 +716,7 @@ acceptReadyKrb(OM_uint32 *minor, { OM_uint32 major; - major = gssEapGlueToMechName(minor, initiator, &ctx->initiatorName); + major = gssEapGlueToMechName(minor, ctx, initiator, &ctx->initiatorName); if (GSS_ERROR(major)) return major; @@ -633,8 +730,9 @@ acceptReadyKrb(OM_uint32 *minor, if (GSS_ERROR(major)) return major; - ctx->state = EAP_STATE_ESTABLISHED; + ctx->state = GSSEAP_STATE_ESTABLISHED; + *minor = 0; return GSS_S_COMPLETE; } @@ -652,7 +750,7 @@ eapGssSmAcceptGssReauth(OM_uint32 *minor, gss_OID mech = GSS_C_NO_OID; OM_uint32 gssFlags, timeRec = GSS_C_INDEFINITE; - ctx->flags |= CTX_FLAG_KRB_REAUTH_GSS; + ctx->flags |= CTX_FLAG_KRB_REAUTH; if (cred != GSS_C_NO_CREDENTIAL) krbCred = cred->krbCred;