X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=accept_sec_context.c;h=d7a4708ff04fba50b529a5ebc9858262c7736cb4;hb=163856b1a70d7773c46d4ea5495b85c4dce0f089;hp=b8446d3ff21d700c15b1b076f98c806af6904450;hpb=99f632709fcee9af5a6b067191fb68dfb0ddc2d7;p=mech_eap.orig diff --git a/accept_sec_context.c b/accept_sec_context.c index b8446d3..d7a4708 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) @@ -102,11 +107,20 @@ 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); + 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, @@ -122,8 +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->acceptorName == GSS_C_NO_NAME); @@ -145,11 +161,15 @@ 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, @@ -159,24 +179,28 @@ setAcceptorIdentity(OM_uint32 *minor, gss_buffer_desc nameBuf; krb5_context krbContext = NULL; krb5_principal krbPrinc; - struct rs_handle *rh = ctx->acceptorCtx.radHandle; + struct rs_context *rc = ctx->acceptorCtx.radContext; - assert(rh != NULL); + 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 = gssEapRadiusAddAvp(minor, vps, PW_GSS_ACCEPTOR_SERVICE_NAME, @@ -186,7 +210,7 @@ setAcceptorIdentity(OM_uint32 *minor, return major; /* Acceptor-Host-Name */ - krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 1), &nameBuf); + krbPrincComponentToGssBuffer(krbPrinc, 1, &nameBuf); major = gssEapRadiusAddAvp(minor, vps, PW_GSS_ACCEPTOR_HOST_NAME, @@ -195,13 +219,13 @@ setAcceptorIdentity(OM_uint32 *minor, 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); @@ -223,7 +247,7 @@ 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 = gssEapRadiusAddAvp(minor, vps, @@ -234,9 +258,13 @@ setAcceptorIdentity(OM_uint32 *minor, return major; } + *minor = 0; return GSS_S_COMPLETE; } +/* + * Allocate a RadSec handle + */ static OM_uint32 createRadiusHandle(OM_uint32 *minor, gss_cred_id_t cred, @@ -248,11 +276,11 @@ createRadiusHandle(OM_uint32 *minor, struct rs_alloc_scheme ralloc; struct rs_error *err; - assert(actx->radHandle == NULL); + assert(actx->radContext == NULL); assert(actx->radConn == NULL); - if (rs_context_create(&actx->radHandle, RS_DICT_FILE) != 0) { - *minor = GSSEAP_RADSEC_INIT_FAILURE; + if (rs_context_create(&actx->radContext, RS_DICT_FILE) != 0) { + *minor = GSSEAP_RADSEC_CONTEXT_FAILURE; return GSS_S_FAILURE; } @@ -268,27 +296,24 @@ createRadiusHandle(OM_uint32 *minor, ralloc.free = GSSEAP_FREE; ralloc.realloc = GSSEAP_REALLOC; - rs_context_set_alloc_scheme(actx->radHandle, &ralloc); + rs_context_set_alloc_scheme(actx->radContext, &ralloc); - if (rs_context_read_config(actx->radHandle, configFile) != 0) { - err = rs_err_ctx_pop(actx->radHandle); + if (rs_context_read_config(actx->radContext, configFile) != 0) { + err = rs_err_ctx_pop(actx->radContext); goto fail; } - if (rs_conn_create(actx->radHandle, &actx->radConn, configStanza) != 0) { + if (rs_conn_create(actx->radContext, &actx->radConn, configStanza) != 0) { err = rs_err_conn_pop(actx->radConn); goto fail; } - /* XXX TODO rs_conn_select_server does not exist yet */ -#if 0 if (actx->radServer != NULL) { if (rs_conn_select_server(actx->radConn, actx->radServer) != 0) { err = rs_err_conn_pop(actx->radConn); goto fail; } } -#endif *minor = 0; return GSS_S_COMPLETE; @@ -297,6 +322,9 @@ fail: return gssEapRadiusMapError(minor, err); } +/* + * Process a EAP response from the initiator. + */ static OM_uint32 eapGssSmAcceptAuthenticate(OM_uint32 *minor, gss_ctx_id_t ctx, @@ -306,14 +334,13 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, gss_buffer_t outputToken) { OM_uint32 major, tmpMinor; - struct rs_handle *rh; 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.radHandle == NULL) { + if (ctx->acceptorCtx.radContext == NULL) { /* May be NULL from an imported partial context */ major = createRadiusHandle(minor, cred, ctx); if (GSS_ERROR(major)) @@ -322,7 +349,6 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, sendAcceptorIdentity = 1; } - rh = ctx->acceptorCtx.radHandle; rconn = ctx->acceptorCtx.radConn; if (rs_packet_create_acc_request(rconn, &req, NULL, NULL) != 0) { @@ -366,11 +392,12 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, major = GSS_S_CONTINUE_NEEDED; break; case PW_AUTHENTICATION_REJECT: - *minor = GSSEAP_PEER_AUTH_FAILURE; + *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; @@ -378,14 +405,17 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, major = gssEapRadiusGetAvp(minor, frresp->vps, PW_EAP_MESSAGE, 0, outputToken, TRUE); - if ((major == GSS_S_UNAVAILABLE && frresp->code != PW_AUTHENTICATION_ACK) || - GSS_ERROR(major)) + if (major == GSS_S_UNAVAILABLE && frresp->code == PW_ACCESS_CHALLENGE) { + *minor = GSSEAP_MISSING_EAP_REQUEST; + major = GSS_S_DEFECTIVE_TOKEN; + goto cleanup; + } else if (GSS_ERROR(major)) goto cleanup; if (frresp->code == PW_ACCESS_CHALLENGE) { major = gssEapRadiusGetAvp(minor, frresp->vps, PW_STATE, 0, &ctx->acceptorCtx.state, TRUE); - if (major != GSS_S_UNAVAILABLE && GSS_ERROR(major)) + if (GSS_ERROR(major) && *minor != GSSEAP_NO_SUCH_ATTR) goto cleanup; } else { ctx->acceptorCtx.vps = frresp->vps; @@ -398,9 +428,10 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, 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: @@ -426,8 +457,9 @@ eapGssSmAcceptExtensionsReq(OM_uint32 *minor, outputToken->length = 0; outputToken->value = NULL; - ctx->state = EAP_STATE_EXTENSIONS_RESP; + ctx->state = GSSEAP_STATE_EXTENSIONS_RESP; + *minor = 0; return GSS_S_CONTINUE_NEEDED; } @@ -445,8 +477,9 @@ eapGssSmAcceptExtensionsResp(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; } @@ -463,6 +496,40 @@ eapGssSmAcceptEstablished(OM_uint32 *minor, 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; @@ -473,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 }; @@ -511,6 +579,7 @@ gss_accept_sec_context(OM_uint32 *minor, output_token->value = NULL; if (input_token == GSS_C_NO_BUFFER || input_token->length == 0) { + *minor = GSSEAP_TOK_TRUNC; return GSS_S_DEFECTIVE_TOKEN; } @@ -544,7 +613,7 @@ gss_accept_sec_context(OM_uint32 *minor, goto cleanup; if (!gssEapCredAvailable(cred, ctx->mechanismUsed)) { - *minor = GSSEAP_WRONG_MECH; + *minor = GSSEAP_CRED_MECH_MISMATCH; major = GSS_S_BAD_MECH; goto cleanup; } @@ -557,7 +626,7 @@ 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) { @@ -575,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) @@ -603,11 +672,25 @@ 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) @@ -647,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; } @@ -666,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;