1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-17 02:05:21 +03:00

Currently we don't SPNEGO negotiate back to NTLMSSP. Note this.

Jeremy.
This commit is contained in:
Jeremy Allison 2008-02-14 18:08:23 -08:00
parent 8cd04b948b
commit 67768fc71f

View File

@ -1105,7 +1105,7 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
char *OIDs[ASN1_MAX_OIDS]; char *OIDs[ASN1_MAX_OIDS];
int i; int i;
NTSTATUS status; NTSTATUS status;
bool got_kerberos_mechanism = False; bool got_kerberos_mechanism = false;
AUTH_NTLMSSP_STATE *a = NULL; AUTH_NTLMSSP_STATE *a = NULL;
RPC_HDR_AUTH auth_info; RPC_HDR_AUTH auth_info;
@ -1133,7 +1133,7 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
} }
if (strcmp(OID_KERBEROS5, OIDs[0]) == 0 || strcmp(OID_KERBEROS5_OLD, OIDs[0]) == 0) { if (strcmp(OID_KERBEROS5, OIDs[0]) == 0 || strcmp(OID_KERBEROS5_OLD, OIDs[0]) == 0) {
got_kerberos_mechanism = True; got_kerberos_mechanism = true;
} }
for (i=0;OIDs[i];i++) { for (i=0;OIDs[i];i++) {
@ -1154,28 +1154,39 @@ static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
free_pipe_ntlmssp_auth_data(&p->auth); free_pipe_ntlmssp_auth_data(&p->auth);
} }
/* Initialize the NTLM engine. */ if (!got_kerberos_mechanism) {
status = auth_ntlmssp_start(&a); /* Initialize the NTLM engine. */
if (!NT_STATUS_IS_OK(status)) { status = auth_ntlmssp_start(&a);
goto err; if (!NT_STATUS_IS_OK(status)) {
goto err;
}
/*
* Pass the first security blob of data to it.
* This can return an error or NT_STATUS_MORE_PROCESSING_REQUIRED
* which means we need another packet to complete the bind.
*/
status = auth_ntlmssp_update(a, secblob, &chal);
if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
DEBUG(3,("pipe_spnego_auth_bind_negotiate: auth_ntlmssp_update failed.\n"));
goto err;
}
/* Generate the response blob we need for step 2 of the bind. */
response = spnego_gen_auth_response(&chal, status, OID_NTLMSSP);
} else {
/*
* SPNEGO negotiate down to NTLMSSP. The subsequent
* code to process follow-up packets is not complete
* yet. JRA.
*/
response = spnego_gen_auth_response(NULL,
NT_STATUS_MORE_PROCESSING_REQUIRED,
OID_NTLMSSP);
} }
/*
* Pass the first security blob of data to it.
* This can return an error or NT_STATUS_MORE_PROCESSING_REQUIRED
* which means we need another packet to complete the bind.
*/
status = auth_ntlmssp_update(a, secblob, &chal);
if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
DEBUG(3,("pipe_spnego_auth_bind_negotiate: auth_ntlmssp_update failed.\n"));
goto err;
}
/* Generate the response blob we need for step 2 of the bind. */
response = spnego_gen_auth_response(&chal, status, OID_NTLMSSP);
/* Copy the blob into the pout_auth parse struct */ /* Copy the blob into the pout_auth parse struct */
init_rpc_hdr_auth(&auth_info, RPC_SPNEGO_AUTH_TYPE, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1); init_rpc_hdr_auth(&auth_info, RPC_SPNEGO_AUTH_TYPE, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1);
if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) { if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
@ -1231,6 +1242,10 @@ static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
ZERO_STRUCT(auth_reply); ZERO_STRUCT(auth_reply);
ZERO_STRUCT(response); ZERO_STRUCT(response);
/*
* NB. If we've negotiated down from krb5 to NTLMSSP we'll currently
* fail here as 'a' == NULL.
*/
if (p->auth.auth_type != PIPE_AUTH_TYPE_SPNEGO_NTLMSSP || !a) { if (p->auth.auth_type != PIPE_AUTH_TYPE_SPNEGO_NTLMSSP || !a) {
DEBUG(0,("pipe_spnego_auth_bind_continue: not in NTLMSSP auth state.\n")); DEBUG(0,("pipe_spnego_auth_bind_continue: not in NTLMSSP auth state.\n"));
goto err; goto err;
@ -1259,7 +1274,7 @@ static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
* The following call actually checks the challenge/response data. * The following call actually checks the challenge/response data.
* for correctness against the given DOMAIN\user name. * for correctness against the given DOMAIN\user name.
*/ */
if (!pipe_ntlmssp_verify_final(p, &auth_blob)) { if (!pipe_ntlmssp_verify_final(p, &auth_blob)) {
goto err; goto err;
} }