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

Merge in the libkdc/kdc configuration split from Andrew Bartlet <abartlet@samba.org>

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15529 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-06-30 01:03:35 +00:00
parent 3fe2a9b92f
commit 7132a9b084
18 changed files with 1204 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
kdc/524.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997-2003 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997-2005 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -43,7 +43,9 @@ RCSID("$Id$");
*/
static krb5_error_code
fetch_server (const Ticket *t,
fetch_server (krb5_context context,
struct krb5_kdc_configuration *config,
const Ticket *t,
char **spn,
hdb_entry **server,
const char *from)
@@ -53,20 +55,21 @@ fetch_server (const Ticket *t,
ret = _krb5_principalname2krb5_principal(&sprinc, t->sname, t->realm);
if (ret) {
kdc_log(0, "_krb5_principalname2krb5_principal: %s",
kdc_log(context, config, 0, "_krb5_principalname2krb5_principal: %s",
krb5_get_err_text(context, ret));
return ret;
}
ret = krb5_unparse_name(context, sprinc, spn);
if (ret) {
krb5_free_principal(context, sprinc);
kdc_log(0, "krb5_unparse_name: %s", krb5_get_err_text(context, ret));
kdc_log(context, config, 0, "krb5_unparse_name: %s",
krb5_get_err_text(context, ret));
return ret;
}
ret = db_fetch(sprinc, server);
ret = db_fetch(context, config, sprinc, server);
krb5_free_principal(context, sprinc);
if (ret) {
kdc_log(0,
kdc_log(context, config, 0,
"Request to convert ticket from %s for unknown principal %s: %s",
from, *spn, krb5_get_err_text(context, ret));
if (ret == HDB_ERR_NOENTRY)
@@ -77,7 +80,9 @@ fetch_server (const Ticket *t,
}
static krb5_error_code
log_524 (const EncTicketPart *et,
log_524 (krb5_context context,
struct krb5_kdc_configuration *config,
const EncTicketPart *et,
const char *from,
const char *spn)
{
@@ -87,33 +92,35 @@ log_524 (const EncTicketPart *et,
ret = _krb5_principalname2krb5_principal(&client, et->cname, et->crealm);
if (ret) {
kdc_log(0, "_krb5_principalname2krb5_principal: %s",
kdc_log(context, config, 0, "_krb5_principalname2krb5_principal: %s",
krb5_get_err_text (context, ret));
return ret;
}
ret = krb5_unparse_name(context, client, &cpn);
if (ret) {
krb5_free_principal(context, client);
kdc_log(0, "krb5_unparse_name: %s",
kdc_log(context, config, 0, "krb5_unparse_name: %s",
krb5_get_err_text (context, ret));
return ret;
}
kdc_log(1, "524-REQ %s from %s for %s", cpn, from, spn);
kdc_log(context, config, 1, "524-REQ %s from %s for %s", cpn, from, spn);
free(cpn);
krb5_free_principal(context, client);
return 0;
}
static krb5_error_code
verify_flags (const EncTicketPart *et,
verify_flags (krb5_context context,
struct krb5_kdc_configuration *config,
const EncTicketPart *et,
const char *spn)
{
if(et->endtime < kdc_time){
kdc_log(0, "Ticket expired (%s)", spn);
kdc_log(context, config, 0, "Ticket expired (%s)", spn);
return KRB5KRB_AP_ERR_TKT_EXPIRED;
}
if(et->flags.invalid){
kdc_log(0, "Ticket not valid (%s)", spn);
kdc_log(context, config, 0, "Ticket not valid (%s)", spn);
return KRB5KRB_AP_ERR_TKT_NYV;
}
return 0;
@@ -125,7 +132,9 @@ verify_flags (const EncTicketPart *et,
*/
static krb5_error_code
set_address (EncTicketPart *et,
set_address (krb5_context context,
struct krb5_kdc_configuration *config,
EncTicketPart *et,
struct sockaddr *addr,
const char *from)
{
@@ -139,12 +148,12 @@ set_address (EncTicketPart *et,
ret = krb5_sockaddr2address(context, addr, v4_addr);
if(ret) {
free (v4_addr);
kdc_log(0, "Failed to convert address (%s)", from);
kdc_log(context, config, 0, "Failed to convert address (%s)", from);
return ret;
}
if (et->caddr && !krb5_address_search (context, v4_addr, et->caddr)) {
kdc_log(0, "Incorrect network address (%s)", from);
kdc_log(context, config, 0, "Incorrect network address (%s)", from);
krb5_free_address(context, v4_addr);
free (v4_addr);
return KRB5KRB_AP_ERR_BADADDR;
@@ -175,7 +184,9 @@ set_address (EncTicketPart *et,
static krb5_error_code
encrypt_v4_ticket(void *buf,
encrypt_v4_ticket(krb5_context context,
struct krb5_kdc_configuration *config,
void *buf,
size_t len,
krb5_keyblock *skey,
EncryptedData *reply)
@@ -185,7 +196,7 @@ encrypt_v4_ticket(void *buf,
ret = krb5_crypto_init(context, skey, ETYPE_DES_PCBC_NONE, &crypto);
if (ret) {
free(buf);
kdc_log(0, "krb5_crypto_init failed: %s",
kdc_log(context, config, 0, "krb5_crypto_init failed: %s",
krb5_get_err_text(context, ret));
return ret;
}
@@ -199,7 +210,7 @@ encrypt_v4_ticket(void *buf,
reply);
krb5_crypto_destroy(context, crypto);
if(ret) {
kdc_log(0, "Failed to encrypt data: %s",
kdc_log(context, config, 0, "Failed to encrypt data: %s",
krb5_get_err_text(context, ret));
return ret;
}
@@ -207,7 +218,9 @@ encrypt_v4_ticket(void *buf,
}
static krb5_error_code
encode_524_response(const char *spn, const EncTicketPart et, const Ticket *t,
encode_524_response(krb5_context context,
struct krb5_kdc_configuration *config,
const char *spn, const EncTicketPart et, const Ticket *t,
hdb_entry *server, EncryptedData *ticket, int *kvno)
{
krb5_error_code ret;
@@ -221,7 +234,8 @@ encode_524_response(const char *spn, const EncTicketPart et, const Ticket *t,
&t->enc_part, &len, ret);
if (ret) {
kdc_log(0, "Failed to encode v4 (2b) ticket (%s)", spn);
kdc_log(context, config, 0,
"Failed to encode v4 (2b) ticket (%s)", spn);
return ret;
}
@@ -232,27 +246,31 @@ encode_524_response(const char *spn, const EncTicketPart et, const Ticket *t,
unsigned char buf[MAX_KTXT_LEN + 4 * 4];
Key *skey;
if (!enable_v4_cross_realm && strcmp (et.crealm, t->realm) != 0) {
kdc_log(0, "524 cross-realm %s -> %s disabled", et.crealm,
if (!config->enable_v4_cross_realm && strcmp (et.crealm, t->realm) != 0) {
kdc_log(context, config, 0, "524 cross-realm %s -> %s disabled", et.crealm,
t->realm);
return KRB5KDC_ERR_POLICY;
}
ret = encode_v4_ticket(buf + sizeof(buf) - 1, sizeof(buf),
ret = encode_v4_ticket(context, config,
buf + sizeof(buf) - 1, sizeof(buf),
&et, &t->sname, &len);
if(ret){
kdc_log(0, "Failed to encode v4 ticket (%s)", spn);
kdc_log(context, config, 0,
"Failed to encode v4 ticket (%s)", spn);
return ret;
}
ret = get_des_key(server, TRUE, FALSE, &skey);
ret = get_des_key(context, server, TRUE, FALSE, &skey);
if(ret){
kdc_log(0, "no suitable DES key for server (%s)", spn);
kdc_log(context, config, 0,
"no suitable DES key for server (%s)", spn);
return ret;
}
ret = encrypt_v4_ticket(buf + sizeof(buf) - len, len,
ret = encrypt_v4_ticket(context, config, buf + sizeof(buf) - len, len,
&skey->key, ticket);
if(ret){
kdc_log(0, "Failed to encrypt v4 ticket (%s)", spn);
kdc_log(context, config, 0,
"Failed to encrypt v4 ticket (%s)", spn);
return ret;
}
*kvno = server->kvno;
@@ -267,7 +285,9 @@ encode_524_response(const char *spn, const EncTicketPart et, const Ticket *t,
*/
krb5_error_code
do_524(const Ticket *t, krb5_data *reply,
do_524(krb5_context context,
struct krb5_kdc_configuration *config,
const Ticket *t, krb5_data *reply,
const char *from, struct sockaddr *addr)
{
krb5_error_code ret = 0;
@@ -283,25 +303,27 @@ do_524(const Ticket *t, krb5_data *reply,
size_t len;
int kvno = 0;
if(!enable_524) {
if(!config->enable_524) {
ret = KRB5KDC_ERR_POLICY;
kdc_log(0, "Rejected ticket conversion request from %s", from);
kdc_log(context, config, 0,
"Rejected ticket conversion request from %s", from);
goto out;
}
ret = fetch_server (t, &spn, &server, from);
ret = fetch_server (context, config, t, &spn, &server, from);
if (ret) {
goto out;
}
ret = hdb_enctype2key(context, server, t->enc_part.etype, &skey);
if(ret){
kdc_log(0, "No suitable key found for server (%s) from %s", spn, from);
kdc_log(context, config, 0,
"No suitable key found for server (%s) from %s", spn, from);
goto out;
}
ret = krb5_crypto_init(context, &skey->key, 0, &crypto);
if (ret) {
kdc_log(0, "krb5_crypto_init failed: %s",
kdc_log(context, config, 0, "krb5_crypto_init failed: %s",
krb5_get_err_text(context, ret));
goto out;
}
@@ -312,36 +334,39 @@ do_524(const Ticket *t, krb5_data *reply,
&et_data);
krb5_crypto_destroy(context, crypto);
if(ret){
kdc_log(0, "Failed to decrypt ticket from %s for %s", from, spn);
kdc_log(context, config, 0,
"Failed to decrypt ticket from %s for %s", from, spn);
goto out;
}
ret = krb5_decode_EncTicketPart(context, et_data.data, et_data.length,
&et, &len);
krb5_data_free(&et_data);
if(ret){
kdc_log(0, "Failed to decode ticket from %s for %s", from, spn);
kdc_log(context, config, 0,
"Failed to decode ticket from %s for %s", from, spn);
goto out;
}
ret = log_524 (&et, from, spn);
ret = log_524 (context, config, &et, from, spn);
if (ret) {
free_EncTicketPart(&et);
goto out;
}
ret = verify_flags (&et, spn);
ret = verify_flags (context, config, &et, spn);
if (ret) {
free_EncTicketPart(&et);
goto out;
}
ret = set_address (&et, addr, from);
ret = set_address (context, config, &et, addr, from);
if (ret) {
free_EncTicketPart(&et);
goto out;
}
ret = encode_524_response(spn, et, t, server, &ticket, &kvno);
ret = encode_524_response(context, config, spn, et, t,
server, &ticket, &kvno);
free_EncTicketPart(&et);
out:
@@ -364,6 +389,6 @@ out:
if(spn)
free(spn);
if(server)
free_ent (server);
free_ent (context, server);
return ret;
}