New program iprop-log that incorperates dump_log as a subcommand,
truncate_log and replay_log soon to come after. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15968 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
@@ -2,10 +2,12 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
SLC = $(top_builddir)/lib/sl/slc
|
||||
|
||||
lib_LTLIBRARIES = libkadm5srv.la libkadm5clnt.la
|
||||
libkadm5srv_la_LDFLAGS = -version-info 7:7:0
|
||||
libkadm5clnt_la_LDFLAGS = -version-info 6:5:2
|
||||
sbin_PROGRAMS = dump_log replay_log truncate_log
|
||||
sbin_PROGRAMS = replay_log truncate_log iprop-log
|
||||
check_PROGRAMS = default_keys
|
||||
noinst_PROGRAMS = test_pw_quality
|
||||
|
||||
@@ -92,7 +94,13 @@ SOURCES_server = \
|
||||
libkadm5srv_la_SOURCES = $(SOURCES_server) server_glue.c
|
||||
libkadm5clnt_la_SOURCES = $(SOURCES_client) client_glue.c
|
||||
|
||||
dump_log_SOURCES = dump_log.c kadm5_locl.h
|
||||
|
||||
iprop-commands.c iprop-commands.h: iprop-commands.in
|
||||
$(SLC) $(srcdir)/iprop-commands.in
|
||||
|
||||
$(iprop_log_SOURCES): iprop-commands.h
|
||||
|
||||
iprop_log_SOURCES = iprop-log.c iprop-commands.c
|
||||
|
||||
replay_log_SOURCES = replay_log.c kadm5_locl.h
|
||||
|
||||
@@ -116,7 +124,22 @@ LDADD = \
|
||||
$(LIB_dlopen) \
|
||||
$(LIB_pidfile)
|
||||
|
||||
CLEANFILES = kadm5_err.c kadm5_err.h
|
||||
iprop_log_LDADD = \
|
||||
libkadm5srv.la \
|
||||
$(top_builddir)/lib/hdb/libhdb.la \
|
||||
$(LIB_openldap) \
|
||||
$(top_builddir)/lib/krb5/libkrb5.la \
|
||||
$(top_builddir)/lib/asn1/libasn1.la \
|
||||
$(LIB_des) \
|
||||
$(top_builddir)/lib/sl/libsl.la \
|
||||
$(LIB_readline) \
|
||||
$(LIB_roken) \
|
||||
$(DBLIB) \
|
||||
$(LIB_dlopen) \
|
||||
$(LIB_pidfile)
|
||||
|
||||
|
||||
CLEANFILES = kadm5_err.c kadm5_err.h iprop-commands.h iprop-commands.c
|
||||
|
||||
$(libkadm5srv_la_OBJECTS): kadm5_err.h
|
||||
|
||||
|
||||
59
lib/kadm5/iprop-commands.in
Normal file
59
lib/kadm5/iprop-commands.in
Normal file
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
* Copyright (c) 2005 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
/* $Id$ */
|
||||
|
||||
command = {
|
||||
name = "dump"
|
||||
option = {
|
||||
long = "config-file"
|
||||
short = "c"
|
||||
type = "string"
|
||||
help = "configuration file"
|
||||
argument = "file"
|
||||
}
|
||||
option = {
|
||||
long = "realm"
|
||||
short = "r"
|
||||
type = "string"
|
||||
help = "realm"
|
||||
}
|
||||
function = "iprop_dump"
|
||||
help = "Prints the iprop transaction log in text."
|
||||
max_args = "0"
|
||||
}
|
||||
command = {
|
||||
name = "help"
|
||||
argument = "command"
|
||||
max_args = "1"
|
||||
function = "help"
|
||||
}
|
||||
363
lib/kadm5/iprop-log.c
Normal file
363
lib/kadm5/iprop-log.c
Normal file
@@ -0,0 +1,363 @@
|
||||
/*
|
||||
* Copyright (c) 1997 - 2005 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "iprop.h"
|
||||
#include <sl.h>
|
||||
#include <parse_time.h>
|
||||
#include "iprop-commands.h"
|
||||
|
||||
RCSID("$Id$");
|
||||
|
||||
static krb5_context context;
|
||||
|
||||
/*
|
||||
* dump log
|
||||
*/
|
||||
|
||||
static const char *op_names[] = {
|
||||
"get",
|
||||
"delete",
|
||||
"create",
|
||||
"rename",
|
||||
"chpass",
|
||||
"modify",
|
||||
"randkey",
|
||||
"get_privs",
|
||||
"get_princs",
|
||||
"chpass_with_key",
|
||||
"nop"
|
||||
};
|
||||
|
||||
static void
|
||||
print_entry(kadm5_server_context *server_context,
|
||||
u_int32_t ver,
|
||||
time_t timestamp,
|
||||
enum kadm_ops op,
|
||||
u_int32_t len,
|
||||
krb5_storage *sp)
|
||||
{
|
||||
char t[256];
|
||||
int32_t mask;
|
||||
hdb_entry ent;
|
||||
krb5_principal source;
|
||||
char *name1, *name2;
|
||||
krb5_data data;
|
||||
krb5_context context = server_context->context;
|
||||
|
||||
off_t end = krb5_storage_seek(sp, 0, SEEK_CUR) + len;
|
||||
|
||||
krb5_error_code ret;
|
||||
|
||||
strftime(t, sizeof(t), "%Y-%m-%d %H:%M:%S", localtime(×tamp));
|
||||
|
||||
if(op < kadm_get || op > kadm_nop) {
|
||||
printf("unknown op: %d\n", op);
|
||||
krb5_storage_seek(sp, end, SEEK_SET);
|
||||
return;
|
||||
}
|
||||
|
||||
printf ("%s: ver = %u, timestamp = %s, len = %u\n",
|
||||
op_names[op], ver, t, len);
|
||||
switch(op) {
|
||||
case kadm_delete:
|
||||
krb5_ret_principal(sp, &source);
|
||||
krb5_unparse_name(context, source, &name1);
|
||||
printf(" %s\n", name1);
|
||||
free(name1);
|
||||
krb5_free_principal(context, source);
|
||||
break;
|
||||
case kadm_rename:
|
||||
ret = krb5_data_alloc(&data, len);
|
||||
if (ret)
|
||||
krb5_err (context, 1, ret, "kadm_rename: data alloc: %d", len);
|
||||
krb5_ret_principal(sp, &source);
|
||||
krb5_storage_read(sp, data.data, data.length);
|
||||
hdb_value2entry(context, &data, &ent);
|
||||
krb5_unparse_name(context, source, &name1);
|
||||
krb5_unparse_name(context, ent.principal, &name2);
|
||||
printf(" %s -> %s\n", name1, name2);
|
||||
free(name1);
|
||||
free(name2);
|
||||
krb5_free_principal(context, source);
|
||||
hdb_free_entry(context, &ent);
|
||||
break;
|
||||
case kadm_create:
|
||||
ret = krb5_data_alloc(&data, len);
|
||||
if (ret)
|
||||
krb5_err (context, 1, ret, "kadm_create: data alloc: %d", len);
|
||||
krb5_storage_read(sp, data.data, data.length);
|
||||
ret = hdb_value2entry(context, &data, &ent);
|
||||
if(ret)
|
||||
abort();
|
||||
mask = ~0;
|
||||
goto foo;
|
||||
case kadm_modify:
|
||||
ret = krb5_data_alloc(&data, len);
|
||||
if (ret)
|
||||
krb5_err (context, 1, ret, "kadm_modify: data alloc: %d", len);
|
||||
krb5_ret_int32(sp, &mask);
|
||||
krb5_storage_read(sp, data.data, data.length);
|
||||
ret = hdb_value2entry(context, &data, &ent);
|
||||
if(ret)
|
||||
abort();
|
||||
foo:
|
||||
if(ent.principal /* mask & KADM5_PRINCIPAL */) {
|
||||
krb5_unparse_name(context, ent.principal, &name1);
|
||||
printf(" principal = %s\n", name1);
|
||||
free(name1);
|
||||
}
|
||||
if(mask & KADM5_PRINC_EXPIRE_TIME) {
|
||||
if(ent.valid_end == NULL) {
|
||||
strlcpy(t, "never", sizeof(t));
|
||||
} else {
|
||||
strftime(t, sizeof(t), "%Y-%m-%d %H:%M:%S",
|
||||
localtime(ent.valid_end));
|
||||
}
|
||||
printf(" expires = %s\n", t);
|
||||
}
|
||||
if(mask & KADM5_PW_EXPIRATION) {
|
||||
if(ent.pw_end == NULL) {
|
||||
strlcpy(t, "never", sizeof(t));
|
||||
} else {
|
||||
strftime(t, sizeof(t), "%Y-%m-%d %H:%M:%S",
|
||||
localtime(ent.pw_end));
|
||||
}
|
||||
printf(" password exp = %s\n", t);
|
||||
}
|
||||
if(mask & KADM5_LAST_PWD_CHANGE) {
|
||||
}
|
||||
if(mask & KADM5_ATTRIBUTES) {
|
||||
unparse_flags(HDBFlags2int(ent.flags),
|
||||
asn1_HDBFlags_units(), t, sizeof(t));
|
||||
printf(" attributes = %s\n", t);
|
||||
}
|
||||
if(mask & KADM5_MAX_LIFE) {
|
||||
if(ent.max_life == NULL)
|
||||
strlcpy(t, "for ever", sizeof(t));
|
||||
else
|
||||
unparse_time(*ent.max_life, t, sizeof(t));
|
||||
printf(" max life = %s\n", t);
|
||||
}
|
||||
if(mask & KADM5_MAX_RLIFE) {
|
||||
if(ent.max_renew == NULL)
|
||||
strlcpy(t, "for ever", sizeof(t));
|
||||
else
|
||||
unparse_time(*ent.max_renew, t, sizeof(t));
|
||||
printf(" max rlife = %s\n", t);
|
||||
}
|
||||
if(mask & KADM5_MOD_TIME) {
|
||||
printf(" mod time\n");
|
||||
}
|
||||
if(mask & KADM5_MOD_NAME) {
|
||||
printf(" mod name\n");
|
||||
}
|
||||
if(mask & KADM5_KVNO) {
|
||||
printf(" kvno = %d\n", ent.kvno);
|
||||
}
|
||||
if(mask & KADM5_MKVNO) {
|
||||
printf(" mkvno\n");
|
||||
}
|
||||
if(mask & KADM5_AUX_ATTRIBUTES) {
|
||||
printf(" aux attributes\n");
|
||||
}
|
||||
if(mask & KADM5_POLICY) {
|
||||
printf(" policy\n");
|
||||
}
|
||||
if(mask & KADM5_POLICY_CLR) {
|
||||
printf(" mod time\n");
|
||||
}
|
||||
if(mask & KADM5_LAST_SUCCESS) {
|
||||
printf(" last success\n");
|
||||
}
|
||||
if(mask & KADM5_LAST_FAILED) {
|
||||
printf(" last failed\n");
|
||||
}
|
||||
if(mask & KADM5_FAIL_AUTH_COUNT) {
|
||||
printf(" fail auth count\n");
|
||||
}
|
||||
if(mask & KADM5_KEY_DATA) {
|
||||
printf(" key data\n");
|
||||
}
|
||||
if(mask & KADM5_TL_DATA) {
|
||||
printf(" tl data\n");
|
||||
}
|
||||
hdb_free_entry(context, &ent);
|
||||
break;
|
||||
case kadm_nop :
|
||||
break;
|
||||
default:
|
||||
abort();
|
||||
}
|
||||
krb5_storage_seek(sp, end, SEEK_SET);
|
||||
}
|
||||
|
||||
int
|
||||
iprop_dump(struct dump_options *opt, int argc, char **argv)
|
||||
{
|
||||
const char *config_file = opt->config_file_string;
|
||||
void *kadm_handle;
|
||||
kadm5_server_context *server_context;
|
||||
kadm5_config_params conf;
|
||||
char **files;
|
||||
krb5_error_code ret;
|
||||
|
||||
if (config_file == NULL)
|
||||
config_file = HDB_DB_DIR "/kdc.conf";
|
||||
|
||||
ret = krb5_prepend_config_files_default(config_file, &files);
|
||||
if (ret)
|
||||
krb5_err(context, 1, ret, "getting configuration files");
|
||||
|
||||
ret = krb5_set_config_files(context, files);
|
||||
krb5_free_config_files(files);
|
||||
if (ret)
|
||||
krb5_err(context, 1, ret, "reading configuration files");
|
||||
|
||||
memset(&conf, 0, sizeof(conf));
|
||||
if(opt->realm_string) {
|
||||
conf.mask |= KADM5_CONFIG_REALM;
|
||||
conf.realm = opt->realm_string;
|
||||
}
|
||||
|
||||
ret = kadm5_init_with_password_ctx (context,
|
||||
KADM5_ADMIN_SERVICE,
|
||||
NULL,
|
||||
KADM5_ADMIN_SERVICE,
|
||||
&conf, 0, 0,
|
||||
&kadm_handle);
|
||||
if (ret)
|
||||
krb5_err (context, 1, ret, "kadm5_init_with_password_ctx");
|
||||
|
||||
server_context = (kadm5_server_context *)kadm_handle;
|
||||
|
||||
ret = kadm5_log_init (server_context);
|
||||
if (ret)
|
||||
krb5_err (context, 1, ret, "kadm5_log_init");
|
||||
|
||||
ret = kadm5_log_foreach (server_context, print_entry);
|
||||
if(ret)
|
||||
krb5_warn(context, ret, "kadm5_log_foreach");
|
||||
|
||||
ret = kadm5_log_end (server_context);
|
||||
if (ret)
|
||||
krb5_warn(context, ret, "kadm5_log_end");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int help_flag;
|
||||
static int version_flag;
|
||||
|
||||
static struct getargs args[] = {
|
||||
{ "version", 0, arg_flag, &version_flag,
|
||||
NULL, NULL
|
||||
},
|
||||
{ "help", 'h', arg_flag, &help_flag,
|
||||
NULL, NULL
|
||||
}
|
||||
};
|
||||
|
||||
static int num_args = sizeof(args) / sizeof(args[0]);
|
||||
|
||||
int
|
||||
help(void *opt, int argc, char **argv)
|
||||
{
|
||||
if(argc == 0) {
|
||||
sl_help(commands, 1, argv - 1 /* XXX */);
|
||||
} else {
|
||||
SL_cmd *c = sl_match (commands, argv[0], 0);
|
||||
if(c == NULL) {
|
||||
fprintf (stderr, "No such command: %s. "
|
||||
"Try \"help\" for a list of commands\n",
|
||||
argv[0]);
|
||||
} else {
|
||||
if(c->func) {
|
||||
char *fake[] = { NULL, "--help", NULL };
|
||||
fake[0] = argv[0];
|
||||
(*c->func)(2, fake);
|
||||
fprintf(stderr, "\n");
|
||||
}
|
||||
if(c->help && *c->help)
|
||||
fprintf (stderr, "%s\n", c->help);
|
||||
if((++c)->name && c->func == NULL) {
|
||||
int f = 0;
|
||||
fprintf (stderr, "Synonyms:");
|
||||
while (c->name && c->func == NULL) {
|
||||
fprintf (stderr, "%s%s", f ? ", " : " ", (c++)->name);
|
||||
f = 1;
|
||||
}
|
||||
fprintf (stderr, "\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
usage(int status)
|
||||
{
|
||||
arg_printusage(args, num_args, NULL, "command");
|
||||
exit(status);
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
int optidx = 0;
|
||||
krb5_error_code ret;
|
||||
|
||||
setprogname(argv[0]);
|
||||
|
||||
if(getarg(args, num_args, argc, argv, &optidx))
|
||||
usage(1);
|
||||
if(help_flag)
|
||||
usage(0);
|
||||
if(version_flag) {
|
||||
print_version(NULL);
|
||||
exit(0);
|
||||
}
|
||||
argc -= optidx;
|
||||
argv += optidx;
|
||||
if(argc == 0)
|
||||
usage(1);
|
||||
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
errx(1, "krb5_init_context failed with: %d\n", ret);
|
||||
|
||||
ret = sl_command(commands, argc, argv);
|
||||
if(ret == -1)
|
||||
warnx ("unrecognized command: %s", argv[0]);
|
||||
return ret;
|
||||
}
|
||||
Reference in New Issue
Block a user