r1294: A nice, large, commit...

This implements gensec for Samba's server side, and brings gensec up
to the standards of a full subsystem.

This means that use of the subsystem is by gensec_* functions, not
function pointers in structures (this is internal).  This causes
changes in all the existing gensec users.

Our RPC server no longer contains it's own generalised security
scheme, and now calls gensec directly.

Gensec has also taken over the role of auth/auth_ntlmssp.c

An important part of gensec, is the output of the 'session_info'
struct.  This is now reference counted, so that we can correctly free
it when a pipe is closed, no matter if it was inherited, or created by
per-pipe authentication.

The schannel code is reworked, to be in the same file for client and
server.

ntlm_auth is reworked to use gensec.

The major problem with this code is the way it relies on subsystem
auto-initialisation.  The primary reason for this commit now.is to
allow these problems to be looked at, and fixed.

There are problems with the new code:
- I've tested it with smbtorture, but currently don't have VMware and
  valgrind working (this I'll fix soon).
- The SPNEGO code is client-only at this point.
- We still do not do kerberos.

Andrew Bartlett
(This used to be commit 07fd885fd488fd1051eacc905a2d4962f8a018ec)

5 files changed, 24 insertions, 252 deletions

diff --git a/source4/auth/auth.h b/source4/auth/auth.h
index c20b8dbf6f..0c8f71d859 100644
--- a/source4/auth/auth.h
+++ b/source4/auth/auth.h
@@ -96,6 +96,8 @@ struct auth_serversupplied_info
 struct auth_session_info 
 {
 	TALLOC_CTX *mem_ctx;
+
+	int refcount;
 	/* NT group information taken from the info3 structure */
 	
 	NT_USER_TOKEN *nt_user_token;
@@ -117,7 +119,8 @@ struct auth_context {
 	BOOL challenge_may_be_modified;
 
 	struct auth_methods *challenge_set_method; 
-	/* What order are the various methods in?   Try to stop it changing under us */ 
+
+	/* methods, in the order they should be called */
 	struct auth_methods *auth_method_list;	
 
 	TALLOC_CTX *mem_ctx;
@@ -165,15 +168,6 @@ struct auth_init_function_entry {
 	struct auth_init_function_entry *prev, *next;
 };
 
-struct auth_ntlmssp_state
-{
-	TALLOC_CTX *mem_ctx;
-	struct auth_context *auth_context;
-	struct auth_serversupplied_info *server_info;
-	struct ntlmssp_state *ntlmssp_state;
-};
-
-#define auth_ops __XXX_ERROR_BLA
 struct auth_operations {
 	/* the name of the backend */
 	const char *name;
@@ -188,11 +182,9 @@ struct auth_critical_sizes {
 	int sizeof_auth_operations;
 	int sizeof_auth_methods;
 	int sizeof_auth_context;
-	int sizeof_auth_ntlmssp_state;
 	int sizeof_auth_usersupplied_info;
 	int sizeof_auth_serversupplied_info;
 	int sizeof_auth_str;
-	int sizeof_auth_unistr;
 };
 
 #endif /* _SMBAUTH_H_ */
diff --git a/source4/auth/auth_ntlmssp.c b/source4/auth/auth_ntlmssp.c
deleted file mode 100644
index 183363a363..0000000000
--- a/source4/auth/auth_ntlmssp.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
-   handle NLTMSSP, server side
-
-   Copyright (C) Andrew Tridgell      2001
-   Copyright (C) Andrew Bartlett 2001-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"
-
-/**
- * Return the challenge as determined by the authentication subsystem 
- * @return an 8 byte random challenge
- */
-
-static const uint8_t *auth_ntlmssp_get_challenge(const struct ntlmssp_state *ntlmssp_state)
-{
-	struct auth_ntlmssp_state *auth_ntlmssp_state = ntlmssp_state->auth_context;
-
-	return auth_ntlmssp_state->auth_context->get_ntlm_challenge(auth_ntlmssp_state->auth_context);
-}
-
-/**
- * Some authentication methods 'fix' the challenge, so we may not be able to set it
- *
- * @return If the effective challenge used by the auth subsystem may be modified
- */
-static BOOL auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_state)
-{
-	struct auth_ntlmssp_state *auth_ntlmssp_state = ntlmssp_state->auth_context;
-
-	return auth_ntlmssp_state->auth_context->challenge_may_be_modified;
-}
-
-/**
- * NTLM2 authentication modifies the effective challenge, 
- * @param challenge The new challenge value
- */
-static NTSTATUS auth_ntlmssp_set_challenge(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *challenge)
-{
-	struct auth_ntlmssp_state *auth_ntlmssp_state = ntlmssp_state->auth_context;
-	struct auth_context *auth_context = auth_ntlmssp_state->auth_context;
-
-	SMB_ASSERT(challenge->length == 8);
-
-	auth_context->challenge = data_blob_talloc(auth_context->mem_ctx, 
-						   challenge->data, challenge->length);
-
-	auth_context->challenge_set_by = "NTLMSSP callback (NTLM2)";
-
-	DEBUG(5, ("auth_context challenge set by %s\n", auth_context->challenge_set_by));
-	DEBUG(5, ("challenge is: \n"));
-	dump_data(5, (const char *)auth_context->challenge.data, auth_context->challenge.length);
-	return NT_STATUS_OK;
-}
-
-/**
- * Check the password on an NTLMSSP login.  
- *
- * Return the session keys used on the connection.
- */
-
-static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key) 
-{
-	struct auth_ntlmssp_state *auth_ntlmssp_state = ntlmssp_state->auth_context;
-	struct auth_usersupplied_info *user_info = NULL;
-	NTSTATUS nt_status;
-
-#if 0
-	/* the client has given us its machine name (which we otherwise would not get on port 445).
-	   we need to possibly reload smb.conf if smb.conf includes depend on the machine name */
-
-	set_remote_machine_name(auth_ntlmssp_state->ntlmssp_state->workstation, True);
-
-	/* setup the string used by %U */
-	/* sub_set_smb_name checks for weird internally */
-	sub_set_smb_name(auth_ntlmssp_state->ntlmssp_state->user);
-
-	reload_services(True);
-
-#endif
-	nt_status = make_user_info_map(&user_info, 
-				       auth_ntlmssp_state->ntlmssp_state->user, 
-				       auth_ntlmssp_state->ntlmssp_state->domain, 
-				       auth_ntlmssp_state->ntlmssp_state->workstation, 
-	                               auth_ntlmssp_state->ntlmssp_state->lm_resp.data ? &auth_ntlmssp_state->ntlmssp_state->lm_resp : NULL, 
-	                               auth_ntlmssp_state->ntlmssp_state->nt_resp.data ? &auth_ntlmssp_state->ntlmssp_state->nt_resp : NULL, 
-				       NULL, NULL, NULL,
-				       True);
-
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		return nt_status;
-	}
-
-	nt_status = auth_ntlmssp_state->auth_context->check_ntlm_password(auth_ntlmssp_state->auth_context, 
-									  user_info, &auth_ntlmssp_state->server_info); 
-
-	free_user_info(&user_info);
-
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		return nt_status;
-	}
-	if (auth_ntlmssp_state->server_info->user_session_key.length) {
-		DEBUG(10, ("Got NT session key of length %u\n", auth_ntlmssp_state->server_info->user_session_key.length));
-		*user_session_key = data_blob_talloc(ntlmssp_state->mem_ctx, 
-						   auth_ntlmssp_state->server_info->user_session_key.data,
-						   auth_ntlmssp_state->server_info->user_session_key.length);
-	}
-	if (auth_ntlmssp_state->server_info->lm_session_key.length) {
-		DEBUG(10, ("Got LM session key of length %u\n", auth_ntlmssp_state->server_info->lm_session_key.length));
-		*lm_session_key = data_blob_talloc(ntlmssp_state->mem_ctx, 
-						   auth_ntlmssp_state->server_info->lm_session_key.data,
-						   auth_ntlmssp_state->server_info->lm_session_key.length);
-	}
-	return nt_status;
-}
-
-NTSTATUS auth_ntlmssp_start(struct auth_ntlmssp_state **auth_ntlmssp_state)
-{
-	NTSTATUS nt_status;
-	TALLOC_CTX *mem_ctx;
-
-	mem_ctx = talloc_init("AUTH NTLMSSP context");
-	
-	*auth_ntlmssp_state = talloc_zero(mem_ctx, sizeof(**auth_ntlmssp_state));
-	if (!*auth_ntlmssp_state) {
-		DEBUG(0,("auth_ntlmssp_start: talloc failed!\n"));
-		talloc_destroy(mem_ctx);
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	ZERO_STRUCTP(*auth_ntlmssp_state);
-
-	(*auth_ntlmssp_state)->mem_ctx = mem_ctx;
-
-	if (!NT_STATUS_IS_OK(nt_status = ntlmssp_server_start(&(*auth_ntlmssp_state)->ntlmssp_state))) {
-		return nt_status;
-	}
-
-	if (!NT_STATUS_IS_OK(nt_status = make_auth_context_subsystem(&(*auth_ntlmssp_state)->auth_context))) {
-		return nt_status;
-	}
-
-	(*auth_ntlmssp_state)->ntlmssp_state->auth_context = (*auth_ntlmssp_state);
-	(*auth_ntlmssp_state)->ntlmssp_state->get_challenge = auth_ntlmssp_get_challenge;
-	(*auth_ntlmssp_state)->ntlmssp_state->may_set_challenge = auth_ntlmssp_may_set_challenge;
-	(*auth_ntlmssp_state)->ntlmssp_state->set_challenge = auth_ntlmssp_set_challenge;
-	(*auth_ntlmssp_state)->ntlmssp_state->check_password = auth_ntlmssp_check_password;
-	(*auth_ntlmssp_state)->ntlmssp_state->server_role = lp_server_role();
-	
-	return NT_STATUS_OK;
-}
-
-void auth_ntlmssp_end(struct auth_ntlmssp_state **auth_ntlmssp_state)
-{
-	TALLOC_CTX *mem_ctx = (*auth_ntlmssp_state)->mem_ctx;
-
-	if ((*auth_ntlmssp_state)->ntlmssp_state) {
-		ntlmssp_end(&(*auth_ntlmssp_state)->ntlmssp_state);
-	}
-	if ((*auth_ntlmssp_state)->auth_context) {
-		free_auth_context(&(*auth_ntlmssp_state)->auth_context);
-	}
-	if ((*auth_ntlmssp_state)->server_info) {
-		free_server_info(&(*auth_ntlmssp_state)->server_info);
-	}
-	talloc_destroy(mem_ctx);
-	*auth_ntlmssp_state = NULL;
-}
-
-
-/**
- * Next state function for the wrapped NTLMSSP state machine
- * 
- * @param auth_ntlmssp_state NTLMSSP State
- * @param out_mem_ctx The TALLOC_CTX for *out to be allocated on
- * @param in The request, as a DATA_BLOB
- * @param out The reply, as an talloc()ed DATA_BLOB, on *out_mem_ctx
- * @return Error, MORE_PROCESSING_REQUIRED if a reply is sent, 
- *                or NT_STATUS_OK if the user is authenticated. 
- */
-
-NTSTATUS auth_ntlmssp_update(struct auth_ntlmssp_state *auth_ntlmssp_state, 
-			     TALLOC_CTX *out_mem_ctx,
-			     const DATA_BLOB in, DATA_BLOB *out) 
-{
-	return ntlmssp_update(auth_ntlmssp_state->ntlmssp_state, 
-			      out_mem_ctx, 
-			      in, out);
-}
-
-/** 
- * Return the credentials of a logged on user, including session keys
- * etc.
- *
- * Only valid after a successful authentication
- *
- * May only be called once per authentication.
- *
- */
-
-NTSTATUS auth_ntlmssp_get_session_info(struct auth_ntlmssp_state *auth_ntlmssp_state, 
-				       struct auth_session_info **session_info) 
-{
-	NTSTATUS nt_status;
-	nt_status = make_session_info(auth_ntlmssp_state->server_info, session_info);
-
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		return nt_status;
-	}
-
-	/* the session_info owns this now */
-	auth_ntlmssp_state->server_info = NULL;
-
-	(*session_info)->session_key = data_blob_talloc((*session_info)->mem_ctx, 
-							auth_ntlmssp_state->ntlmssp_state->session_key.data,
-							auth_ntlmssp_state->ntlmssp_state->session_key.length);
-
-	(*session_info)->workstation = talloc_strdup((*session_info)->mem_ctx, 
-						     auth_ntlmssp_state->ntlmssp_state->workstation);
-
-	return NT_STATUS_OK;
-}
diff --git a/source4/auth/auth_util.c b/source4/auth/auth_util.c
index 097f504538..06947999b3 100644
--- a/source4/auth/auth_util.c
+++ b/source4/auth/auth_util.c
@@ -590,6 +590,7 @@ NTSTATUS make_session_info(struct auth_serversupplied_info *server_info,
 		return NT_STATUS_NO_MEMORY;
 	}
 	
+	(*session_info)->refcount = 1;
 	(*session_info)->mem_ctx = server_info->mem_ctx;
 	server_info->mem_ctx = NULL; /* make sure not to accidentily destory it, 
 					and this information is now constant */
@@ -611,6 +612,22 @@ NTSTATUS make_session_info(struct auth_serversupplied_info *server_info,
 	return nt_status;
 }
 
+/***************************************************************************
+ Clear out a server_info struct that has been allocated
+***************************************************************************/
+
+void free_session_info(struct auth_session_info **session_info)
+{
+	DEBUG(5,("attempting to free a session_info structure\n"));
+	if (!*session_info) {
+		(*session_info)->refcount--;
+		if ((*session_info)->refcount <= 0) {
+			talloc_destroy((*session_info)->mem_ctx);
+		}
+	}
+	*session_info = NULL;
+}
+
 /**
  * Squash an NT_STATUS in line with security requirements.
  * In an attempt to avoid giving the whole game away when users
diff --git a/source4/auth/config.m4 b/source4/auth/config.m4
index 01e4574d94..3c4f86ecea 100644
--- a/source4/auth/config.m4
+++ b/source4/auth/config.m4
@@ -3,4 +3,4 @@ dnl # AUTH Server subsystem
 SMB_MODULE_MK(auth_sam,AUTH,STATIC,auth/config.mk)
 SMB_MODULE_MK(auth_builtin,AUTH,STATIC,auth/config.mk)
 
-SMB_SUBSYSTEM_MK(AUTH,auth/config.mk)
+SMB_SUBSYSTEM_MK(AUTH,auth/config.mk,[],[],[SAMDB])
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index c9b47e745b..b4082cb9e5 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -5,6 +5,8 @@
 [MODULE::auth_sam]
 INIT_OBJ_FILES = \
 		auth/auth_sam.o
+REQUIRED_SUBSYSTEMS = \
+		SAMDB
 # End MODULE auth_sam
 #######################
 
@@ -22,7 +24,6 @@ INIT_OBJ_FILES = \
 INIT_OBJ_FILES = \
 		auth/auth.o
 ADD_OBJ_FILES = \
-		auth/auth_ntlmssp.o \
 		auth/auth_util.o \
 		auth/pampass.o \
 		auth/pass_check.o