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

Add support for writing to KDB and dumping HDB to MIT KDB dump format

Browse Source 
Before this change Heimdal could read KDBs.  Now it can write to
    them too.

    Heimdal can now also dump HDBs (including KDBs) in MIT format, which
    can then be imported with kdb5_util load.

    This is intended to help in migrations from MIT to Heimdal by
    allowing migrations from Heimdal to MIT so that it is possible
    to rollback from Heimdal to MIT should there be any issues.  The
    idea is to allow a) running Heimdal kdc/kadmind with a KDB, or
    b) running Heimdal with an HDB converted from a KDB and then
    rollback by dumping the HDB and loading a KDB.

    Note that not all TL data types are supported, only two: last
    password change and modify-by.  This is the minimum necessary.
    PKINIT users may need to add support for KRB5_TL_USER_CERTIFICATE,
    and for databases with K/M history we may need to add KRB5_TL_MKVNO
    support.

    Support for additional TL data types can be added in
    lib/hdb/hdb-mitdb.c:_hdb_mdb_value2entry() and
    lib/hdb/print.c:entry2mit_string_int().
This commit is contained in:
Nicolas Williams
2012-04-30 03:28:00 -05:00
parent 6c4764fbc7
commit 57f1545a46
10 changed files with 964 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

359
lib/hdb/print.c
View File

@@ -57,10 +57,14 @@
generation number
*/
static krb5_error_code
/*
* These utility functions return the number of bytes written or -1, and
* they set an error in the context.
*/
static ssize_t
append_string(krb5_context context, krb5_storage *sp, const char *fmt, ...)
{
krb5_error_code ret;
ssize_t sz;
char *s;
int rc;
va_list ap;
@@ -69,33 +73,41 @@ append_string(krb5_context context, krb5_storage *sp, const char *fmt, ...)
va_end(ap);
if(rc < 0) {
krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM;
return -1;
}
ret = krb5_storage_write(sp, s, strlen(s));
sz = krb5_storage_write(sp, s, strlen(s));
free(s);
return ret;
return sz;
}
static krb5_error_code
append_hex(krb5_context context, krb5_storage *sp, krb5_data *data)
append_hex(krb5_context context, krb5_storage *sp,
int always_encode, int lower, krb5_data *data)
{
ssize_t sz;
int printable = 1;
size_t i;
char *p;
p = data->data;
for(i = 0; i < data->length; i++)
if(!isalnum((unsigned char)p[i]) && p[i] != '.'){
printable = 0;
break;
}
if(printable)
if (!always_encode) {
for (i = 0; i < data->length; i++) {
if (!isalnum((unsigned char)p[i]) && p[i] != '.'){
printable = 0;
break;
}
}
}
if (printable && !always_encode)
return append_string(context, sp, "\"%.*s\"",
data->length, data->data);
hex_encode(data->data, data->length, &p);
append_string(context, sp, "%s", p);
sz = hex_encode(data->data, data->length, &p);
if (sz == -1) return sz;
if (lower)
strlwr(p);
sz = append_string(context, sp, "%s", p);
free(p);
return 0;
return sz;
}
static char *
@@ -106,22 +118,90 @@ time2str(time_t t)
return buf;
}
static krb5_error_code
static ssize_t
append_event(krb5_context context, krb5_storage *sp, Event *ev)
{
char *pr = NULL;
krb5_error_code ret;
ssize_t sz;
char *pr = NULL;
if(ev == NULL)
return append_string(context, sp, "- ");
if (ev->principal != NULL) {
ret = krb5_unparse_name(context, ev->principal, &pr);
if(ret)
return ret;
if (ret) return -1; /* krb5_unparse_name() sets error info */
}
ret = append_string(context, sp, "%s:%s ",
time2str(ev->time), pr ? pr : "UNKNOWN");
sz = append_string(context, sp, "%s:%s ", time2str(ev->time),
pr ? pr : "UNKNOWN");
free(pr);
return ret;
return sz;
}
#define KRB5_KDB_SALTTYPE_NORMAL 0
#define KRB5_KDB_SALTTYPE_V4 1
#define KRB5_KDB_SALTTYPE_NOREALM 2
#define KRB5_KDB_SALTTYPE_ONLYREALM 3
#define KRB5_KDB_SALTTYPE_SPECIAL 4
#define KRB5_KDB_SALTTYPE_AFS3 5
static ssize_t
append_mit_key(krb5_context context, krb5_storage *sp,
krb5_const_principal princ,
unsigned int kvno, Key *key)
{
krb5_error_code ret;
ssize_t sz;
size_t key_versions = key->salt ? 2 : 1;
size_t decrypted_key_length;
char buf[2];
krb5_data keylenbytes;
unsigned int salttype;
sz = append_string(context, sp, "\t%u\t%u\t%d\t%d\t", key_versions, kvno,
key->key.keytype, key->key.keyvalue.length + 2);
if (sz == -1) return sz;
ret = krb5_enctype_keysize(context, key->key.keytype, &decrypted_key_length);
if (ret) return -1; /* XXX we lose the error code */
buf[0] = decrypted_key_length & 0xff;
buf[1] = (decrypted_key_length & 0xff00) >> 8;
keylenbytes.data = buf;
keylenbytes.length = sizeof (buf);
sz = append_hex(context, sp, 1, 1, &keylenbytes);
if (sz == -1) return sz;
sz = append_hex(context, sp, 1, 1, &key->key.keyvalue);
if (!key->salt)
return sz;
/* Map salt to MIT KDB style */
if (key->salt->type == KRB5_PADATA_PW_SALT) {
krb5_salt k5salt;
/*
* Compute normal salt and then see whether it matches the stored one
*/
ret = krb5_get_pw_salt(context, princ, &k5salt);
if (ret) return -1;
if (k5salt.saltvalue.length == key->salt->salt.length &&
memcmp(k5salt.saltvalue.data, key->salt->salt.data,
k5salt.saltvalue.length) == 0)
salttype = KRB5_KDB_SALTTYPE_NORMAL; /* matches */
else if (key->salt->salt.length == strlen(princ->realm) &&
memcmp(key->salt->salt.data, princ->realm,
key->salt->salt.length) == 0)
salttype = KRB5_KDB_SALTTYPE_ONLYREALM; /* matches realm */
else if (key->salt->salt.length == k5salt.saltvalue.length - strlen(princ->realm) &&
memcmp((char *)k5salt.saltvalue.data + strlen(princ->realm),
key->salt->salt.data, key->salt->salt.length) == 0)
salttype = KRB5_KDB_SALTTYPE_NOREALM; /* matches w/o realm */
else
salttype = KRB5_KDB_SALTTYPE_NORMAL; /* hope for best */
} else if (key->salt->type == KRB5_PADATA_AFS3_SALT) {
salttype = KRB5_KDB_SALTTYPE_AFS3;
}
sz = append_string(context, sp, "\t%u\t%u\t", salttype,
key->salt->salt.length);
if (sz == -1) return sz;
return append_hex(context, sp, 1, 1, &key->salt->salt);
}
static krb5_error_code
@@ -150,12 +230,12 @@ entry2string_int (krb5_context context, krb5_storage *sp, hdb_entry *ent)
append_string(context, sp, "::%d:",
ent->keys.val[i].key.keytype);
/* --- keydata */
append_hex(context, sp, &ent->keys.val[i].key.keyvalue);
append_hex(context, sp, 0, 0, &ent->keys.val[i].key.keyvalue);
append_string(context, sp, ":");
/* --- salt */
if(ent->keys.val[i].salt){
append_string(context, sp, "%u/", ent->keys.val[i].salt->type);
append_hex(context, sp, &ent->keys.val[i].salt->salt);
append_hex(context, sp, 0, 0, &ent->keys.val[i].salt->salt);
}else
append_string(context, sp, "-");
}
@@ -238,21 +318,221 @@ entry2string_int (krb5_context context, krb5_storage *sp, hdb_entry *ent)
return 0;
}
#define KRB5_KDB_DISALLOW_POSTDATED 0x00000001
#define KRB5_KDB_DISALLOW_FORWARDABLE 0x00000002
#define KRB5_KDB_DISALLOW_TGT_BASED 0x00000004
#define KRB5_KDB_DISALLOW_RENEWABLE 0x00000008
#define KRB5_KDB_DISALLOW_PROXIABLE 0x00000010
#define KRB5_KDB_DISALLOW_DUP_SKEY 0x00000020
#define KRB5_KDB_DISALLOW_ALL_TIX 0x00000040
#define KRB5_KDB_REQUIRES_PRE_AUTH 0x00000080
#define KRB5_KDB_REQUIRES_HW_AUTH 0x00000100
#define KRB5_KDB_REQUIRES_PWCHANGE 0x00000200
#define KRB5_KDB_DISALLOW_SVR 0x00001000
#define KRB5_KDB_PWCHANGE_SERVICE 0x00002000
#define KRB5_KDB_SUPPORT_DESMD5 0x00004000
#define KRB5_KDB_NEW_PRINC 0x00008000
static int
flags_to_attr(HDBFlags flags)
{
int a = 0;
if (!flags.postdate)
a |= KRB5_KDB_DISALLOW_POSTDATED;
if (!flags.forwardable)
a |= KRB5_KDB_DISALLOW_FORWARDABLE;
if (flags.initial)
a |= KRB5_KDB_DISALLOW_TGT_BASED;
if (!flags.renewable)
a |= KRB5_KDB_DISALLOW_RENEWABLE;
if (!flags.proxiable)
a |= KRB5_KDB_DISALLOW_PROXIABLE;
if (flags.invalid)
a |= KRB5_KDB_DISALLOW_ALL_TIX;
if (flags.require_preauth)
a |= KRB5_KDB_REQUIRES_PRE_AUTH;
if (flags.require_hwauth)
a |= KRB5_KDB_REQUIRES_HW_AUTH;
if (!flags.server)
a |= KRB5_KDB_DISALLOW_SVR;
if (flags.change_pw)
a |= KRB5_KDB_PWCHANGE_SERVICE;
return a;
}
krb5_error_code
hdb_entry2string (krb5_context context, hdb_entry *ent, char **str)
entry2mit_string_int(krb5_context context, krb5_storage *sp, hdb_entry *ent)
{
krb5_error_code ret;
ssize_t sz;
size_t i, k;
size_t num_tl_data = 0;
size_t num_key_data = 0;
char *p;
HDB_Ext_KeySet *hist_keys = NULL;
HDB_extension *extp;
time_t last_pw_chg = 0;
time_t exp = 0;
time_t pwexp = 0;
unsigned int max_life = 0;
unsigned int max_renew = 0;
if (ent->modified_by)
num_tl_data++;
ret = hdb_entry_get_pw_change_time(ent, &last_pw_chg);
if (ret) return ret;
if (last_pw_chg)
num_tl_data++;
extp = hdb_find_extension(ent, choice_HDB_extension_data_hist_keys);
if (extp)
hist_keys = &extp->data.u.hist_keys;
for (i = 0; i < ent->keys.len;i++) {
if (ent->keys.val[i].key.keytype == ETYPE_DES_CBC_MD4 ||
ent->keys.val[i].key.keytype == ETYPE_DES_CBC_MD5)
continue;
num_key_data++;
}
if (hist_keys) {
for (i = 0; i < hist_keys->len; i++) {
/*
* MIT uses the highest kvno as the current kvno instead of
* tracking kvno separately, so we can't dump keysets with kvno
* higher than the entry's kvno.
*/
if (hist_keys->val[i].kvno >= ent->kvno)
continue;
for (k = 0; k < hist_keys->val[i].keys.len; k++) {
if (ent->keys.val[k].key.keytype == ETYPE_DES_CBC_MD4 ||
ent->keys.val[k].key.keytype == ETYPE_DES_CBC_MD5)
continue;
num_key_data++;
}
}
}
ret = krb5_unparse_name(context, ent->principal, &p);
if (ret) return ret;
sz = append_string(context, sp, "princ\t38\t%u\t%u\t%u\t0\t%s\t%d",
strlen(p), num_tl_data, num_key_data, p,
flags_to_attr(ent->flags));
free(p);
if (sz == -1) return ENOMEM;
if (ent->max_life)
max_life = *ent->max_life;
if (ent->max_renew)
max_renew = *ent->max_renew;
if (ent->valid_end)
exp = *ent->valid_end;
if (ent->pw_end)
pwexp = *ent->pw_end;
sz = append_string(context, sp, "\t%u\t%u\t%u\t%u\t0\t0\t0",
max_life, max_renew, exp, pwexp);
if (sz == -1) return ENOMEM;
/* Dump TL data we know: last pw chg and modified_by */
#define mit_KRB5_TL_LAST_PWD_CHANGE 1
#define mit_KRB5_TL_MOD_PRINC 2
if (last_pw_chg) {
krb5_data d;
time_t val;
unsigned char *ptr;
ptr = (unsigned char *)&last_pw_chg;
val = ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24);
d.data = &val;
d.length = sizeof (last_pw_chg);
sz = append_string(context, sp, "\t%u\t%u\t",
mit_KRB5_TL_LAST_PWD_CHANGE, d.length);
if (sz == -1) return ENOMEM;
sz = append_hex(context, sp, 1, 1, &d);
if (sz == -1) return ENOMEM;
}
if (ent->modified_by) {
krb5_data d;
unsigned int val;
size_t plen;
unsigned char *ptr;
char *modby_p;
ptr = (unsigned char *)&ent->modified_by->time;
val = ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24);
d.data = &val;
d.length = sizeof (ent->modified_by->time);
ret = krb5_unparse_name(context, ent->modified_by->principal, &modby_p);
if (ret) return ret;
plen = strlen(modby_p);
sz = append_string(context, sp, "\t%u\t%u\t",
mit_KRB5_TL_MOD_PRINC,
d.length + plen + 1 /* NULL counted */);
if (sz == -1) return ENOMEM;
sz = append_hex(context, sp, 1, 1, &d);
if (sz == -1) {
free(modby_p);
return ENOMEM;
}
d.data = modby_p;
d.length = plen + 1;
sz = append_hex(context, sp, 1, 1, &d);
free(modby_p);
if (sz == -1) return ENOMEM;
}
/*
* Dump keys (remembering to not include any with kvno higher than
* the entry's because MIT doesn't track entry kvno separately from
* the entry's keys -- max kvno is it)
*/
for (i = 0; i < ent->keys.len; i++) {
if (ent->keys.val[i].key.keytype == ETYPE_DES_CBC_MD4 ||
ent->keys.val[i].key.keytype == ETYPE_DES_CBC_MD5)
continue;
sz = append_mit_key(context, sp, ent->principal, ent->kvno,
&ent->keys.val[i]);
if (sz == -1) return ENOMEM;
}
for (i = 0; hist_keys && i < ent->kvno; i++) {
size_t m;
/* dump historical keys */
for (k = 0; k < hist_keys->len; k++) {
if (hist_keys->val[k].kvno != ent->kvno - i)
continue;
for (m = 0; m < hist_keys->val[k].keys.len; m++) {
if (ent->keys.val[k].key.keytype == ETYPE_DES_CBC_MD4 ||
ent->keys.val[k].key.keytype == ETYPE_DES_CBC_MD5)
continue;
sz = append_mit_key(context, sp, ent->principal,
hist_keys->val[k].kvno,
&hist_keys->val[k].keys.val[m]);
if (sz == -1) return ENOMEM;
}
}
}
sz = append_string(context, sp, "\t-1;"); /* "extra data" */
if (sz == -1) return ENOMEM;
return 0;
}
krb5_error_code
hdb_entry2string(krb5_context context, hdb_entry *ent, char **str)
{
krb5_error_code ret;
krb5_data data;
krb5_storage *sp;
sp = krb5_storage_emem();
if(sp == NULL) {
if (sp == NULL) {
krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM;
}
ret = entry2string_int(context, sp, ent);
if(ret) {
if (ret) {
krb5_storage_free(sp);
return ret;
}
@@ -267,22 +547,31 @@ hdb_entry2string (krb5_context context, hdb_entry *ent, char **str)
/* print a hdb_entry to (FILE*)data; suitable for hdb_foreach */
krb5_error_code
hdb_print_entry(krb5_context context, HDB *db, hdb_entry_ex *entry, void *data)
hdb_print_entry(krb5_context context, HDB *db, hdb_entry_ex *entry,
void *data)
{
struct hdb_print_entry_arg *parg = data;
krb5_error_code ret;
krb5_storage *sp;
FILE *f = data;
fflush(f);
sp = krb5_storage_from_fd(fileno(f));
if(sp == NULL) {
fflush(parg->out);
sp = krb5_storage_from_fd(fileno(parg->out));
if (sp == NULL) {
krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM;
}
ret = entry2string_int(context, sp, &entry->entry);
if(ret) {
switch (parg->fmt) {
case HDB_DUMP_HEIMDAL:
ret = entry2string_int(context, sp, &entry->entry);
break;
case HDB_DUMP_MIT:
ret = entry2mit_string_int(context, sp, &entry->entry);
break;
default:
heim_abort("Only two dump formats supported: Heimdal and MIT");
}
if (ret) {
krb5_storage_free(sp);
return ret;
}