r1198: Merge the Samba 3.0 ntlm_auth, including the kerberos and SPENGO parts.

I have moved the SPNEGO and Kerberos code into libcli/auth, and intend
to refactor them into the same format as NTLMSSP.

Andrew Bartlett
(This used to be commit 58da78a7460d5d0a4abee7d7b84799c228e6bc0b)

3 files changed, 1 insertions, 551 deletions

diff --git a/source4/libads/config.m4 b/source4/libads/config.m4
index 99d138cd09..c6029a4d80 100644
--- a/source4/libads/config.m4
+++ b/source4/libads/config.m4
@@ -443,3 +443,4 @@ fi
 
 SMB_EXT_LIB(LDAP,[${LDAP_LIBS}],[${LDAP_CFLAGS}],[${LDAP_CPPFLAGS}],[${LDAP_LDFLAGS}])
 SMB_EXT_LIB(KRB5,[${KRB5_LIBS}],[${KRB5_CFLAGS}],[${KRB5_CPPFLAGS}],[${KRB5_LDFLAGS}])
+
diff --git a/source4/libads/kerberos.c b/source4/libads/kerberos.c
deleted file mode 100644
index bef2febaef..0000000000
--- a/source4/libads/kerberos.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   kerberos utility library
-   Copyright (C) Andrew Tridgell 2001
-   Copyright (C) Remus Koos 2001
-   
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-#ifdef HAVE_KRB5
-
-/*
-  we use a prompter to avoid a crash bug in the kerberos libs when 
-  dealing with empty passwords
-  this prompter is just a string copy ...
-*/
-static krb5_error_code 
-kerb_prompter(krb5_context ctx, void *data,
-	       const char *name,
-	       const char *banner,
-	       int num_prompts,
-	       krb5_prompt prompts[])
-{
-	if (num_prompts == 0) return 0;
-
-	memset(prompts[0].reply->data, 0, prompts[0].reply->length);
-	if (prompts[0].reply->length > 0) {
-		if (data) {
-			strncpy(prompts[0].reply->data, data, prompts[0].reply->length-1);
-			prompts[0].reply->length = strlen(prompts[0].reply->data);
-		} else {
-			prompts[0].reply->length = 0;
-		}
-	}
-	return 0;
-}
-
-/*
-  simulate a kinit, putting the tgt in the default cache location
-  remus@snapserver.com
-*/
-int kerberos_kinit_password(const char *principal, const char *password, int time_offset)
-{
-	krb5_context ctx;
-	krb5_error_code code = 0;
-	krb5_ccache cc;
-	krb5_principal me;
-	krb5_creds my_creds;
-
-	if ((code = krb5_init_context(&ctx)))
-		return code;
-
-	if (time_offset != 0) {
-		krb5_set_real_time(ctx, time(NULL) + time_offset, 0);
-	}
-	
-	if ((code = krb5_cc_default(ctx, &cc))) {
-		krb5_free_context(ctx);
-		return code;
-	}
-	
-	if ((code = krb5_parse_name(ctx, principal, &me))) {
-		krb5_free_context(ctx);	
-		return code;
-	}
-	
-	if ((code = krb5_get_init_creds_password(ctx, &my_creds, me, NULL, 
-						 kerb_prompter, 
-						 password, 0, NULL, NULL))) {
-		krb5_free_principal(ctx, me);
-		krb5_free_context(ctx);		
-		return code;
-	}
-	
-	if ((code = krb5_cc_initialize(ctx, cc, me))) {
-		krb5_free_cred_contents(ctx, &my_creds);
-		krb5_free_principal(ctx, me);
-		krb5_free_context(ctx);		
-		return code;
-	}
-	
-	if ((code = krb5_cc_store_cred(ctx, cc, &my_creds))) {
-		krb5_cc_close(ctx, cc);
-		krb5_free_cred_contents(ctx, &my_creds);
-		krb5_free_principal(ctx, me);
-		krb5_free_context(ctx);		
-		return code;
-	}
-	
-	krb5_cc_close(ctx, cc);
-	krb5_free_cred_contents(ctx, &my_creds);
-	krb5_free_principal(ctx, me);
-	krb5_free_context(ctx);		
-	
-	return 0;
-}
-
-
-
-/* run kinit to setup our ccache */
-int ads_kinit_password(ADS_STRUCT *ads)
-{
-	char *s;
-	int ret;
-
-	if (asprintf(&s, "%s@%s", ads->auth.user_name, ads->auth.realm) == -1) {
-		return KRB5_CC_NOMEM;
-	}
-
-	if (!ads->auth.password) {
-		return KRB5_LIBOS_CANTREADPWD;
-	}
-	
-	ret = kerberos_kinit_password(s, ads->auth.password, ads->auth.time_offset);
-
-	if (ret) {
-		DEBUG(0,("kerberos_kinit_password %s failed: %s\n", 
-			 s, error_message(ret)));
-	}
-	free(s);
-	return ret;
-}
-
-
-#endif
diff --git a/source4/libads/kerberos_verify.c b/source4/libads/kerberos_verify.c
deleted file mode 100644
index 48a8378d36..0000000000
--- a/source4/libads/kerberos_verify.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   kerberos utility library
-   Copyright (C) Andrew Tridgell 2001
-   Copyright (C) Remus Koos 2001
-   Copyright (C) Luke Howard 2003   
-   Copyright (C) Guenther Deschner 2003
-   Copyright (C) Jim McDonough (jmcd@us.ibm.com) 2003
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-#ifdef HAVE_KRB5
-
-static void free_keytab(krb5_context context, krb5_keytab keytab)
-{
-	int ret=0;
-	
-	if (keytab) 
-		ret = krb5_kt_close(context, keytab);
-	if (ret) {
-		DEBUG(3, ("krb5_kt_close failed (%s)\n",
-			  error_message(ret)));
-	}
-}
-
-#ifdef HAVE_MEMORY_KEYTAB
-static krb5_error_code create_keytab(krb5_context context,
-				     krb5_principal host_princ,
-				     char *host_princ_s,
-				     krb5_data password,
-				     krb5_enctype *enctypes,
-				     krb5_keytab *keytab,
-				     char *keytab_name)
-{
-	krb5_keytab_entry entry;
-	krb5_kvno kvno = 1;
-	krb5_error_code ret;
-	krb5_keyblock *key;
-	int i;
-
-	DEBUG(10,("creating keytab: %s\n", keytab_name));
-	ret = krb5_kt_resolve(context, keytab_name, keytab);
-	if (ret) 
-		return ret;
-
-	if (!(key = (krb5_keyblock *)malloc(sizeof(*key)))) {
-		return ENOMEM;
-	}
-	
-	/* add keytab entries for all encryption types */
-	for ( i=0; enctypes[i]; i++ ) {
-		
-		if (create_kerberos_key_from_string(context, host_princ, &password, key, enctypes[i])) {
-			continue;
-		}
-
-		entry.principal = host_princ;
-		entry.vno       = kvno;
-
-#if !defined(HAVE_KRB5_KEYTAB_ENTRY_KEY) && !defined(HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK)
-#error krb5_keytab_entry has no key or keyblock member
-#endif
-
-#ifdef HAVE_KRB5_KEYTAB_ENTRY_KEY /* MIT */
-		entry.key = *key; 
-#endif
-
-#ifdef HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK /* Heimdal */
-		entry.keyblock = *key;
-#endif
-
-		DEBUG(10,("adding keytab-entry for (%s) with encryption type (%d)\n",
-				host_princ_s, enctypes[i]));
-		ret = krb5_kt_add_entry(context, *keytab, &entry);
-		if (ret) {
-			DEBUG(1,("adding entry to keytab failed (%s)\n", 
-				 error_message(ret)));
-			free_keytab(context, *keytab);
-			return ret;
-		}
-	}
-	krb5_free_keyblock(context, key);
-	
-	return 0;
-}
-#endif
-
-static BOOL setup_keytab(krb5_context context,
-			 krb5_principal host_princ,
-			 char *host_princ_s,
-			 krb5_data password,
-			 krb5_enctype *enctypes,
-			 krb5_keytab *keytab)
-{
-	char *keytab_name = NULL;
-	krb5_error_code ret;
-
-	/* check if we have to setup a keytab - not currently enabled
-	   I've put this in so that the else block below functions 
-	   the same way that it will when this code is turned on */
-	if (0 /* will later be *lp_keytab() */) {
-
-		/* use a file-keytab */
-		asprintf(&keytab_name, "%s:%s", 
-			 "" 
-			 /* KRB5_KT_FILE_PREFIX, "FILE" or 
-			    "WRFILE" depending on HEeimdal or MIT */, 
-			 "" /* will later be lp_keytab() */);
-
-	        DEBUG(10,("will use filebased keytab: %s\n", keytab_name));
-	        ret = krb5_kt_resolve(context, keytab_name, keytab);
-		if (ret) {
-			DEBUG(3,("cannot resolve keytab name %s (%s)\n",
-				 keytab_name, 
-				 error_message(ret)));
-			SAFE_FREE(keytab_name);
-			return False;
-		}
-
-	}
-
-#if defined(HAVE_MEMORY_KEYTAB)
-	else {
-
-		/* setup a in-memory-keytab */
-		asprintf(&keytab_name, "MEMORY:");
-
-  		ret = create_keytab(context, host_princ, host_princ_s, password, enctypes, 
-			keytab, keytab_name);
-		if (ret) {
-			DEBUG(3,("unable to create MEMORY: keytab (%s)\n",
-				 error_message(ret)));
-			SAFE_FREE(keytab_name);
-			return False;
-		}
-	}
-#endif
-	SAFE_FREE(keytab_name);
-	return True;
-}
-	
-
-/*
-  verify an incoming ticket and parse out the principal name and 
-  authorization_data if available 
-*/
-NTSTATUS ads_verify_ticket(const char *realm, const DATA_BLOB *ticket, 
-			   char **principal, DATA_BLOB *auth_data,
-			   DATA_BLOB *ap_rep,
-			   DATA_BLOB *session_key)
-{
-	NTSTATUS sret = NT_STATUS_LOGON_FAILURE;
-	krb5_context context = NULL;
-	krb5_auth_context auth_context = NULL;
-	krb5_keytab keytab = NULL;
-	krb5_data packet;
-	krb5_ticket *tkt = NULL;
-	krb5_rcache rcache = NULL;
-	int ret, i;
-	krb5_keyblock *key = NULL;
-
-	krb5_principal host_princ;
-	char *host_princ_s = NULL;
-	BOOL free_host_princ = False;
-
-	fstring myname;
-	char *password_s = NULL;
-	krb5_data password;
-	krb5_enctype *enctypes = NULL;
-#if 0
-	krb5_address local_addr;
-	krb5_address remote_addr;
-#endif
-	BOOL auth_ok = False;
-
-	ZERO_STRUCT(packet);
-	ZERO_STRUCT(password);
-	ZERO_STRUCTP(auth_data);
-	ZERO_STRUCTP(ap_rep);
-
-	if (!secrets_init()) {
-		DEBUG(1,("ads_verify_ticket: secrets_init failed\n"));
-		return NT_STATUS_LOGON_FAILURE;
-	}
-
-	password_s = secrets_fetch_machine_password(lp_workgroup(), NULL, NULL);
-	if (!password_s) {
-		DEBUG(1,("ads_verify_ticket: failed to fetch machine password\n"));
-		return NT_STATUS_LOGON_FAILURE;
-	}
-
-	password.data = password_s;
-	password.length = strlen(password_s);
-
-	ret = krb5_init_context(&context);
-	if (ret) {
-		DEBUG(1,("ads_verify_ticket: krb5_init_context failed (%s)\n", error_message(ret)));
-		return NT_STATUS_LOGON_FAILURE;
-	}
-
-	ret = krb5_set_default_realm(context, realm);
-	if (ret) {
-		DEBUG(1,("ads_verify_ticket: krb5_set_default_realm failed (%s)\n", error_message(ret)));
-		sret = NT_STATUS_LOGON_FAILURE;
-		goto out;
-	}
-
-	/* This whole process is far more complex than I would
-           like. We have to go through all this to allow us to store
-           the secret internally, instead of using /etc/krb5.keytab */
-
-	ret = krb5_auth_con_init(context, &auth_context);
-	if (ret) {
-		DEBUG(1,("ads_verify_ticket: krb5_auth_con_init failed (%s)\n", error_message(ret)));
-		sret = NT_STATUS_LOGON_FAILURE;
-		goto out;
-	}
-
-	fstrcpy(myname, global_myname());
-	strlower_m(myname);
-	asprintf(&host_princ_s, "HOST/%s@%s", myname, lp_realm());
-	ret = krb5_parse_name(context, host_princ_s, &host_princ);
-	if (ret) {
-		DEBUG(1,("ads_verify_ticket: krb5_parse_name(%s) failed (%s)\n",
-					host_princ_s, error_message(ret)));
-		sret = NT_STATUS_LOGON_FAILURE;
-		goto out;
-	}
-
-	free_host_princ = True;
-
-	/*
-	 * JRA. We must set the rcache here. This will prevent replay attacks.
-	 */
-
-	ret = krb5_get_server_rcache(context, krb5_princ_component(context, host_princ, 0), &rcache);
-	if (ret) {
-		DEBUG(1,("ads_verify_ticket: krb5_get_server_rcache failed (%s)\n", error_message(ret)));
-		sret = NT_STATUS_LOGON_FAILURE;
-		goto out;
-	}
-
-	ret = krb5_auth_con_setrcache(context, auth_context, rcache);
-	if (ret) {
-		DEBUG(1,("ads_verify_ticket: krb5_auth_con_setrcache failed (%s)\n", error_message(ret)));
-		sret = NT_STATUS_LOGON_FAILURE;
-		goto out;
-	}
-
-	/* CIFS doesn't use addresses in tickets. This would breat NAT. JRA */
-
-	if ((ret = get_kerberos_allowed_etypes(context, &enctypes))) {
-		DEBUG(1,("ads_verify_ticket: krb5_get_permitted_enctypes failed (%s)\n", 
-			 error_message(ret)));
-		sret = NT_STATUS_LOGON_FAILURE;
-		goto out;
-	}
-
-	/* Lock a mutex surrounding the replay as there is no locking in the MIT krb5
-	 * code surrounding the replay cache... */
-
-	if (!grab_server_mutex("replay cache mutex")) {
-		DEBUG(1,("ads_verify_ticket: unable to protect replay cache with mutex.\n"));
-		sret = NT_STATUS_LOGON_FAILURE;
-		goto out;
-	}
-
-	if (!setup_keytab(context, host_princ, host_princ_s, password,
-			  enctypes, &keytab)) {
-		DEBUG(3,("ads_verify_ticket: unable to setup keytab\n"));
-		sret = NT_STATUS_LOGON_FAILURE;
-		goto out;
-	}
-	
-	/* We need to setup a auth context with each possible encoding type in turn. */
-	for (i=0;enctypes[i];i++) {
-		if (!(key = (krb5_keyblock *)malloc(sizeof(*key)))) {
-			sret = NT_STATUS_NO_MEMORY;
-			goto out;
-		}
-	
-		if (create_kerberos_key_from_string(context, host_princ, &password, key, enctypes[i])) {
-			continue;
-		}
-
-		krb5_auth_con_setuseruserkey(context, auth_context, key);
-
-		krb5_free_keyblock(context, key);
-
-		packet.length = ticket->length;
-		packet.data = (krb5_pointer)ticket->data;
-
-		if (!(ret = krb5_rd_req(context, &auth_context, &packet, 
-#ifdef HAVE_MEMORY_KEYTAB
-					host_princ, 
-#else
-					NULL,
-#endif
-					keytab, NULL, &tkt))) {
-			DEBUG(10,("ads_verify_ticket: enc type [%u] decrypted message !\n",
-				(uint_t)enctypes[i] ));
-			auth_ok = True;
-			break;
-		}
-	
-		DEBUG((ret != KRB5_BAD_ENCTYPE) ? 3 : 10,
-				("ads_verify_ticket: enc type [%u] failed to decrypt with error %s\n",
-				(uint_t)enctypes[i], error_message(ret)));
-	}
-
-	release_server_mutex();
-
-	if (!auth_ok) {
-		DEBUG(3,("ads_verify_ticket: krb5_rd_req with auth failed (%s)\n", 
-			 error_message(ret)));
-		sret = NT_STATUS_LOGON_FAILURE;
-		goto out;
-	}
-
-	ret = krb5_mk_rep(context, auth_context, &packet);
-	if (ret) {
-		DEBUG(3,("ads_verify_ticket: Failed to generate mutual authentication reply (%s)\n",
-			error_message(ret)));
-		sret = NT_STATUS_LOGON_FAILURE;
-		goto out;
-	}
-
-	*ap_rep = data_blob(packet.data, packet.length);
-	free(packet.data);
-
-	get_krb5_smb_session_key(context, auth_context, session_key, True);
-	dump_data_pw("SMB session key (from ticket)\n", session_key->data, session_key->length);
-
-#if 0
-	file_save("/tmp/ticket.dat", ticket->data, ticket->length);
-#endif
-
-	get_auth_data_from_tkt(auth_data, tkt);
-
-#if 0
-	{
-		TALLOC_CTX *ctx = talloc_init("pac data");
-		decode_pac_data(auth_data, ctx);
-		talloc_destroy(ctx);
-	}
-#endif
-
-#if 0
-	if (tkt->enc_part2) {
-		file_save("/tmp/authdata.dat",
-			  tkt->enc_part2->authorization_data[0]->contents,
-			  tkt->enc_part2->authorization_data[0]->length);
-	}
-#endif
-
-		
-	/* get rid of all resources associated with the keytab */
-	if (keytab) free_keytab(context, keytab);
-		
-	if ((ret = krb5_unparse_name(context, get_principal_from_tkt(tkt),
-				     principal))) {
-		DEBUG(3,("ads_verify_ticket: krb5_unparse_name failed (%s)\n", 
-			 error_message(ret)));
-		sret = NT_STATUS_LOGON_FAILURE;
-		goto out;
-	}
-
-	sret = NT_STATUS_OK;
-
- out:
-
-	if (!NT_STATUS_IS_OK(sret))
-		data_blob_free(auth_data);
-
-	if (!NT_STATUS_IS_OK(sret))
-		data_blob_free(ap_rep);
-
-	if (free_host_princ)
-		krb5_free_principal(context, host_princ);
-
-	if (tkt != NULL)
-		krb5_free_ticket(context, tkt);
-	free_kerberos_etypes(context, enctypes);
-	SAFE_FREE(password_s);
-	SAFE_FREE(host_princ_s);
-
-	if (auth_context)
-		krb5_auth_con_free(context, auth_context);
-
-	if (context)
-		krb5_free_context(context);
-
-	return sret;
-}
-
-#endif /* HAVE_KRB5 */