From b917472ffade184da3aa109fb7c93a161c73961f Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 18 Feb 2009 18:17:47 +0000 Subject: [PATCH] pull up r21884 from trunk ------------------------------------------------------------------------ r21884 | wfiveash | 2009-02-04 17:29:44 -0500 (Wed, 04 Feb 2009) | 7 lines Changed paths: M /trunk/src/kadmin/dbutil/kdb5_mkey.c M /trunk/src/lib/kdb/kdb5.c ticket: 6361 new multi-masterkey support doesn't work well when system clock is set back The ticket contains the details. ------------------------------------------------------------------------ ticket: 6361 version_fixed: 1.7 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22015 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/dbutil/kdb5_mkey.c | 118 +++++++++++++++++++--------------- src/lib/kdb/kdb5.c | 29 +++++---- 2 files changed, 83 insertions(+), 64 deletions(-) diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c index 786726e63..96bbaf912 100644 --- a/src/kadmin/dbutil/kdb5_mkey.c +++ b/src/kadmin/dbutil/kdb5_mkey.c @@ -372,12 +372,13 @@ kdb5_use_mkey(int argc, char *argv[]) char *mkey_fullname; krb5_kvno use_kvno; krb5_timestamp now, start_time; - krb5_actkvno_node *actkvno_list, *new_actkvno_list_head, *new_actkvno, + krb5_actkvno_node *actkvno_list, *new_actkvno, *prev_actkvno, *cur_actkvno; krb5_db_entry master_entry; int nentries = 0; krb5_boolean more = 0, found; krb5_keylist_node *keylist_node; + krb5_boolean inserted = FALSE; if (argc < 2 || argc > 3) { /* usage calls exit */ @@ -413,7 +414,7 @@ kdb5_use_mkey(int argc, char *argv[]) if (argc == 3) { time_t t = get_date(argv[2]); - if (t == -1) { + if (t == -1) { com_err(progname, 0, "could not parse date-time string '%s'", argv[2]); exit_status++; @@ -474,37 +475,58 @@ kdb5_use_mkey(int argc, char *argv[]) return; } - /* alloc enough space to hold new and existing key_data */ - new_actkvno = (krb5_actkvno_node *) malloc(sizeof(krb5_actkvno_node)); - if (new_actkvno == NULL) { - com_err(progname, ENOMEM, "while adding new master key"); - exit_status++; - return; - } - memset(new_actkvno, 0, sizeof(krb5_actkvno_node)); - - new_actkvno->act_kvno = use_kvno; - new_actkvno->act_time = start_time; - /* - * determine which nodes to delete and where to insert new act kvno node + * If an entry already exists with the same kvno either delete it or if it's + * the only entry, just set its active time. */ + for (prev_actkvno = NULL, cur_actkvno = actkvno_list; + cur_actkvno != NULL; + prev_actkvno = cur_actkvno, cur_actkvno = cur_actkvno->next) { + + if (cur_actkvno->act_kvno == use_kvno) { + /* delete it */ + if (prev_actkvno) { + prev_actkvno->next = cur_actkvno->next; + cur_actkvno->next = NULL; + krb5_dbe_free_actkvno_list(util_context, cur_actkvno); + } else { + if (cur_actkvno->next) { + /* delete it from front of list */ + actkvno_list = cur_actkvno->next; + cur_actkvno->next = NULL; + krb5_dbe_free_actkvno_list(util_context, cur_actkvno); + } else { + /* There's only one entry, go ahead and change the time */ + cur_actkvno->act_time = start_time; + inserted = TRUE; + } + } + break; + } + } - if (actkvno_list == NULL) { - /* new actkvno is the list */ - new_actkvno_list_head = new_actkvno; - } else { - krb5_boolean inserted = FALSE, trimed = FALSE; + if (!inserted) { + /* alloc enough space to hold new and existing key_data */ + new_actkvno = (krb5_actkvno_node *) malloc(sizeof(krb5_actkvno_node)); + if (new_actkvno == NULL) { + com_err(progname, ENOMEM, "while adding new master key"); + exit_status++; + return; + } + memset(new_actkvno, 0, sizeof(krb5_actkvno_node)); + new_actkvno->act_kvno = use_kvno; + new_actkvno->act_time = start_time; - for (prev_actkvno = NULL, cur_actkvno = actkvno_list; - cur_actkvno != NULL; - prev_actkvno = cur_actkvno, cur_actkvno = cur_actkvno->next) { + /* insert new act kvno node */ + + if (actkvno_list == NULL) { + /* new actkvno is the list */ + actkvno_list = new_actkvno; + } else { + for (prev_actkvno = NULL, cur_actkvno = actkvno_list; + cur_actkvno != NULL; + prev_actkvno = cur_actkvno, cur_actkvno = cur_actkvno->next) { - if (cur_actkvno->act_kvno == use_kvno) { - cur_actkvno->act_time = start_time; - inserted = TRUE; /* fake it */ - } - if (!inserted) { if (new_actkvno->act_time < cur_actkvno->act_time) { if (prev_actkvno) { prev_actkvno->next = new_actkvno; @@ -513,42 +535,32 @@ kdb5_use_mkey(int argc, char *argv[]) new_actkvno->next = actkvno_list; actkvno_list = new_actkvno; } - inserted = TRUE; + break; } else if (cur_actkvno->next == NULL) { /* end of line, just add new node to end of list */ cur_actkvno->next = new_actkvno; - inserted = TRUE; - } - } - if (!trimed) { - /* trim entries in past that are superceded */ - if (cur_actkvno->act_time > now) { - if (prev_actkvno) { - new_actkvno_list_head = prev_actkvno; - } else { - new_actkvno_list_head = actkvno_list; - } - trimed = TRUE; - } else if (cur_actkvno->next == NULL) { - /* XXX this is buggy, fix soon. */ - new_actkvno_list_head = cur_actkvno; - trimed = TRUE; + break; } } - if (trimed && inserted) - break; } } - if ((retval = krb5_dbe_update_actkvno(util_context, &master_entry, - new_actkvno_list_head))) { - com_err(progname, retval, "while updating actkvno data for master principal entry"); + if (actkvno_list->act_time > now) { + com_err(progname, EINVAL, "there must be one master key currently active"); exit_status++; return; } + if ((retval = krb5_dbe_update_actkvno(util_context, &master_entry, + /* new_actkvno_list_head))) { */ + actkvno_list))) { + com_err(progname, retval, "while updating actkvno data for master principal entry"); + exit_status++; + return; + } + if ((retval = krb5_dbe_update_mod_princ_data(util_context, &master_entry, - now, master_princ))) { + now, master_princ))) { com_err(progname, retval, "while updating the master key principal modification time"); exit_status++; return; @@ -658,7 +670,7 @@ kdb5_list_mkeys(int argc, char *argv[]) } if (actkvno_list != NULL) { - act_time = 0; + act_time = -1; /* assume actkvno entry not found */ for (cur_actkvno = actkvno_list; cur_actkvno != NULL; cur_actkvno = cur_actkvno->next) { if (cur_actkvno->act_kvno == cur_kb_node->kvno) { @@ -683,7 +695,7 @@ kdb5_list_mkeys(int argc, char *argv[]) retval = asprintf(&output_str, "KNVO: %d, Enctype: %s, Active on: %s *\n", cur_kb_node->kvno, enctype, strdate(act_time)); } else { - if (act_time) { + if (act_time != -1) { retval = asprintf(&output_str, "KNVO: %d, Enctype: %s, Active on: %s\n", cur_kb_node->kvno, enctype, strdate(act_time)); } else { diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c index a7d5154cb..442c28f27 100644 --- a/src/lib/kdb/kdb5.c +++ b/src/lib/kdb/kdb5.c @@ -1878,8 +1878,10 @@ krb5_dbe_fetch_act_key_list(krb5_context context, if (nprinc != 1) { if (nprinc) { krb5_db_free_principal(context, &entry, nprinc); + return (KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE); + } else { + return(KRB5_KDB_NOMASTERKEY); } - return(KRB5_KDB_NOMASTERKEY); } else if (more) { krb5_db_free_principal(context, &entry, nprinc); return (KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE); @@ -1888,24 +1890,19 @@ krb5_dbe_fetch_act_key_list(krb5_context context, retval = krb5_dbe_lookup_actkvno(context, &entry, act_key_list); if (*act_key_list == NULL) { - krb5_actkvno_node *tmp_actkvno; - krb5_timestamp now; + krb5_actkvno_node *tmp_actkvno; /* * for mkey princ entries without KRB5_TL_ACTKVNO data provide a default */ - if ((retval = krb5_timeofday(context, &now))) - return (retval); - tmp_actkvno = (krb5_actkvno_node *) malloc(sizeof(krb5_actkvno_node)); if (tmp_actkvno == NULL) return (ENOMEM); memset(tmp_actkvno, 0, sizeof(krb5_actkvno_node)); - tmp_actkvno->act_time = now; + tmp_actkvno->act_time = 0; /* earliest time possible */ /* use most current key */ tmp_actkvno->act_kvno = entry.key_data[0].key_data_kvno; - *act_key_list = tmp_actkvno; } @@ -1915,7 +1912,7 @@ krb5_dbe_fetch_act_key_list(krb5_context context, /* * Locates the "active" mkey used when encrypting a princ's keys. Note, the - * caller must not free the output act_mkey. + * caller must NOT free the output act_mkey. */ krb5_error_code @@ -1937,10 +1934,20 @@ krb5_dbe_find_act_mkey(krb5_context context, /* * The list should be sorted in time, early to later so if the first entry - * is later than now, this is a problem + * is later than now, this is a problem. The fallback in this case is to + * return the earlist activation entry. */ if (act_mkey_list->act_time > now) { - return (KRB5_KDB_NOACTMASTERKEY); + while (cur_keyblock && cur_keyblock->kvno != act_mkey_list->act_kvno) + cur_keyblock = cur_keyblock->next; + if (cur_keyblock) { + *act_mkey = &cur_keyblock->keyblock; + if (act_kvno != NULL) + *act_kvno = cur_keyblock->kvno; + return (0); + } else { + return (KRB5_KDB_NOACTMASTERKEY); + } } /* find the most current entry <= now */ -- 2.26.2