oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

break out mk_error

Browse Source
This commit is contained in:
Love Hornquist Astrand
2011-05-08 20:43:16 -07:00
committed by Love Hörnquist Åstrand
parent 16d16588d2
commit a2bcf8bbdd
3 changed files with 128 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
kdc/fast.c
View File

@@ -92,3 +92,105 @@ _kdc_fast_mk_response(krb5_context context,
return 0;
}
krb5_error_code
_kdc_fast_mk_error(krb5_context context,
METHOD_DATA *error_method,
krb5_crypto armor_crypto,
const KDC_REQ_BODY *req_body,
krb5_error_code outer_error,
const char *e_text,
krb5_principal error_client,
krb5_principal error_server,
time_t *csec, int *cusec,
krb5_data *error_msg)
{
krb5_error_code ret;
krb5_data e_data;
size_t size;
krb5_data_zero(&e_data);
if (armor_crypto) {
PA_FX_FAST_REPLY fxfastrep;
KrbFastResponse fastrep;
memset(&fxfastrep, 0, sizeof(fxfastrep));
memset(&fastrep, 0, sizeof(fastrep));
/* first add the KRB-ERROR to the fast errors */
ret = krb5_mk_error(context,
outer_error,
e_text,
NULL,
error_client,
error_server,
NULL,
NULL,
&e_data);
if (ret)
return ret;
ret = krb5_padata_add(context, error_method,
KRB5_PADATA_FX_ERROR,
e_data.data, e_data.length);
if (ret) {
krb5_data_free(&e_data);
return ret;
}
if (/* hide_principal */ 0) {
error_client = NULL;
error_server = NULL;
e_text = NULL;
}
ret = _kdc_fast_mk_response(context, armor_crypto,
error_method, NULL, NULL,
req_body->nonce, &e_data);
free_METHOD_DATA(error_method);
if (ret)
return ret;
ret = krb5_padata_add(context, error_method,
KRB5_PADATA_FX_FAST,
e_data.data, e_data.length);
krb5_data_zero(&e_data);
if (ret)
return ret;
/*
* Set cookie to let client know we want conversation to
* continue.
*/
ret = krb5_padata_add(context, error_method,
KRB5_PADATA_FX_COOKIE,
NULL, 0);
if (ret)
return ret;
}
if (error_method && error_method->len) {
ASN1_MALLOC_ENCODE(METHOD_DATA, e_data.data, e_data.length,
error_method, &size, ret);
if (ret)
return ret;
if (e_data.length != size)
krb5_abortx(context, "internal asn.1 error");
}
ret = krb5_mk_error(context,
outer_error,
e_text,
(e_data.length ? &e_data : NULL),
error_client,
error_server,
csec,
cusec,
error_msg);
krb5_data_free(&e_data);
return ret;
}

102
kdc/kerberos5.c
View File

@@ -2253,95 +2253,21 @@ _kdc_as_rep(krb5_context context,
out:
free_AS_REP(&rep);
/*
* In case of a non proxy error, build an error message.
*/
if(ret != 0 && ret != HDB_ERR_NOT_FOUND_HERE){
krb5_error_code outer_error = ret;
krb5_data e_data;
krb5_principal error_client = client_princ;
krb5_principal error_server = server_princ;
size_t size;
krb5_data_zero(&e_data);
if (armor_crypto) {
PA_FX_FAST_REPLY fxfastrep;
KrbFastResponse fastrep;
memset(&fxfastrep, 0, sizeof(fxfastrep));
memset(&fastrep, 0, sizeof(fastrep));
/* first add the KRB-ERROR to the fast errors */
ret = krb5_mk_error(context,
outer_error,
e_text,
NULL,
error_client,
error_server,
NULL,
NULL,
&e_data);
if (ret)
goto out;
ret = krb5_padata_add(context, &error_method,
KRB5_PADATA_FX_ERROR,
e_data.data, e_data.length);
if (ret) {
krb5_data_free(&e_data);
goto out2;
}
if (/* hide_principal */ 0) {
error_client = NULL;
error_server = NULL;
e_text = NULL;
}
ret = _kdc_fast_mk_response(context, armor_crypto,
&error_method, NULL, NULL,
req->req_body.nonce, &e_data);
free_METHOD_DATA(&error_method);
krb5_data_free(&e_data);
if (ret)
goto out2;
ret = krb5_padata_add(context, &error_method,
KRB5_PADATA_FX_FAST,
e_data.data, e_data.length);
krb5_data_zero(&e_data);
if (ret)
goto out2;
/*
* Set cookie to let client know we want conversation to
* continue.
*/
ret = krb5_padata_add(context, &error_method,
KRB5_PADATA_FX_COOKIE,
NULL, 0);
if (ret)
goto out2;
}
if (error_method.len) {
ASN1_MALLOC_ENCODE(METHOD_DATA, e_data.data, e_data.length,
&error_method, &size, ret);
if (ret)
goto out2;
if (e_data.length != size)
krb5_abortx(context, "internal asn.1 error");
}
ret = krb5_mk_error(context,
outer_error,
e_text,
(e_data.length ? &e_data : NULL),
error_client,
error_server,
NULL,
NULL,
reply);
krb5_data_free(&e_data);
kdc_log(context, config, 10, "as-req: sending error: %d to client", ret);
ret = _kdc_fast_mk_error(context,
&error_method,
armor_crypto,
&req->req_body,
ret, e_text,
client_princ, server_princ,
NULL, NULL,
reply);
if (ret)
goto out2;
}
out2:
#ifdef PKINIT

22
kdc/krb5tgs.c
View File

@@ -2350,17 +2350,19 @@ out:
if(ret && ret != HDB_ERR_NOT_FOUND_HERE && data->data == NULL){
/* XXX add fast wrapping on the error */
METHOD_DATA error_method = { 0, NULL };
krb5_mk_error(context,
ret,
NULL,
NULL,
NULL,
NULL,
csec,
cusec,
data);
ret = 0;
kdc_log(context, config, 10, "tgs-req: sending error: %d to client", ret);
ret = _kdc_fast_mk_error(context,
&error_method,
NULL,
NULL,
ret, NULL,
NULL, NULL,
csec, cusec,
data);
free_METHOD_DATA(&error_method);
}
free(csec);
free(cusec);