diff --git a/admin/ktutil.c b/admin/ktutil.c index 4c450f054..e777a206b 100644 --- a/admin/ktutil.c +++ b/admin/ktutil.c @@ -72,6 +72,15 @@ kt_list(int argc, char **argv) printf("%s ", p); free(p); printf("\n"); + if (verbose_flag) { + char tstamp[256]; + struct tm *tm; + time_t ts = entry.timestamp; + + tm = gmtime (&ts); + strftime (tstamp, sizeof(tstamp), "%Y-%m-%d %H:%M:%S UTC", tm); + printf(" Timestamp: %s\n", tstamp); + } krb5_kt_free_entry(context, &entry); } ret = krb5_kt_end_seq_get(context, keytab, &cursor); @@ -259,6 +268,7 @@ kt_add(int argc, char **argv) krb5_generate_random_keyblock(context, enctype, &entry.keyblock); } entry.vno = kvno; + entry.timestamp = time (NULL); ret = krb5_kt_add_entry(context, keytab, &entry); if(ret) krb5_warn(context, ret, "add"); @@ -291,7 +301,7 @@ kt_get(int argc, char **argv) "server to contact", "host" }, { "server-port", 's', arg_integer, NULL, - "server to contact", "port number" + "port to contact", "port number" }, { "help", 'h', arg_flag, NULL } }; @@ -380,6 +390,7 @@ kt_get(int argc, char **argv) entry.principal = princ_ent; entry.vno = princ.kvno; entry.keyblock = keys[j]; + entry.timestamp = time (NULL); ret = krb5_kt_add_entry(context, keytab, &entry); krb5_free_keyblock_contents(context, &keys[j]); } @@ -474,22 +485,190 @@ fail: return 0; } +static void +change_entry (krb5_context context, krb5_keytab_entry *entry, + const char *realm, const char *admin_server, int server_port) +{ + krb5_error_code ret; + kadm5_config_params conf; + void *kadm_handle; + char *client_name; + krb5_keyblock *keys; + int num_keys; + int i; + + ret = krb5_unparse_name (context, entry->principal, &client_name); + if (ret) { + krb5_warn (context, ret, "kadm5_c_init_with_skey_ctx"); + return; + } + + memset (&conf, 0, sizeof(conf)); + + if(realm) + conf.realm = (char *)realm; + else + conf.realm = *krb5_princ_realm (context, entry->principal); + conf.mask |= KADM5_CONFIG_REALM; + + if (admin_server) { + conf.admin_server = (char *)admin_server; + conf.mask |= KADM5_CONFIG_ADMIN_SERVER; + } + + if (server_port) { + conf.kadmind_port = htons(server_port); + conf.mask |= KADM5_CONFIG_KADMIND_PORT; + } + + ret = kadm5_init_with_skey_ctx (context, + client_name, + keytab_string, + KADM5_ADMIN_SERVICE, + &conf, 0, 0, + &kadm_handle); + free (client_name); + if (ret) { + krb5_warn (context, ret, "kadm5_c_init_with_skey_ctx"); + return; + } + ret = kadm5_randkey_principal (kadm_handle, entry->principal, + &keys, &num_keys); + kadm5_destroy (kadm_handle); + if (ret) { + krb5_warn(context, ret, "kadm5_randkey_principal"); + return; + } + for (i = 0; i < num_keys; ++i) { + krb5_keytab_entry new_entry; + + new_entry = *entry; + new_entry.timestamp = time (NULL); + ++new_entry.vno; + new_entry.keyblock = keys[i]; + + ret = krb5_kt_add_entry (context, keytab, &new_entry); + if (ret) + krb5_warn (context, ret, "krb5_kt_add_entry"); + krb5_free_keyblock_contents (context, &keys[i]); + } +} + +/* + * loop over all the entries in the keytab (or those given) and change + * their keys, writing the new keys + */ + static int kt_change (int argc, char **argv) { krb5_error_code ret; krb5_kt_cursor cursor; krb5_keytab_entry entry; + char *realm = NULL; + char *admin_server = NULL; + int server_port = 0; + int help_flag = 0; + int optind = 0; + int j, max; + krb5_principal *princs; + + struct getargs args[] = { + { "realm", 'r', arg_string, NULL, + "realm to use", "realm" + }, + { "admin-server", 'a', arg_string, NULL, + "server to contact", "host" + }, + { "server-port", 's', arg_integer, NULL, + "port to contact", "port number" + }, + { "help", 'h', arg_flag, NULL } + }; + + args[0].value = &realm; + args[1].value = &admin_server; + args[2].value = &server_port; + args[3].value = &help_flag; + + if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind) + || help_flag) { + arg_printusage(args, sizeof(args) / sizeof(args[0]), + "ktutil change", "principal..."); + return 0; + } + + j = 0; + max = 10; + princs = malloc (max * sizeof(*princs)); + if (princs == NULL) { + krb5_warnx (context, "malloc: out of memory"); + return 1; + } ret = krb5_kt_start_seq_get(context, keytab, &cursor); if(ret){ krb5_warn(context, ret, "krb5_kt_start_seq_get"); return 1; } - while((ret = krb5_kt_next_entry(context, keytab, &entry, &cursor)) == 0) { + while((ret = krb5_kt_next_entry(context, keytab, &entry, &cursor)) == 0) { + int i; + int done = 0; + + for (i = 0; i < j; ++i) + if (krb5_principal_compare (context, princs[i], + entry.principal)) + break; + if (i < j) + continue; + + if (optind == argc) { + change_entry (context, &entry, realm, admin_server, server_port); + done = 1; + } else { + for (i = optind; i < argc; ++i) { + krb5_principal princ; + + ret = krb5_parse_name (context, argv[i], &princ); + if (ret) { + krb5_warn (context, ret, "krb5_parse_name %s", argv[i]); + continue; + } + if (krb5_principal_compare (context, princ, entry.principal)) { + change_entry (context, &entry, + realm, admin_server, server_port); + done = 1; + } + krb5_free_principal (context, princ); + } + } + if (done) { + if (j >= max) { + void *tmp; + + max *= 2; + tmp = realloc (princs, max * sizeof(*princs)); + if (tmp == NULL) { + krb5_kt_free_entry (context, &entry); + krb5_warnx (context, "realloc: out of memory"); + break; + } + princs = tmp; + } + ret = krb5_copy_principal (context, entry.principal, &princs[j]); + if (ret) { + krb5_warn (context, ret, "krb5_copy_principal"); + krb5_kt_free_entry (context, &entry); + break; + } + ++j; + } krb5_kt_free_entry (context, &entry); } + while (j-- > 0) + krb5_free_principal (context, princs[j]); + free (princs); ret = krb5_kt_end_seq_get(context, keytab, &cursor); return 0; } @@ -497,24 +676,24 @@ kt_change (int argc, char **argv) static int help(int argc, char **argv); static SL_cmd cmds[] = { + { "add", kt_add, "add", + "adds key to keytab" }, + { "change", kt_change, "change [principal...]", + "get new key for principals (all)" }, + { "copy", kt_copy, "copy src dst", + "copy one keytab to another" }, + { "get", kt_get, "get [principal...]", + "create key in database and add to keytab" }, { "list", kt_list, "list", "shows contents of a keytab" }, + { "remove", kt_remove, "remove", + "remove key from keytab" }, { "srvconvert", srvconv, "srvconvert [flags]", "convert v4 srvtab to keytab" }, { "srv2keytab" }, { "srvcreate", srvcreate, "srvcreate [flags]", "convert keytab to v4 srvtab" }, { "key2srvtab" }, - { "add", kt_add, "add", - "adds key to keytab" }, - { "get", kt_get, "get [principal...]", - "create key in database and add to keytab" }, - { "remove", kt_remove, "remove", - "remove key from keytab" }, - { "copy", kt_copy, "copy src dst", - "copy one keytab to another" }, - { "change", kt_change, "change [principal...]", - "get new key for principals (all)" }, { "help", help, "help", "" }, { NULL, NULL, NULL, NULL } };