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

add support for --random-password

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6853 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-08-21 12:38:58 +00:00
parent 4e8d3b3ab8
commit c22bb92415
2 changed files with 139 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
kadmin/ank.c
View File

@@ -70,7 +70,8 @@ get_default (kadm5_server_context *context,
static krb5_error_code
add_one_principal (const char *name,
int random_key,
int rand_key,
int rand_password,
char *password,
const char *max_ticket_life,
const char *max_renewable_life,
@@ -112,12 +113,15 @@ add_one_principal (const char *name,
}
edit_entry(&princ, &mask, default_ent, default_mask);
if(random_key) {
if(rand_key) {
princ.attributes |= KRB5_KDB_DISALLOW_ALL_TIX;
mask |= KADM5_ATTRIBUTES;
password = "hemlig";
}
if(password == NULL) {
strcpy_truncate (pwbuf, "hemlig", sizeof(pwbuf));
password = pwbuf;
} else if (rand_password) {
random_password (pwbuf, sizeof(pwbuf));
password = pwbuf;
} else if(password == NULL) {
char *princ_name;
char *prompt;
@@ -134,7 +138,7 @@ add_one_principal (const char *name,
ret = kadm5_create_principal(kadm_handle, &princ, mask, password);
if(ret)
krb5_warn(context, ret, "kadm5_create_principal");
if(random_key) {
if(rand_key) {
krb5_keyblock *new_keys;
int n_keys, i;
ret = kadm5_randkey_principal(kadm_handle, princ_ent,
@@ -153,14 +157,19 @@ add_one_principal (const char *name,
kadm5_modify_principal(kadm_handle, &princ,
KADM5_ATTRIBUTES | KADM5_KVNO);
kadm5_free_principal_ent(kadm_handle, &princ);
} else if (rand_password) {
char *princ_name;
krb5_unparse_name(context, princ_ent, &princ_name);
printf ("added %s with password `%s'\n", princ_name, password);
free (princ_name);
}
out:
if (princ_ent)
krb5_free_principal (context, princ_ent);
if(default_ent)
kadm5_free_principal_ent (context, default_ent);
if (!random_key && password)
memset (password, 0, strlen(password));
memset (password, 0, strlen(password));
return ret;
}
@@ -170,6 +179,7 @@ out:
static struct getargs args[] = {
{ "random-key", 'r', arg_flag, NULL, "set random key" },
{ "random-password", 0, arg_flag, NULL, "set random password" },
{ "password", 'p', arg_string, NULL, "princial's password" },
{ "max-ticket-life", 0, arg_string, NULL, "max ticket lifetime",
"lifetime"},
@@ -199,7 +209,8 @@ int
add_new_key(int argc, char **argv)
{
char *password = NULL;
int rkey = 0;
int random_key = 0;
int random_password = 0;
int optind = 0;
krb5_error_code ret;
char *max_ticket_life = NULL;
@@ -208,14 +219,16 @@ add_new_key(int argc, char **argv)
char *expiration = NULL;
char *pw_expiration = NULL;
int i;
int num;
args[0].value = &rkey;
args[1].value = &password;
args[2].value = &max_ticket_life;
args[3].value = &max_renewable_life;
args[4].value = &attributes;
args[5].value = &expiration;
args[6].value = &pw_expiration;
args[0].value = &random_key;
args[1].value = &random_password;
args[2].value = &password;
args[3].value = &max_ticket_life;
args[4].value = &max_renewable_life;
args[5].value = &attributes;
args[6].value = &expiration;
args[7].value = &pw_expiration;
if(getarg(args, num_args, argc, argv, &optind)) {
usage ();
@@ -226,8 +239,23 @@ add_new_key(int argc, char **argv)
return 0;
}
num = 0;
if (random_key)
++num;
if (random_password)
++num;
if (password)
++num;
if (num > 1) {
printf ("give only one of "
"--random-key, --random-password, --password\n");
return 0;
}
for (i = optind; i < argc; ++i) {
ret = add_one_principal (argv[i], rkey, password,
ret = add_one_principal (argv[i], random_key, random_password,
password,
max_ticket_life,
max_renewable_life,
attributes,

132
kadmin/cpw.c
View File

@@ -41,12 +41,14 @@
RCSID("$Id$");
struct cpw_entry_data {
int random;
int random_key;
int random_password;
char *password;
};
static struct getargs args[] = {
{ "random-key", 'r', arg_flag, NULL, "set random key" },
{ "random-password", 0, arg_flag, NULL, "set random password" },
{ "password", 'p', arg_string, NULL, "princial's password" },
};
@@ -58,44 +60,80 @@ usage(void)
arg_printusage(args, num_args, "cpw", "principal...");
}
static int
set_random_key (krb5_principal principal)
{
krb5_error_code ret;
int i;
krb5_keyblock *keys;
int num_keys;
ret = kadm5_randkey_principal(kadm_handle, principal, &keys, &num_keys);
if(ret)
return ret;
for(i = 0; i < num_keys; i++)
krb5_free_keyblock_contents(context, &keys[i]);
free(keys);
return 0;
}
static int
set_random_password (krb5_principal principal)
{
krb5_error_code ret;
char pw[128];
random_password (pw, sizeof(pw));
ret = kadm5_chpass_principal(kadm_handle, principal, pw);
if (ret == 0) {
char *princ_name;
krb5_unparse_name(context, principal, &princ_name);
printf ("%s's password set to `%s'\n", princ_name, pw);
free (princ_name);
}
memset (pw, 0, sizeof(pw));
return ret;
}
static int
set_password (krb5_principal principal, char *password)
{
krb5_error_code ret = 0;
char *pw, pwbuf[128];
if(pw == NULL) {
char *princ_name;
char *prompt;
krb5_unparse_name(context, principal, &princ_name);
asprintf(&prompt, "%s's Password: ", princ_name);
free (princ_name);
ret = des_read_pw_string(pwbuf, sizeof(pwbuf), prompt, 1);
free (prompt);
if(ret){
return 0; /* XXX error code? */
}
pw = pwbuf;
}
if(ret == 0)
ret = kadm5_chpass_principal(kadm_handle, principal, pw);
memset(pwbuf, 0, sizeof(pwbuf));
return ret;
}
static int
do_cpw_entry(krb5_principal principal, void *data)
{
char *pw, pwbuf[128];
struct cpw_entry_data *e = data;
krb5_error_code ret = 0;
pw = e->password;
if(e->random == 0){
if(pw == NULL){
char *princ_name;
char *prompt;
krb5_unparse_name(context, principal, &princ_name);
asprintf(&prompt, "%s's Password: ", princ_name);
free (princ_name);
ret = des_read_pw_string(pwbuf, sizeof(pwbuf), prompt, 1);
free (prompt);
if(ret){
return 0; /* XXX error code? */
}
pw = pwbuf;
}
if(ret == 0)
ret = kadm5_chpass_principal(kadm_handle, principal, pw);
memset(pwbuf, 0, sizeof(pwbuf));
}else{
int i;
krb5_keyblock *keys;
int num_keys;
ret = kadm5_randkey_principal(kadm_handle, principal, &keys, &num_keys);
if(ret)
return ret;
for(i = 0; i < num_keys; i++)
krb5_free_keyblock_contents(context, &keys[i]);
free(keys);
}
return ret;
if (e->random_key)
return set_random_key (principal);
else if (e->random_password)
return set_random_password (principal);
else
return set_password (principal, e->password);
}
int
@@ -105,16 +143,34 @@ cpw_entry(int argc, char **argv)
int i;
int optind = 0;
struct cpw_entry_data data;
int num;
data.random = 0;
data.password = NULL;
data.random_key = 0;
data.random_password = 0;
data.password = NULL;
args[0].value = &data.random;
args[1].value = &data.password;
args[0].value = &data.random_key;
args[1].value = &data.random_password;
args[2].value = &data.password;
if(getarg(args, num_args, argc, argv, &optind)){
usage();
return 0;
}
num = 0;
if (data.random_key)
++num;
if (data.random_password)
++num;
if (data.password)
++num;
if (num > 1) {
printf ("give only one of "
"--random-key, --random-password, --password\n");
return 0;
}
argc -= optind;
argv += optind;