r6028: A MAJOR update to intergrate the new credentails system fully with

GENSEC, and to pull SCHANNEL into GENSEC, by making it less 'special'.

GENSEC now no longer has it's own handling of 'set username' etc,
instead it uses cli_credentials calls.

In order to link the credentails code right though Samba, a lot of
interfaces have changed to remove 'username, domain, password'
arguments, and these have been replaced with a single 'struct
cli_credentials'.

In the session setup code, a new parameter 'workgroup' contains the
client/server current workgroup, which seems unrelated to the
authentication exchange (it was being filled in from the auth info).

This allows in particular kerberos to only call back for passwords
when it actually needs to perform the kinit.

The kerberos code has been modified not to use the SPNEGO provided
'principal name' (in the mechListMIC), but to instead use the name the
host was connected to as.  This better matches Microsoft behaviour,
is more secure and allows better use of standard kerberos functions.

To achieve this, I made changes to our socket code so that the
hostname (before name resolution) is now recorded on the socket.

In schannel, most of the code from librpc/rpc/dcerpc_schannel.c is now
in libcli/auth/schannel.c, and it looks much more like a standard
GENSEC module.  The actual sign/seal code moved to
libcli/auth/schannel_sign.c in a previous commit.

The schannel credentails structure is now merged with the rest of the
credentails, as many of the values (username, workstation, domain)
where already present there.  This makes handling this in a generic
manner much easier, as there is no longer a custom entry-point.

The auth_domain module continues to be developed, but is now just as
functional as auth_winbind.  The changes here are consequential to the
schannel changes.

The only removed function at this point is the RPC-LOGIN test
(simulating the load of a WinXP login), which needs much more work to
clean it up (it contains copies of too much code from all over the
torture suite, and I havn't been able to penetrate its 'structure').

Andrew Bartlett
(This used to be commit 2301a4b38a21aa60917973451687063d83d18d66)

4 files changed, 37 insertions, 49 deletions

diff --git a/source4/libcli/composite/composite.h b/source4/libcli/composite/composite.h
index bf0fb9ed48..18922127ee 100644
--- a/source4/libcli/composite/composite.h
+++ b/source4/libcli/composite/composite.h
@@ -70,12 +70,10 @@ struct smb_composite_fetchfile {
 		const char *dest_host;
 		int port;
 		const char *called_name;
-		const char *calling_name;
 		const char *service;
 		const char *service_type;
-		const char *user;
-		const char *domain;
-		const char *password;
+		struct cli_credentials *credentials;
+		const char *workgroup;
 		const char *filename;
 	} in;
 	struct {
@@ -111,12 +109,10 @@ struct smb_composite_connect {
 		const char *dest_host;
 		int port;
 		const char *called_name;
-		const char *calling_name;
 		const char *service;
 		const char *service_type;
-		const char *user;
-		const char *domain;
-		const char *password;
+		struct cli_credentials *credentials;
+		const char *workgroup;
 	} in;
 	struct {
 		struct smbcli_tree *tree;
@@ -132,9 +128,8 @@ struct smb_composite_sesssetup {
 	struct {
 		uint32_t sesskey;
 		uint32_t capabilities;
-		const char *password;
-		const char *user;
-		const char *domain;
+		struct cli_credentials *credentials;
+		const char *workgroup;
 	} in;
 	struct {
 		uint16_t vuid;
diff --git a/source4/libcli/composite/connect.c b/source4/libcli/composite/connect.c
index 5f5275f7e6..0da71df992 100644
--- a/source4/libcli/composite/connect.c
+++ b/source4/libcli/composite/connect.c
@@ -166,9 +166,8 @@ static NTSTATUS connect_negprot(struct composite_context *c,
 	/* prepare a session setup to establish a security context */
 	state->io_setup->in.sesskey      = state->transport->negotiate.sesskey;
 	state->io_setup->in.capabilities = state->transport->negotiate.capabilities;
-	state->io_setup->in.domain       = io->in.domain;
-	state->io_setup->in.user         = io->in.user;
-	state->io_setup->in.password     = io->in.password;
+	state->io_setup->in.credentials  = io->in.credentials;
+	state->io_setup->in.workgroup    = io->in.workgroup;
 
 	state->creq = smb_composite_sesssetup_send(state->session, state->io_setup);
 	NT_STATUS_HAVE_NO_MEMORY(state->creq);
@@ -214,7 +213,7 @@ static NTSTATUS connect_socket(struct composite_context *c,
 	state->transport = smbcli_transport_init(state->sock, state, True);
 	NT_STATUS_HAVE_NO_MEMORY(state->transport);
 
-	calling.name = io->in.calling_name;
+	calling.name = cli_credentials_get_workstation(io->in.credentials);
 	calling.type = NBT_NAME_CLIENT;
 	calling.scope = NULL;
 
@@ -254,7 +253,7 @@ static NTSTATUS connect_resolve(struct composite_context *c,
 	status = resolve_name_recv(state->creq, state, &address);
 	NT_STATUS_NOT_OK_RETURN(status);
 
-	state->creq = smbcli_sock_connect_send(state->sock, address, state->io->in.port);
+	state->creq = smbcli_sock_connect_send(state->sock, address, state->io->in.port, io->in.dest_host);
 	NT_STATUS_HAVE_NO_MEMORY(state->creq);
 
 	state->stage = CONNECT_SOCKET;
diff --git a/source4/libcli/composite/fetchfile.c b/source4/libcli/composite/fetchfile.c
index 2bf6ef9023..fb9226985e 100644
--- a/source4/libcli/composite/fetchfile.c
+++ b/source4/libcli/composite/fetchfile.c
@@ -140,12 +140,10 @@ struct composite_context *smb_composite_fetchfile_send(struct smb_composite_fetc
 	state->connect->in.dest_host    = io->in.dest_host;
 	state->connect->in.port         = io->in.port;
 	state->connect->in.called_name  = io->in.called_name;
-	state->connect->in.calling_name = io->in.calling_name;
 	state->connect->in.service      = io->in.service;
 	state->connect->in.service_type = io->in.service_type;
-	state->connect->in.user         = io->in.user;
-	state->connect->in.domain       = io->in.domain;
-	state->connect->in.password     = io->in.password;
+	state->connect->in.credentials  = io->in.credentials;
+	state->connect->in.workgroup    = io->in.workgroup;
 
 	state->req = smb_composite_connect_send(state->connect, event_ctx);
 	if (state->req == NULL) goto failed;
diff --git a/source4/libcli/composite/sesssetup.c b/source4/libcli/composite/sesssetup.c
index 07c718b05b..31ca5caed7 100644
--- a/source4/libcli/composite/sesssetup.c
+++ b/source4/libcli/composite/sesssetup.c
@@ -142,7 +142,7 @@ static void request_handler(struct smbcli_request *req)
 	}
 
 	/* enforce the local signing required flag */
-	if (NT_STATUS_IS_OK(c->status) && state->io->in.user && state->io->in.user[0]) {
+	if (NT_STATUS_IS_OK(c->status) && !cli_credentials_is_anonymous(state->io->in.credentials)) {
 		if (!session->transport->negotiate.sign_info.doing_signing 
 		    && session->transport->negotiate.sign_info.mandatory_signing) {
 			DEBUG(0, ("SMB signing required, but server does not support it\n"));
@@ -169,6 +169,7 @@ static struct smbcli_request *session_setup_nt1(struct composite_context *c,
 						struct smb_composite_sesssetup *io) 
 {
 	struct sesssetup_state *state = talloc_get_type(c->private, struct sesssetup_state);
+	const char *password = cli_credentials_get_password(io->in.credentials);
 
 	state->setup.nt1.level           = RAW_SESSSETUP_NT1;
 	state->setup.nt1.in.bufsize      = session->transport->options.max_xmit;
@@ -176,23 +177,23 @@ static struct smbcli_request *session_setup_nt1(struct composite_context *c,
 	state->setup.nt1.in.vc_num       = 1;
 	state->setup.nt1.in.sesskey      = io->in.sesskey;
 	state->setup.nt1.in.capabilities = io->in.capabilities;
-	state->setup.nt1.in.domain       = io->in.domain;
-	state->setup.nt1.in.user         = io->in.user;
 	state->setup.nt1.in.os           = "Unix";
 	state->setup.nt1.in.lanman       = "Samba";
 
-	if (!io->in.password) {
+	state->setup.old.in.domain  = cli_credentials_get_domain(io->in.credentials);
+	state->setup.old.in.user    = cli_credentials_get_username(io->in.credentials);
+	if (!password) {
 		state->setup.nt1.in.password1 = data_blob(NULL, 0);
 		state->setup.nt1.in.password2 = data_blob(NULL, 0);
 	} else if (session->transport->negotiate.sec_mode & 
 		   NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) {
-		state->setup.nt1.in.password1 = lanman_blob(state, io->in.password, 
+		state->setup.nt1.in.password1 = lanman_blob(state, password, 
 							    session->transport->negotiate.secblob);
-		state->setup.nt1.in.password2 = nt_blob(state, io->in.password, 
+		state->setup.nt1.in.password2 = nt_blob(state, password, 
 							session->transport->negotiate.secblob);
-		use_nt1_session_keys(session, io->in.password, &state->setup.nt1.in.password2);
+		use_nt1_session_keys(session, password, &state->setup.nt1.in.password2);
 	} else {
-		state->setup.nt1.in.password1 = data_blob_talloc(state, io->in.password, strlen(io->in.password));
+		state->setup.nt1.in.password1 = data_blob_talloc(state, password, strlen(password));
 		state->setup.nt1.in.password2 = data_blob(NULL, 0);
 	}
 
@@ -208,26 +209,27 @@ static struct smbcli_request *session_setup_old(struct composite_context *c,
 						struct smb_composite_sesssetup *io)
 {
 	struct sesssetup_state *state = talloc_get_type(c->private, struct sesssetup_state);
+	const char *password = cli_credentials_get_password(io->in.credentials);
 
 	state->setup.old.level      = RAW_SESSSETUP_OLD;
 	state->setup.old.in.bufsize = session->transport->options.max_xmit;
 	state->setup.old.in.mpx_max = session->transport->options.max_mux;
 	state->setup.old.in.vc_num  = 1;
 	state->setup.old.in.sesskey = io->in.sesskey;
-	state->setup.old.in.domain  = io->in.domain;
-	state->setup.old.in.user    = io->in.user;
+	state->setup.old.in.domain  = cli_credentials_get_domain(io->in.credentials);
+	state->setup.old.in.user    = cli_credentials_get_username(io->in.credentials);
 	state->setup.old.in.os      = "Unix";
 	state->setup.old.in.lanman  = "Samba";
 	
-	if (!io->in.password) {
+	if (!password) {
 		state->setup.old.in.password = data_blob(NULL, 0);
 	} else if (session->transport->negotiate.sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) {
-		state->setup.old.in.password = lanman_blob(state, io->in.password, 
+		state->setup.old.in.password = lanman_blob(state, password, 
 							   session->transport->negotiate.secblob);
 	} else {
 		state->setup.old.in.password = data_blob_talloc(state,
-								io->in.password, 
-								strlen(io->in.password));
+								password, 
+								strlen(password));
 	}
 	
 	return smb_raw_session_setup_send(session, &state->setup);
@@ -253,9 +255,10 @@ static struct smbcli_request *session_setup_spnego(struct composite_context *c,
 	state->setup.spnego.in.vc_num       = 1;
 	state->setup.spnego.in.sesskey      = io->in.sesskey;
 	state->setup.spnego.in.capabilities = io->in.capabilities;
-	state->setup.spnego.in.domain       = io->in.domain;
 	state->setup.spnego.in.os           = "Unix";
 	state->setup.spnego.in.lanman       = "Samba";
+	state->setup.spnego.in.workgroup    = io->in.workgroup;
+
 	state->setup.spnego.out.vuid        = session->vuid;
 
 	smbcli_temp_set_signing(session->transport);
@@ -268,30 +271,23 @@ static struct smbcli_request *session_setup_spnego(struct composite_context *c,
 
 	gensec_want_feature(session->gensec, GENSEC_FEATURE_SESSION_KEY);
 
-	status = gensec_set_domain(session->gensec, io->in.domain);
-	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(1, ("Failed to start set GENSEC client domain to %s: %s\n", 
-			  io->in.domain, nt_errstr(status)));
-		return NULL;
-	}
-
-	status = gensec_set_username(session->gensec, io->in.user);
+	status = gensec_set_credentials(session->gensec, io->in.credentials);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(1, ("Failed to start set GENSEC client username to %s: %s\n", 
-			  io->in.user, nt_errstr(status)));
+		DEBUG(1, ("Failed to start set GENSEC client credentails: %s\n", 
+			  nt_errstr(status)));
 		return NULL;
 	}
 
-	status = gensec_set_password(session->gensec, io->in.password);
+	status = gensec_set_target_hostname(session->gensec, session->transport->socket->hostname);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(1, ("Failed to start set GENSEC client password: %s\n", 
+		DEBUG(1, ("Failed to start set GENSEC target hostname: %s\n", 
 			  nt_errstr(status)));
 		return NULL;
 	}
 
-	status = gensec_set_target_hostname(session->gensec, session->transport->socket->hostname);
+	status = gensec_set_target_service(session->gensec, "cifs");
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(1, ("Failed to start set GENSEC target hostname: %s\n", 
+		DEBUG(1, ("Failed to start set GENSEC target service: %s\n", 
 			  nt_errstr(status)));
 		return NULL;
 	}