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

check that the ticket came from a valid address; use the address of

Browse Source 
the connection as the address to put in the v4 ticket (if this address
is AF_INET)


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5794 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-03-29 18:31:28 +00:00
parent 0fdb89382d
commit 813c454364
1 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
kdc/524.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997-1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -43,7 +43,7 @@ RCSID("$Id$");
#ifdef KRB4
krb5_error_code
do_524(Ticket *t, krb5_data *reply, const char *from)
do_524(Ticket *t, krb5_data *reply, const char *from, struct sockaddr_in *addr)
{
krb5_error_code ret = 0;
krb5_principal sprinc = NULL;
@@ -112,9 +112,38 @@ do_524(Ticket *t, krb5_data *reply, const char *from)
ret = KRB5KRB_AP_ERR_TKT_NYV;
goto out;
}
{
krb5_addresses *save_caddr, new_addr;
krb5_address v4_addr;
ret = encode_v4_ticket(buf + sizeof(buf) - 1, sizeof(buf),
&et, &t->sname, &len);
ret = krb5_sockaddr2address((struct sockaddr*)addr, &v4_addr);
if(ret) {
kdc_log(0, "Failed to convert address (%s)", spn);
free_EncTicketPart(&et);
goto out;
}
if (et.caddr && !krb5_address_search (context, &v4_addr, et.caddr)) {
kdc_log(0, "Incorrect network address (%s)", spn);
free_EncTicketPart(&et);
krb5_free_address(context, &v4_addr);
ret = KRB5KRB_AP_ERR_BADADDR;
goto out;
}
if(v4_addr.addr_type == KRB5_ADDRESS_INET) {
/* we need to collapse the addresses in the ticket to a
single address; best guess is to use the address the
connection came from */
save_caddr = et.caddr;
new_addr.len = 1;
new_addr.val = &v4_addr;
et.caddr = &new_addr;
}
ret = encode_v4_ticket(buf + sizeof(buf) - 1, sizeof(buf),
&et, &t->sname, &len);
if(v4_addr.addr_type == KRB5_ADDRESS_INET)
et.caddr = save_caddr;
}
free_EncTicketPart(&et);
if(ret){
kdc_log(0, "Failed to encode v4 ticket (%s)", spn);