1 files changed, 133 insertions, 326 deletions

diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c
index 0d877ddef8..2c667a66bc 100644
--- a/source3/libads/authdata.c
+++ b/source3/libads/authdata.c
@@ -26,332 +26,69 @@
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "smb_krb5.h"
 #include "libads/kerberos_proto.h"
+#include "auth/common_auth.h"
+#include "lib/param/param.h"
+#include "librpc/crypto/gse.h"
+#include "auth/gensec/gensec.h"
+#include "../libcli/auth/spnego.h"
 
 #ifdef HAVE_KRB5
 
-/****************************************************************
-****************************************************************/
-
-static krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx,
-					  DATA_BLOB pac_data,
-					  struct PAC_SIGNATURE_DATA *sig,
-					  krb5_context context,
-					  krb5_keyblock *keyblock)
-{
-	krb5_error_code ret;
-	krb5_checksum cksum;
-	krb5_keyusage usage = 0;
-
-	smb_krb5_checksum_from_pac_sig(&cksum, sig);
-
-#ifdef HAVE_KRB5_KU_OTHER_CKSUM /* Heimdal */
-	usage = KRB5_KU_OTHER_CKSUM;
-#elif defined(HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM) /* MIT */
-	usage = KRB5_KEYUSAGE_APP_DATA_CKSUM;
-#else
-#error UNKNOWN_KRB5_KEYUSAGE
-#endif
+#include "auth/kerberos/pac_utils.h"
 
-	ret = smb_krb5_verify_checksum(context,
-				       keyblock,
-				       usage,
-				       &cksum,
-				       pac_data.data,
-				       pac_data.length);
+struct smb_krb5_context;
 
-	if (ret) {
-		DEBUG(2,("check_pac_checksum: PAC Verification failed: %s (%d)\n",
-			error_message(ret), ret));
-		return ret;
-	}
-
-	return ret;
-}
-
-/**
-* @brief Decode a blob containing a NDR envoded PAC structure
-*
-* @param mem_ctx	  - The memory context
-* @param pac_data_blob	  - The data blob containing the NDR encoded data
-* @param context	  - The Kerberos Context
-* @param service_keyblock - The Service Key used to verify the checksum
-* @param client_principal - The client principal
-* @param tgs_authtime     - The ticket timestamp
-* @param pac_data_out	  - [out] The decoded PAC
-*
-* @return - A NTSTATUS error code
-*/
-NTSTATUS decode_pac_data(TALLOC_CTX *mem_ctx,
-			 DATA_BLOB *pac_data_blob,
-			 krb5_context context,
-			 krb5_keyblock *service_keyblock,
-			 krb5_const_principal client_principal,
-			 time_t tgs_authtime,
-			 struct PAC_DATA **pac_data_out)
+/****************************************************************
+Callback to get the PAC_LOGON_INFO from the blob
+****************************************************************/
+static NTSTATUS kerberos_fetch_pac(struct auth4_context *auth_ctx,
+				   TALLOC_CTX *mem_ctx,
+				   struct smb_krb5_context *smb_krb5_context,
+				   DATA_BLOB *pac_blob,
+				   const char *princ_name,
+				   const struct tsocket_address *remote_address,
+				   uint32_t session_info_flags,
+				   struct auth_session_info **session_info)
 {
-	NTSTATUS status;
-	enum ndr_err_code ndr_err;
-	krb5_error_code ret;
-	DATA_BLOB modified_pac_blob;
-
-	NTTIME tgs_authtime_nttime;
-	krb5_principal client_principal_pac = NULL;
-	int i;
-
-	struct PAC_SIGNATURE_DATA *srv_sig_ptr = NULL;
-	struct PAC_SIGNATURE_DATA *kdc_sig_ptr = NULL;
-	struct PAC_SIGNATURE_DATA *srv_sig_wipe = NULL;
-	struct PAC_SIGNATURE_DATA *kdc_sig_wipe = NULL;
-	struct PAC_LOGON_NAME *logon_name = NULL;
+	TALLOC_CTX *tmp_ctx;
 	struct PAC_LOGON_INFO *logon_info = NULL;
-	struct PAC_DATA *pac_data = NULL;
-	struct PAC_DATA_RAW *pac_data_raw = NULL;
-
-	DATA_BLOB *srv_sig_blob = NULL;
-	DATA_BLOB *kdc_sig_blob = NULL;
-
-	bool bool_ret;
-
-	*pac_data_out = NULL;
+	NTSTATUS status = NT_STATUS_INTERNAL_ERROR;
 
-	pac_data = TALLOC_ZERO_P(mem_ctx, struct PAC_DATA);
-	pac_data_raw = TALLOC_ZERO_P(mem_ctx, struct PAC_DATA_RAW);
-	kdc_sig_wipe = TALLOC_ZERO_P(mem_ctx, struct PAC_SIGNATURE_DATA);
-	srv_sig_wipe = TALLOC_ZERO_P(mem_ctx, struct PAC_SIGNATURE_DATA);
-	if (!pac_data_raw || !pac_data || !kdc_sig_wipe || !srv_sig_wipe) {
+	tmp_ctx = talloc_new(mem_ctx);
+	if (!tmp_ctx) {
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	ndr_err = ndr_pull_struct_blob(pac_data_blob, pac_data, pac_data,
-		       (ndr_pull_flags_fn_t)ndr_pull_PAC_DATA);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		status = ndr_map_error2ntstatus(ndr_err);
-		DEBUG(0,("can't parse the PAC: %s\n",
-			nt_errstr(status)));
-		return status;
-	}
-
-	if (pac_data->num_buffers < 4) {
-		/* we need logon_ingo, service_key and kdc_key */
-		DEBUG(0,("less than 4 PAC buffers\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	ndr_err = ndr_pull_struct_blob(
-				pac_data_blob, pac_data_raw, pac_data_raw,
-				(ndr_pull_flags_fn_t)ndr_pull_PAC_DATA_RAW);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		status = ndr_map_error2ntstatus(ndr_err);
-		DEBUG(0,("can't parse the PAC: %s\n",
-			nt_errstr(status)));
-		return status;
-	}
-
-	if (pac_data_raw->num_buffers < 4) {
-		/* we need logon_ingo, service_key and kdc_key */
-		DEBUG(0,("less than 4 PAC buffers\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	if (pac_data->num_buffers != pac_data_raw->num_buffers) {
-		/* we need logon_ingo, service_key and kdc_key */
-		DEBUG(0, ("misparse! PAC_DATA has %d buffers while "
-			  "PAC_DATA_RAW has %d\n", pac_data->num_buffers,
-			  pac_data_raw->num_buffers));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	for (i=0; i < pac_data->num_buffers; i++) {
-		struct PAC_BUFFER *data_buf = &pac_data->buffers[i];
-		struct PAC_BUFFER_RAW *raw_buf = &pac_data_raw->buffers[i];
-
-		if (data_buf->type != raw_buf->type) {
-			DEBUG(0, ("misparse! PAC_DATA buffer %d has type "
-				  "%d while PAC_DATA_RAW has %d\n", i,
-				  data_buf->type, raw_buf->type));
-			return NT_STATUS_INVALID_PARAMETER;
-		}
-		switch (data_buf->type) {
-		case PAC_TYPE_LOGON_INFO:
-			if (!data_buf->info) {
-				break;
-			}
-			logon_info = data_buf->info->logon_info.info;
-			break;
-		case PAC_TYPE_SRV_CHECKSUM:
-			if (!data_buf->info) {
-				break;
-			}
-			srv_sig_ptr = &data_buf->info->srv_cksum;
-			srv_sig_blob = &raw_buf->info->remaining;
-			break;
-		case PAC_TYPE_KDC_CHECKSUM:
-			if (!data_buf->info) {
-				break;
-			}
-			kdc_sig_ptr = &data_buf->info->kdc_cksum;
-			kdc_sig_blob = &raw_buf->info->remaining;
-			break;
-		case PAC_TYPE_LOGON_NAME:
-			logon_name = &data_buf->info->logon_name;
-			break;
-		default:
-			break;
+	if (pac_blob) {
+		status = kerberos_pac_logon_info(tmp_ctx, *pac_blob, NULL, NULL,
+						 NULL, NULL, 0, &logon_info);
+		if (!NT_STATUS_IS_OK(status)) {
+			goto done;
 		}
 	}
 
-	if (!logon_info) {
-		DEBUG(0,("PAC no logon_info\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
+	talloc_set_name_const(logon_info, "struct PAC_LOGON_INFO");
 
-	if (!logon_name) {
-		DEBUG(0,("PAC no logon_name\n"));
-		return NT_STATUS_INVALID_PARAMETER;
+	auth_ctx->private_data = talloc_steal(auth_ctx, logon_info);
+	*session_info = talloc_zero(mem_ctx, struct auth_session_info);
+	if (!*session_info) {
+		status = NT_STATUS_NO_MEMORY;
+		goto done;
 	}
+	status = NT_STATUS_OK;
 
-	if (!srv_sig_ptr || !srv_sig_blob) {
-		DEBUG(0,("PAC no srv_key\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
+done:
+	TALLOC_FREE(tmp_ctx);
 
-	if (!kdc_sig_ptr || !kdc_sig_blob) {
-		DEBUG(0,("PAC no kdc_key\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	/* Find and zero out the signatures,
-	 * as required by the signing algorithm */
-
-	/* We find the data blobs above,
-	 * now we parse them to get at the exact portion we should zero */
-	ndr_err = ndr_pull_struct_blob(
-			kdc_sig_blob, kdc_sig_wipe, kdc_sig_wipe,
-			(ndr_pull_flags_fn_t)ndr_pull_PAC_SIGNATURE_DATA);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		status = ndr_map_error2ntstatus(ndr_err);
-		DEBUG(0,("can't parse the KDC signature: %s\n",
-			nt_errstr(status)));
-		return status;
-	}
-
-	ndr_err = ndr_pull_struct_blob(
-			srv_sig_blob, srv_sig_wipe, srv_sig_wipe,
-			(ndr_pull_flags_fn_t)ndr_pull_PAC_SIGNATURE_DATA);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		status = ndr_map_error2ntstatus(ndr_err);
-		DEBUG(0,("can't parse the SRV signature: %s\n",
-			nt_errstr(status)));
-		return status;
-	}
-
-	/* Now zero the decoded structure */
-	memset(kdc_sig_wipe->signature.data,
-		'\0', kdc_sig_wipe->signature.length);
-	memset(srv_sig_wipe->signature.data,
-		'\0', srv_sig_wipe->signature.length);
-
-	/* and reencode, back into the same place it came from */
-	ndr_err = ndr_push_struct_blob(
-			kdc_sig_blob, pac_data_raw, kdc_sig_wipe,
-			(ndr_push_flags_fn_t)ndr_push_PAC_SIGNATURE_DATA);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		status = ndr_map_error2ntstatus(ndr_err);
-		DEBUG(0,("can't repack the KDC signature: %s\n",
-			nt_errstr(status)));
-		return status;
-	}
-	ndr_err = ndr_push_struct_blob(
-			srv_sig_blob, pac_data_raw, srv_sig_wipe,
-			(ndr_push_flags_fn_t)ndr_push_PAC_SIGNATURE_DATA);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		status = ndr_map_error2ntstatus(ndr_err);
-		DEBUG(0,("can't repack the SRV signature: %s\n",
-			nt_errstr(status)));
-		return status;
-	}
-
-	/* push out the whole structure, but now with zero'ed signatures */
-	ndr_err = ndr_push_struct_blob(
-			&modified_pac_blob, pac_data_raw, pac_data_raw,
-			(ndr_push_flags_fn_t)ndr_push_PAC_DATA_RAW);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		status = ndr_map_error2ntstatus(ndr_err);
-		DEBUG(0,("can't repack the RAW PAC: %s\n",
-			nt_errstr(status)));
-		return status;
-	}
-
-	/* verify by service_key */
-	ret = check_pac_checksum(mem_ctx,
-				 modified_pac_blob, srv_sig_ptr,
-				 context,
-				 service_keyblock);
-	if (ret) {
-		DEBUG(1, ("PAC Decode: Failed to verify the service "
-			  "signature: %s\n", error_message(ret)));
-		return NT_STATUS_ACCESS_DENIED;
-	}
-
-	/* Convert to NT time, so as not to loose accuracy in comparison */
-	unix_to_nt_time(&tgs_authtime_nttime, tgs_authtime);
-
-	if (tgs_authtime_nttime != logon_name->logon_time) {
-		DEBUG(2, ("PAC Decode: "
-			  "Logon time mismatch between ticket and PAC!\n"));
-		DEBUG(2, ("PAC Decode: PAC: %s\n",
-			  nt_time_string(mem_ctx, logon_name->logon_time)));
-		DEBUG(2, ("PAC Decode: Ticket: %s\n",
-			  nt_time_string(mem_ctx, tgs_authtime_nttime)));
-		return NT_STATUS_ACCESS_DENIED;
-	}
-
-	ret = smb_krb5_parse_name_norealm(context,
-					  logon_name->account_name,
-					  &client_principal_pac);
-	if (ret) {
-		DEBUG(2, ("Could not parse name from PAC: [%s]:%s\n",
-			  logon_name->account_name, error_message(ret)));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	bool_ret = smb_krb5_principal_compare_any_realm(context,
-							client_principal,
-							client_principal_pac);
-
-	krb5_free_principal(context, client_principal_pac);
-
-	if (!bool_ret) {
-		DEBUG(2, ("Name in PAC [%s] does not match principal name "
-			  "in ticket\n", logon_name->account_name));
-		return NT_STATUS_ACCESS_DENIED;
-	}
-
-	DEBUG(3,("Found account name from PAC: %s [%s]\n",
-		 logon_info->info3.base.account_name.string,
-		 logon_info->info3.base.full_name.string));
-
-	DEBUG(10,("Successfully validated Kerberos PAC\n"));
-
-	if (DEBUGLEVEL >= 10) {
-		const char *s;
-		s = NDR_PRINT_STRUCT_STRING(mem_ctx, PAC_DATA, pac_data);
-		if (s) {
-			DEBUGADD(10,("%s\n", s));
-		}
-	}
-
-	*pac_data_out = pac_data;
-
-	return NT_STATUS_OK;
+	return status;
 }
 
-/****************************************************************
-Given a username, password and other details, return the
-PAC_LOGON_INFO (the structure containing the important user
-information such as groups).
-****************************************************************/
-
+/*
+ * Given the username/password, do a kinit, store the ticket in
+ * cache_name if specified, and return the PAC_LOGON_INFO (the
+ * structure containing the important user information such as
+ * groups).
+ */
 NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
 			     const char *name,
 			     const char *pass,
@@ -363,20 +100,29 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
 			     bool add_netbios_addr,
 			     time_t renewable_time,
 			     const char *impersonate_princ_s,
-			     struct PAC_LOGON_INFO **logon_info)
+			     struct PAC_LOGON_INFO **_logon_info)
 {
 	krb5_error_code ret;
 	NTSTATUS status = NT_STATUS_INVALID_PARAMETER;
-	DATA_BLOB tkt, ap_rep, sesskey1, sesskey2;
-	char *client_princ_out = NULL;
+	DATA_BLOB tkt, tkt_wrapped, ap_rep, sesskey1;
 	const char *auth_princ = NULL;
 	const char *local_service = NULL;
 	const char *cc = "MEMORY:kerberos_return_pac";
+	struct auth_session_info *session_info;
+	struct gensec_security *gensec_server_context;
+
+	struct gensec_settings *gensec_settings;
+	size_t idx = 0;
+	struct auth4_context *auth_context;
+	struct loadparm_context *lp_ctx;
+	struct PAC_LOGON_INFO *logon_info = NULL;
+
+	TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+	NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
 
 	ZERO_STRUCT(tkt);
 	ZERO_STRUCT(ap_rep);
 	ZERO_STRUCT(sesskey1);
-	ZERO_STRUCT(sesskey2);
 
 	if (!name || !pass) {
 		return NT_STATUS_INVALID_PARAMETER;
@@ -395,7 +141,7 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
 	NT_STATUS_HAVE_NO_MEMORY(auth_princ);
 
 	local_service = talloc_asprintf(mem_ctx, "%s$@%s",
-					global_myname(), lp_realm());
+					lp_netbios_name(), lp_realm());
 	NT_STATUS_HAVE_NO_MEMORY(local_service);
 
 	ret = kerberos_kinit_password_ext(auth_princ,
@@ -454,28 +200,92 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
 		status = krb5_to_nt_status(ret);
 		goto out;
 	}
-	status = ads_verify_ticket(mem_ctx,
-				   lp_realm(),
-				   time_offset,
-				   &tkt,
-				   &client_princ_out,
-				   logon_info,
-				   &ap_rep,
-				   &sesskey2,
-				   False);
+
+	/* wrap that up in a nice GSS-API wrapping */
+	tkt_wrapped = spnego_gen_krb5_wrap(tmp_ctx, tkt, TOK_ID_KRB_AP_REQ);
+	if (tkt_wrapped.data == NULL) {
+		status = NT_STATUS_NO_MEMORY;
+		goto out;
+	}
+
+	auth_context = talloc_zero(tmp_ctx, struct auth4_context);
+	if (auth_context == NULL) {
+		status = NT_STATUS_NO_MEMORY;
+		goto out;
+	}
+	auth_context->generate_session_info_pac = kerberos_fetch_pac;
+
+	lp_ctx = loadparm_init_s3(tmp_ctx, loadparm_s3_helpers());
+	if (lp_ctx == NULL) {
+		status = NT_STATUS_INVALID_SERVER_STATE;
+		DEBUG(10, ("loadparm_init_s3 failed\n"));
+		goto out;
+	}
+
+	gensec_settings = lpcfg_gensec_settings(tmp_ctx, lp_ctx);
+	if (lp_ctx == NULL) {
+		status = NT_STATUS_NO_MEMORY;
+		DEBUG(10, ("lpcfg_gensec_settings failed\n"));
+		goto out;
+	}
+
+	gensec_settings->backends = talloc_zero_array(gensec_settings,
+						      struct gensec_security_ops *, 2);
+	if (gensec_settings->backends == NULL) {
+		status = NT_STATUS_NO_MEMORY;
+		goto out;
+	}
+
+	gensec_init();
+
+	gensec_settings->backends[idx++] = &gensec_gse_krb5_security_ops;
+
+	status = gensec_server_start(tmp_ctx, gensec_settings,
+					auth_context, &gensec_server_context);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(1, (__location__ "Failed to start server-side GENSEC to validate a Kerberos ticket: %s\n", nt_errstr(status)));
+		goto out;
+	}
+
+	talloc_unlink(tmp_ctx, lp_ctx);
+	talloc_unlink(tmp_ctx, gensec_settings);
+	talloc_unlink(tmp_ctx, auth_context);
+
+	status = gensec_start_mech_by_oid(gensec_server_context, GENSEC_OID_KERBEROS5);
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(1, (__location__ "Failed to start server-side GENSEC krb5 to validate a Kerberos ticket: %s\n", nt_errstr(status)));
+		goto out;
+	}
+
+	/* Do a client-server update dance */
+	status = gensec_update(gensec_server_context, tmp_ctx, NULL, tkt_wrapped, &ap_rep);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(1,("ads_verify_ticket failed: %s\n",
-			nt_errstr(status)));
+		DEBUG(1, ("gensec_update() failed: %s\n", nt_errstr(status)));
 		goto out;
 	}
 
-	if (!*logon_info) {
+	/* Now return the PAC information to the callers.  We ingore
+	 * the session_info and instead pick out the PAC via the
+	 * private_data on the auth_context */
+	status = gensec_session_info(gensec_server_context, tmp_ctx, &session_info);
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(1, ("Unable to obtain PAC via gensec_session_info\n"));
+		goto out;
+	}
+
+	logon_info = talloc_get_type_abort(gensec_server_context->auth_context->private_data,
+					   struct PAC_LOGON_INFO);
+	if (logon_info == NULL) {
 		DEBUG(1,("no PAC\n"));
 		status = NT_STATUS_INVALID_PARAMETER;
 		goto out;
 	}
 
+	*_logon_info = talloc_move(mem_ctx, &logon_info);
+
 out:
+	talloc_free(tmp_ctx);
 	if (cc != cache_name) {
 		ads_kdestroy(cc);
 	}
@@ -483,9 +293,6 @@ out:
 	data_blob_free(&tkt);
 	data_blob_free(&ap_rep);
 	data_blob_free(&sesskey1);
-	data_blob_free(&sesskey2);
-
-	TALLOC_FREE(client_princ_out);
 
 	return status;
 }