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

checking all parsing for errors and all memory allocations also

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7814 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-01-25 22:59:27 +00:00
parent 2296f66cd1
commit d5c8ae247b
1 changed files with 220 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

268
kadmin/load.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -56,21 +56,29 @@ skip_next(char *p)
while(*p && !isspace((unsigned char)*p)) while(*p && !isspace((unsigned char)*p))
p++; p++;
*p++ = 0; *p++ = 0;
while(*p && isspace((unsigned char)*p)) p++; while(*p && isspace((unsigned char)*p))
p++;
return p; return p;
} }
static time_t* /*
parse_time_string(time_t *t, char *s) * Parse the time in `s', returning:
* -1 if error parsing
* 0 if none present
* 1 if parsed ok
*/
static int
parse_time_string(time_t *t, const char *s)
{ {
int year, month, date, hour, minute, second; int year, month, date, hour, minute, second;
struct tm tm; struct tm tm;
if(strcmp(s, "-") == 0) if(strcmp(s, "-") == 0)
return NULL; return 0;
if(t == NULL) if(sscanf(s, "%04d%02d%02d%02d%02d%02d",
t = malloc(sizeof(*t)); &year, &month, &date, &hour, &minute, &second) != 6)
sscanf(s, "%04d%02d%02d%02d%02d%02d", return -1;
&year, &month, &date, &hour, &minute, &second);
tm.tm_year = year - 1900; tm.tm_year = year - 1900;
tm.tm_mon = month - 1; tm.tm_mon = month - 1;
tm.tm_mday = date; tm.tm_mday = date;
@@ -79,29 +87,77 @@ parse_time_string(time_t *t, char *s)
tm.tm_sec = second; tm.tm_sec = second;
tm.tm_isdst = 0; tm.tm_isdst = 0;
*t = timegm(&tm); *t = timegm(&tm);
return t; return 1;
} }
static unsigned* /*
parse_integer(unsigned *u, char *s) * parse time, allocating space in *t if it's there
*/
static int
parse_time_string_alloc (time_t **t, const char *s)
{
time_t tmp;
int ret;
*t = NULL;
ret = parse_time_string (&tmp, s);
if (ret == 1) {
*t = malloc (sizeof (**t));
if (*t == NULL)
krb5_errx (context, 1, "malloc: out of memory");
**t = tmp;
}
return ret;
}
/*
* see parse_time_string for calling convention
*/
static int
parse_integer(unsigned *u, const char *s)
{ {
if(strcmp(s, "-") == 0) if(strcmp(s, "-") == 0)
return NULL; return 0;
if(u == NULL) if (sscanf(s, "%u", u) != 1)
u = malloc(sizeof(*u)); return -1;
sscanf(s, "%u", u); return 1;
return u;
} }
static void static int
parse_integer_alloc (int **u, const char *s)
{
unsigned tmp;
int ret;
*u = NULL;
ret = parse_integer (&tmp, s);
if (ret == 1) {
*u = malloc (sizeof (**u));
if (*u == NULL)
krb5_errx (context, 1, "malloc: out of memory");
**u = tmp;
}
return ret;
}
/*
* Parse dumped keys in `str' and store them in `ent'
* return -1 if parsing failed
*/
static int
parse_keys(hdb_entry *ent, char *str) parse_keys(hdb_entry *ent, char *str)
{ {
krb5_error_code ret;
int tmp; int tmp;
char *p; char *p;
int i; int i;
p = strsep(&str, ":"); p = strsep(&str, ":");
sscanf(p, "%d", &tmp); if (sscanf(p, "%d", &tmp) != 1)
return 1;
ent->kvno = tmp; ent->kvno = tmp;
p = strsep(&str, ":"); p = strsep(&str, ":");
while(p){ while(p){
@@ -109,7 +165,7 @@ parse_keys(hdb_entry *ent, char *str)
key = realloc(ent->keys.val, key = realloc(ent->keys.val,
(ent->keys.len + 1) * sizeof(*ent->keys.val)); (ent->keys.len + 1) * sizeof(*ent->keys.val));
if(key == NULL) if(key == NULL)
abort(); krb5_errx (context, 1, "realloc: out of memory");
ent->keys.val = key; ent->keys.val = key;
key = ent->keys.val + ent->keys.len; key = ent->keys.val + ent->keys.len;
ent->keys.len++; ent->keys.len++;
@@ -120,37 +176,49 @@ parse_keys(hdb_entry *ent, char *str)
} else } else
key->mkvno = NULL; key->mkvno = NULL;
p = strsep(&str, ":"); p = strsep(&str, ":");
sscanf(p, "%d", &tmp); if (sscanf(p, "%d", &tmp) != 1)
return 1;
key->key.keytype = tmp; key->key.keytype = tmp;
p = strsep(&str, ":"); p = strsep(&str, ":");
krb5_data_alloc(&key->key.keyvalue, (strlen(p) - 1) / 2 + 1); ret = krb5_data_alloc(&key->key.keyvalue, (strlen(p) - 1) / 2 + 1);
if (ret)
krb5_err (context, 1, ret, "krb5_data_alloc");
for(i = 0; i < strlen(p); i += 2) { for(i = 0; i < strlen(p); i += 2) {
sscanf(p + i, "%02x", &tmp); if(sscanf(p + i, "%02x", &tmp) != 1)
return 1;
((u_char*)key->key.keyvalue.data)[i / 2] = tmp; ((u_char*)key->key.keyvalue.data)[i / 2] = tmp;
} }
p = strsep(&str, ":"); p = strsep(&str, ":");
if(strcmp(p, "-") != 0){ if(strcmp(p, "-") != 0){
unsigned type; unsigned type;
size_t p_len; size_t p_len;
if(sscanf(p, "%u/", &type) != 1){
abort (); if(sscanf(p, "%u/", &type) != 1)
} return 1;
p = strchr(p, '/'); p = strchr(p, '/');
if(p == NULL) if(p == NULL)
abort (); return 1;
p++; p++;
p_len = strlen(p); p_len = strlen(p);
key->salt = malloc(sizeof(*key->salt)); key->salt = malloc(sizeof(*key->salt));
if (key->salt == NULL)
krb5_errx (context, 1, "malloc: out of memory");
key->salt->type = type; key->salt->type = type;
if (p_len) { if (p_len) {
if(*p == '\"') { if(*p == '\"') {
krb5_data_copy(&key->salt->salt, p + 1, p_len - 2); ret = krb5_data_copy(&key->salt->salt, p + 1, p_len - 2);
if (ret)
krb5_err (context, 1, ret, "krb5_data_copy");
} else { } else {
krb5_data_alloc(&key->salt->salt, (p_len - 1) / 2 + 1); ret = krb5_data_alloc(&key->salt->salt,
(p_len - 1) / 2 + 1);
if (ret)
krb5_err (context, 1, ret, "krb5_data_alloc");
for(i = 0; i < p_len; i += 2){ for(i = 0; i < p_len; i += 2){
sscanf(p + i, "%02x", &tmp); if (sscanf(p + i, "%02x", &tmp) != 1)
return 1;
((u_char*)key->salt->salt.data)[i / 2] = tmp; ((u_char*)key->salt->salt.data)[i / 2] = tmp;
} }
} }
@@ -159,31 +227,59 @@ parse_keys(hdb_entry *ent, char *str)
} }
p = strsep(&str, ":"); p = strsep(&str, ":");
} }
return 0;
} }
static Event* /*
parse_event(Event *ev, char *str) * see parse_time_string for calling convention
*/
static int
parse_event(Event *ev, char *s)
{ {
krb5_error_code ret;
char *p; char *p;
if(strcmp(str, "-") == 0)
return NULL; if(strcmp(s, "-") == 0)
if(ev == NULL) return 0;
ev = malloc(sizeof(*ev));
memset(ev, 0, sizeof(*ev)); memset(ev, 0, sizeof(*ev));
p = strsep(&str, ":"); p = strsep(&s, ":");
parse_time_string(&ev->time, p); if(parse_time_string(&ev->time, p) != 1)
p = strsep(&str, ":"); return -1;
krb5_parse_name(context, p, &ev->principal); p = strsep(&s, ":");
return ev; ret = krb5_parse_name(context, p, &ev->principal);
if (ret)
return -1;
return 1;
} }
static HDBFlags static int
parse_hdbflags2int(char *str) parse_event_alloc (Event **ev, char *s)
{ {
unsigned i; Event tmp;
parse_integer(&i, str); int ret;
return int2HDBFlags(i); *ev = NULL;
ret = parse_event (&tmp, s);
if (ret == 1) {
*ev = malloc (sizeof (**ev));
if (*ev == NULL)
krb5_errx (context, 1, "malloc: out of memory");
**ev = tmp;
}
return ret;
}
static int
parse_hdbflags2int(HDBFlags *f, const char *s)
{
int ret;
unsigned tmp;
ret = parse_integer (&tmp, s);
if (ret == 1)
*f = int2HDBFlags (tmp);
return ret;
} }
#if 0 #if 0
@@ -205,8 +301,13 @@ parse_etypes(char *str, unsigned **val, unsigned *len)
} }
#endif #endif
static void /*
doit(char *filename, int merge) * Parse the dump file in `filename' and create the database (merging
* iff merge)
*/
static int
doit(const char *filename, int merge)
{ {
krb5_error_code ret; krb5_error_code ret;
FILE *f; FILE *f;
@@ -221,7 +322,7 @@ doit(char *filename, int merge)
f = fopen(filename, "r"); f = fopen(filename, "r");
if(f == NULL){ if(f == NULL){
krb5_warn(context, errno, "fopen(%s)", filename); krb5_warn(context, errno, "fopen(%s)", filename);
return; return 1;
} }
if(!merge) if(!merge)
flags |= O_CREAT | O_TRUNC; flags |= O_CREAT | O_TRUNC;
@@ -229,7 +330,7 @@ doit(char *filename, int merge)
if(ret){ if(ret){
krb5_warn(context, ret, "hdb_open"); krb5_warn(context, ret, "hdb_open");
fclose(f); fclose(f);
return; return 1;
} }
line = 0; line = 0;
while(fgets(s, sizeof(s), f)){ while(fgets(s, sizeof(s), f)){
@@ -286,16 +387,64 @@ doit(char *filename, int merge)
continue; continue;
} }
parse_keys(&ent, e.key); if (parse_keys(&ent, e.key)) {
fprintf (stderr, "%s:%d:error parsing keys (%s)\n",
filename, line, e.key);
hdb_free_entry (context, &ent);
continue;
}
parse_event(&ent.created_by, e.created); if (parse_event(&ent.created_by, e.created) == -1) {
ent.modified_by = parse_event(NULL, e.modified); fprintf (stderr, "%s:%d:error parsing created event (%s)\n",
ent.valid_start = parse_time_string(NULL, e.valid_start); filename, line, e.created);
ent.valid_end = parse_time_string(NULL, e.valid_end); hdb_free_entry (context, &ent);
ent.pw_end = parse_time_string(NULL, e.pw_end); continue;
ent.max_life = parse_integer(NULL, e.max_life); }
ent.max_renew = parse_integer(NULL, e.max_renew); if (parse_event_alloc (&ent.modified_by, e.modified) == -1) {
ent.flags = parse_hdbflags2int(e.flags); fprintf (stderr, "%s:%d:error parsing event (%s)\n",
filename, line, e.modified);
hdb_free_entry (context, &ent);
continue;
}
if (parse_time_string_alloc (&ent.valid_start, e.valid_start) == -1) {
fprintf (stderr, "%s:%d:error parsing time (%s)\n",
filename, line, e.valid_start);
hdb_free_entry (context, &ent);
continue;
}
if (parse_time_string_alloc (&ent.valid_end, e.valid_end) == -1) {
fprintf (stderr, "%s:%d:error parsing time (%s)\n",
filename, line, e.valid_end);
hdb_free_entry (context, &ent);
continue;
}
if (parse_time_string_alloc (&ent.pw_end, e.pw_end) == -1) {
fprintf (stderr, "%s:%d:error parsing time (%s)\n",
filename, line, e.pw_end);
hdb_free_entry (context, &ent);
continue;
}
if (parse_integer_alloc (&ent.max_life, e.max_life) == -1) {
fprintf (stderr, "%s:%d:error parsing lifetime (%s)\n",
filename, line, e.max_life);
hdb_free_entry (context, &ent);
continue;
}
if (parse_integer_alloc (&ent.max_renew, e.max_renew) == -1) {
fprintf (stderr, "%s:%d:error parsing lifetime (%s)\n",
filename, line, e.max_renew);
hdb_free_entry (context, &ent);
continue;
}
if (parse_hdbflags2int (&ent.flags, e.flags) != 0) {
fprintf (stderr, "%s:%d:error parsing flags (%s)\n",
filename, line, e.flags);
hdb_free_entry (context, &ent);
continue;
}
#if 0 #if 0
ALLOC(ent.etypes); ALLOC(ent.etypes);
parse_etypes(e.etypes, &ent.etypes->val, &ent.etypes->len); parse_etypes(e.etypes, &ent.etypes->val, &ent.etypes->len);
@@ -310,6 +459,7 @@ doit(char *filename, int merge)
} }
db->close(context, db); db->close(context, db);
fclose(f); fclose(f);
return 0;
} }
int int