From: Kevin Mitchell Date: Mon, 30 Jun 1997 21:17:07 +0000 (+0000) Subject: Added code so that a valid credential handle is generated when X-Git-Tag: krb5-1.1-beta1~1118 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=30acb5cd918df50d4de77feeae513a8588565a4e;p=krb5.git Added code so that a valid credential handle is generated when credentials are delegated. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10106 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 3718b8509..0c65bf13b 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,11 @@ +Mon Jun 30 14:05:51 1997 Kevin L Mitchell + + * accept_sec_context.c: added code to return a valid delegated + credential handle if credentials were delegated. The + GSS_C_DELEG_FLAG from the client is ignored, and the + option is only set if the client actually delegated + credentials. + Fri Jun 6 15:26:27 1997 Theodore Y. Ts'o * accept_sec_context.c (krb5_gss_accept_sec_context): Reorganized diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index d54e49672..c2dc47ed3 100644 --- a/src/lib/gssapi/krb5/accept_sec_context.c +++ b/src/lib/gssapi/krb5/accept_sec_context.c @@ -58,14 +58,16 @@ rd_req_keyproc(krb5_pointer keyprocarg, krb5_principal server, /* Decode, decrypt and store the forwarded creds in the local ccache. */ static krb5_error_code -rd_and_store_for_creds(context, auth_context, inbuf) +rd_and_store_for_creds(context, auth_context, inbuf, out_cred) krb5_context context; krb5_auth_context auth_context; krb5_data *inbuf; + krb5_gss_cred_id_t *out_cred; { krb5_creds ** creds; krb5_error_code retval; krb5_ccache ccache; + krb5_gss_cred_id_t cred = NULL; if ((retval = krb5_rd_cred(context, auth_context, inbuf, &creds, NULL))) return(retval); @@ -79,11 +81,50 @@ rd_and_store_for_creds(context, auth_context, inbuf) if ((retval = krb5_cc_store_cred(context, ccache, creds[0]))) goto cleanup; - if ((retval = krb5_cc_close(context, ccache))) + /* generate a delegated credential handle */ + if (out_cred) { + /* allocate memory for a cred_t... */ + if (!(cred = + (krb5_gss_cred_id_t) xmalloc(sizeof(krb5_gss_cred_id_rec)))) { + retval = ENOMEM; /* out of memory? */ goto cleanup; + } + + /* zero it out... */ + memset(cred, 0, sizeof(krb5_gss_cred_id_rec)); + + /* copy the client principle into it... */ + if ((retval = + krb5_copy_principal(context, creds[0]->client, &(cred->princ)))) { + retval = ENOMEM; /* out of memory? */ + xfree(cred); /* clean up memory on failure */ + cred = NULL; + goto cleanup; + } + cred->usage = GSS_C_INITIATE; /* we can't accept with this */ + /* cred->princ already set */ + cred->actual_mechs = gss_mech_set_krb5_both; /* both mechs work */ + cred->prerfc_mech = cred->rfc_mech = 1; /* Ibid. */ + cred->keytab = NULL; /* no keytab associated with this... */ + cred->ccache = ccache; /* but there is a credential cache */ + cred->tgt_expire = creds[0]->times.endtime; /* store the end time */ + } + + /* If there were errors, there might have been a memory leak + if (!cred) + if ((retval = krb5_cc_close(context, ccache))) + goto cleanup; + */ cleanup: krb5_free_tgt_creds(context, creds); + + if (!cred && ccache) + (void)krb5_cc_close(context, ccache); + + if (out_cred) + *out_cred = cred; /* return credential */ + return retval; } @@ -134,6 +175,7 @@ krb5_gss_accept_sec_context(minor_status, context_handle, OM_uint32 major_status = GSS_S_FAILURE; krb5_error krb_error_data; krb5_data scratch; + krb5_gss_cred_id_t deleg_cred = NULL; if (GSS_ERROR(kg_get_context(minor_status, &context))) return(GSS_S_FAILURE); @@ -320,6 +362,8 @@ krb5_gss_accept_sec_context(minor_status, context_handle, md5.contents = 0; TREAD_INT(ptr, gss_flags, bigend); + gss_flags &= ~GSS_C_DELEG_FLAG; /* mask out the delegation flag; if there's + a delegation, we'll set it below */ decode_req_message = 0; /* if the checksum length > 24, there are options to process */ @@ -356,12 +400,16 @@ krb5_gss_accept_sec_context(minor_status, context_handle, /* store the delegated credential in the user's cache */ rd_and_store_for_creds(context, auth_context_cred, - &option); + &option, + (delegated_cred_handle) ? + &deleg_cred : NULL); i -= option.length + 4; krb5_auth_con_free(context, auth_context_cred); + gss_flags |= GSS_C_DELEG_FLAG; /* got a delegation */ + break; /* default: */ @@ -540,6 +588,15 @@ krb5_gss_accept_sec_context(minor_status, context_handle, if (src_name) *src_name = (gss_name_t) name; + if (delegated_cred_handle && deleg_cred) { + if (!kg_save_cred_id((gss_cred_id_t) deleg_cred)) { + code = G_VALIDATE_FAILED; + goto fail; + } + + *delegated_cred_handle = (gss_cred_id_t) deleg_cred; + } + /* finally! */ *minor_status = 0; @@ -559,6 +616,13 @@ fail: } if (md5.contents) xfree(md5.contents); + if (deleg_cred) { /* free memory associated with the deleg credential */ + if (deleg_cred->ccache) + (void)krb5_cc_close(context, deleg_cred->ccache); + if (deleg_cred->princ) + krb5_free_principal(context, deleg_cred->princ); + xfree(deleg_cred); + } *minor_status = code;