r11543: A major upgrade to our KDC and PAC handling.

We now put the PAC in the AS-REP, so that the client has it in the
TGT.  We then validate it (and re-sign it) on a TGS-REQ, ie when the
client wants a ticket.

This should also allow us to interop with windows KDCs.

If we get an invalid PAC at the TGS stage, we just drop it.

I'm slowly trying to move the application logic out of hdb-ldb.c, and
back in with the rest of Samba's auth system, for consistancy.  This
continues that trend.

Andrew Bartlett
(This used to be commit 36973b1eef7db5983cce76ba241e54d5f925c69c)

5 files changed, 80 insertions, 76 deletions

diff --git a/source4/heimdal/kdc/kerberos5.c b/source4/heimdal/kdc/kerberos5.c
index 0df090eef3..a1a607329a 100644
--- a/source4/heimdal/kdc/kerberos5.c
+++ b/source4/heimdal/kdc/kerberos5.c
@@ -32,9 +32,6 @@
  */
 
 #include "kdc_locl.h"
-#ifdef _SAMBA_BUILD_
-#include "kdc/pac-glue.h"
-#endif
 
 RCSID("$Id: kerberos5.c,v 1.177 2005/06/15 11:34:53 lha Exp $");
 
@@ -1355,6 +1352,18 @@ _kdc_as_rep(krb5_context context,
 	rep.padata = NULL;
     }
 
+    /* Add the PAC, via a HDB abstraction */
+    if (client->authz_data_as_req) {
+	    ret = client->authz_data_as_req(context, client, 
+					    req->padata, 
+					    et.authtime,
+					    &skey->key,
+					    &et.key,
+					    &et.authorization_data);
+	    if (ret) 
+		    goto out;
+    }
+
     log_timestamp(context, config, "AS-REQ", et.authtime, et.starttime, 
 		  et.endtime, et.renew_till);
 
@@ -1640,7 +1649,7 @@ tgs_make_reply(krb5_context context,
 	       EncTicketPart *adtkt, 
 	       AuthorizationData *auth_data,
 	       krb5_ticket *tgs_ticket,
-	       hdb_entry *server, 
+	       hdb_entry_ex *server, 
 	       hdb_entry *client, 
 	       krb5_principal client_principal, 
 	       hdb_entry *krbtgt,
@@ -1657,6 +1666,7 @@ tgs_make_reply(krb5_context context,
     krb5_enctype etype;
     Key *skey;
     EncryptionKey *ekey;
+    AuthorizationData *new_auth_data = NULL;
     
     if(adtkt) {
 	int i;
@@ -1674,7 +1684,7 @@ tgs_make_reply(krb5_context context,
 	etype = b->etype.val[i];
     }else{
 	ret = find_keys(context, config, 
-			NULL, server, NULL, NULL, &skey, &etype, 
+			NULL, &server->entry, NULL, NULL, &skey, &etype, 
 			b->etype.val, b->etype.len);
 	if(ret) {
 	    kdc_log(context, config, 0, "Server has no support for etypes");
@@ -1728,14 +1738,14 @@ tgs_make_reply(krb5_context context,
 				   GLOBAL_ALLOW_DISABLE_TRANSITED_CHECK),
 				 &tgt->transited, &et,
 				 *krb5_princ_realm(context, client_principal),
-				 *krb5_princ_realm(context, server->principal),
+				 *krb5_princ_realm(context, server->entry.principal),
 				 *krb5_princ_realm(context, krbtgt->principal));
     if(ret)
 	goto out;
 
-    copy_Realm(krb5_princ_realm(context, server->principal), 
+    copy_Realm(krb5_princ_realm(context, server->entry.principal), 
 	       &rep.ticket.realm);
-    _krb5_principal2principalname(&rep.ticket.sname, server->principal);
+    _krb5_principal2principalname(&rep.ticket.sname, server->entry.principal);
     copy_Realm(&tgt->crealm, &rep.crealm);
     if (f.request_anonymous)
 	make_anonymous_principalname (&tgt->cname);
@@ -1752,8 +1762,8 @@ tgs_make_reply(krb5_context context,
 	life = et.endtime - *et.starttime;
 	if(client && client->max_life)
 	    life = min(life, *client->max_life);
-	if(server->max_life)
-	    life = min(life, *server->max_life);
+	if(server->entry.max_life)
+	    life = min(life, *server->entry.max_life);
 	et.endtime = *et.starttime + life;
     }
     if(f.renewable_ok && tgt->flags.renewable && 
@@ -1767,8 +1777,8 @@ tgs_make_reply(krb5_context context,
 	renew = *et.renew_till - et.authtime;
 	if(client && client->max_renew)
 	    renew = min(renew, *client->max_renew);
-	if(server->max_renew)
-	    renew = min(renew, *server->max_renew);
+	if(server->entry.max_renew)
+	    renew = min(renew, *server->entry.max_renew);
 	*et.renew_till = et.authtime + renew;
     }
 	    
@@ -1793,61 +1803,28 @@ tgs_make_reply(krb5_context context,
     et.flags.pre_authent = tgt->flags.pre_authent;
     et.flags.hw_authent  = tgt->flags.hw_authent;
     et.flags.anonymous   = tgt->flags.anonymous;
-    et.flags.ok_as_delegate = server->flags.ok_as_delegate;
+    et.flags.ok_as_delegate = server->entry.flags.ok_as_delegate;
 	    
-#ifdef _SAMBA_BUILD_
- 
-    {
-
-	    unsigned char *buf;
-	    size_t buf_size;
-	    size_t len;
-
-	    krb5_data pac;
-	    AD_IF_RELEVANT *if_relevant;
-	    ALLOC(if_relevant);
-	    if_relevant->len = 1;
-	    if_relevant->val = malloc(sizeof(*if_relevant->val));
-	    if_relevant->val[0].ad_type = KRB5_AUTHDATA_WIN2K_PAC;
-	    if_relevant->val[0].ad_data.data = NULL;
-	    if_relevant->val[0].ad_data.length = 0;
-
-	    /* Get PAC from Samba */
-	    ret = samba_get_pac(context, config, 
-				client->principal,
-				tgtkey,
-				ekey,
-				tgs_ticket->ticket.authtime,
-				&pac);
-	    if (ret) {
-		    free_AuthorizationData(if_relevant);
-		    goto out;
-	    }
-
-	    /* pac.data will be freed with this */
-	    if_relevant->val[0].ad_data.data = pac.data;
-	    if_relevant->val[0].ad_data.length = pac.length;
+    
+    krb5_generate_random_keyblock(context, etype, &et.key);
 
-	    ASN1_MALLOC_ENCODE(AuthorizationData, buf, buf_size, if_relevant, &len, ret);
-	    free_AuthorizationData(if_relevant);
-	    
-	    auth_data = NULL;
-	    ALLOC(auth_data);
-	    auth_data->len = 1;
-	    auth_data->val = malloc(sizeof(*auth_data->val));
-	    auth_data->val[0].ad_type = KRB5_AUTHDATA_IF_RELEVANT;
-	    auth_data->val[0].ad_data.length = len;
-	    auth_data->val[0].ad_data.data = buf;
+    if (server->authz_data_tgs_req) {
+	    ret = server->authz_data_tgs_req(context, server,
+					     client_principal, 
+					     tgs_ticket->ticket.authorization_data,
+					     tgs_ticket->ticket.authtime,
+					     tgtkey,
+					     ekey, 
+					     &et.key, 
+					     &new_auth_data);
 	    if (ret) {
-		    goto out;
+		    new_auth_data = NULL;
 	    }
     }
 
-#endif
     /* XXX Check enc-authorization-data */
-    et.authorization_data = auth_data;
+    et.authorization_data = new_auth_data;
 
-    krb5_generate_random_keyblock(context, etype, &et.key);
     et.crealm = tgt->crealm;
     et.cname = tgt->cname;
 	    
@@ -1878,7 +1855,7 @@ tgs_make_reply(krb5_context context,
        etype list, even if we don't want a session key with
        DES3? */
     ret = encode_reply(context, config, 
-		       &rep, &et, &ek, etype, adtkt ? 0 : server->kvno, ekey,
+		       &rep, &et, &ek, etype, adtkt ? 0 : server->entry.kvno, ekey,
 		       0, &tgt->key, e_text, reply);
   out:
     free_TGS_REP(&rep);
@@ -2228,7 +2205,8 @@ tgs_rep2(krb5_context context,
 	PrincipalName *s;
 	Realm r;
 	char *spn = NULL, *cpn = NULL;
-	hdb_entry *server = NULL, *client = NULL;
+	hdb_entry_ex *server = NULL;
+	hdb_entry *client = NULL;
 	int nloop = 0;
 	EncTicketPart adtkt;
 	char opt_str[128];
@@ -2295,7 +2273,7 @@ tgs_rep2(krb5_context context,
 	    kdc_log(context, config, 0,
 		    "TGS-REQ %s from %s for %s", cpn, from, spn);
     server_lookup:
-	ret = _kdc_db_fetch(context, config, sp, HDB_ENT_TYPE_SERVER, &server);
+	ret = _kdc_db_fetch_ex(context, config, sp, HDB_ENT_TYPE_SERVER, &server);
 
 	if(ret){
 	    const char *new_rlm;
@@ -2376,7 +2354,7 @@ tgs_rep2(krb5_context context,
 
 	ret = _kdc_check_flags(context, config, 
 			       client, cpn,
-			       server, spn,
+			       &server->entry, spn,
 			       FALSE);
 	if(ret)
 	    goto out;
@@ -2384,7 +2362,7 @@ tgs_rep2(krb5_context context,
 	if((b->kdc_options.validate || b->kdc_options.renew) && 
 	   !krb5_principal_compare(context, 
 				   krbtgt->principal,
-				   server->principal)){
+				   server->entry.principal)){
 	    kdc_log(context, config, 0, "Inconsistent request.");
 	    ret = KRB5KDC_ERR_SERVER_NOMATCH;
 	    goto out;
@@ -2417,7 +2395,7 @@ tgs_rep2(krb5_context context,
 	free(cpn);
 	    
 	if(server)
-	    _kdc_free_ent(context, server);
+	    _kdc_free_ent_ex(context, server);
 	if(client)
 	    _kdc_free_ent(context, client);
     }
diff --git a/source4/heimdal/lib/hdb/hdb.h b/source4/heimdal/lib/hdb/hdb.h
index 41cc03cf36..45ea5a9f30 100644
--- a/source4/heimdal/lib/hdb/hdb.h
+++ b/source4/heimdal/lib/hdb/hdb.h
@@ -61,14 +61,19 @@ typedef struct hdb_entry_ex {
 	krb5_error_code (*free_private)(krb5_context, struct hdb_entry_ex *);
 	krb5_error_code (*check_client_access)(krb5_context, struct hdb_entry_ex *, HostAddresses *);
 	krb5_error_code (*authz_data_as_req)(krb5_context, struct hdb_entry_ex *, 
-					     AuthorizationData *in, 
+					     METHOD_DATA* pa_data_seq,
+					     time_t authtime,
 					     EncryptionKey *tgtkey,
-					     AuthorizationData *out);
+					     EncryptionKey *sessionkey,
+					     AuthorizationData **out);
 	krb5_error_code (*authz_data_tgs_req)(krb5_context, struct hdb_entry_ex *, 
+					      krb5_principal client, 
 					      AuthorizationData *in, 
+					      time_t authtime,
 					      EncryptionKey *tgtkey,
 					      EncryptionKey *servicekey,
-					      AuthorizationData *out);
+					      EncryptionKey *sessionkey,
+					      AuthorizationData **out);
 } hdb_entry_ex;
 
 typedef struct HDB{
diff --git a/source4/heimdal/lib/krb5/krb5-private.h b/source4/heimdal/lib/krb5/krb5-private.h
index 07d9329337..2645c29fe7 100644
--- a/source4/heimdal/lib/krb5/krb5-private.h
+++ b/source4/heimdal/lib/krb5/krb5-private.h
@@ -399,4 +399,12 @@ _krb5_xunlock (
 	krb5_context /*context*/,
 	int /*fd*/);
 
+int
+_krb5_find_type_in_ad(krb5_context context,
+		      int type, 
+		      krb5_data *data,
+		      int *found,
+		      krb5_keyblock *sessionkey,
+		      const AuthorizationData *ad);
+
 #endif /* __krb5_private_h__ */
diff --git a/source4/heimdal/lib/krb5/mk_req.c b/source4/heimdal/lib/krb5/mk_req.c
index adc077e13f..44e5d9c222 100644
--- a/source4/heimdal/lib/krb5/mk_req.c
+++ b/source4/heimdal/lib/krb5/mk_req.c
@@ -64,7 +64,9 @@ krb5_mk_req_exact(krb5_context context,
     if (auth_context && *auth_context && (*auth_context)->keytype)
 	this_cred.session.keytype = (*auth_context)->keytype;
 
+    /* This is the network contact with the KDC */
     ret = krb5_get_credentials (context, 0, ccache, &this_cred, &cred);
+
     krb5_free_cred_contents(context, &this_cred);
     if (ret)
 	return ret;
diff --git a/source4/heimdal/lib/krb5/ticket.c b/source4/heimdal/lib/krb5/ticket.c
index 7dae26acf2..b3efeb39d3 100644
--- a/source4/heimdal/lib/krb5/ticket.c
+++ b/source4/heimdal/lib/krb5/ticket.c
@@ -101,8 +101,8 @@ static int
 find_type_in_ad(krb5_context context,
 		int type, 
 		krb5_data *data,
-		int *found,
-		int failp,
+		krb5_boolean *found,
+		krb5_boolean failp,
 		krb5_keyblock *sessionkey,
 		const AuthorizationData *ad,
 		int level)
@@ -129,7 +129,7 @@ find_type_in_ad(krb5_context context,
 		krb5_set_error_string(context, "malloc - out of memory");
 		goto out;
 	    }
-	    *found = 1;
+	    *found = TRUE;
 	    continue;
 	}
 	switch (ad->val[i].ad_type) {
@@ -228,6 +228,19 @@ out:
     return ret;
 }
 
+int
+_krb5_find_type_in_ad(krb5_context context,
+		      int type, 
+		      krb5_data *data,
+		      krb5_boolean *found,
+		      krb5_keyblock *sessionkey,
+		      const AuthorizationData *ad)
+{
+    krb5_data_zero(data);
+    return find_type_in_ad(context, type, data, found, TRUE, sessionkey, ad, 0);
+}
+
+
 /*
  * Extract the authorization data type of `type' from the
  * 'ticket'. Store the field in `data'. This function is to use for
@@ -242,9 +255,7 @@ krb5_ticket_get_authorization_data_type(krb5_context context,
 {
     AuthorizationData *ad;
     krb5_error_code ret;
-    int found = 0;
-
-    krb5_data_zero(data);
+    krb5_boolean found = 0;
 
     ad = ticket->ticket.authorization_data;
     if (ticket->ticket.authorization_data == NULL) {
@@ -252,8 +263,8 @@ krb5_ticket_get_authorization_data_type(krb5_context context,
 	return ENOENT; /* XXX */
     }
 
-    ret = find_type_in_ad(context, type, data, &found, 1, &ticket->ticket.key,
-			  ticket->ticket.authorization_data, 0);
+    ret = _krb5_find_type_in_ad(context, type, data, &found, &ticket->ticket.key,
+				ticket->ticket.authorization_data);
     if (ret)
 	return ret;
     if (!found) {