sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

dcesrv_core: better fault codes dcesrv_auth_prepare_auth3()

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14356

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Oct 10 15:17:46 UTC 2024 on atb-devel-224
This commit is contained in:
Stefan Metzmacher 2020-11-13 02:47:51 +01:00 committed by Andreas Schneider
parent 8b8e4ff1b1
commit 9263ce5752
3 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
librpc/rpc/dcesrv_auth.c
View File

@ -445,11 +445,38 @@ bool dcesrv_auth_prepare_auth3(struct dcesrv_call_state *call)
struct dcesrv_auth *auth = call->auth_state; struct dcesrv_auth *auth = call->auth_state;
NTSTATUS status; NTSTATUS status;
if (pkt->auth_length == 0) { if (pkt->frag_length > call->conn->transport_max_recv_frag) {
/*
* Note that we don't check against the negotiated
* max_recv_frag, but a hard coded value from
* the transport.
*/
call->fault_code = DCERPC_NCA_S_PROTO_ERROR;
return false;
}
if (pkt->auth_length > 4096) {
call->fault_code = DCERPC_NCA_S_PROTO_ERROR;
return false; return false;
} }
if (auth->auth_finished) { if (auth->auth_finished) {
call->fault_code = DCERPC_NCA_S_PROTO_ERROR;
return false;
}
if (!auth->auth_started) {
call->fault_code = DCERPC_NCA_S_PROTO_ERROR;
return false;
}
if (auth->auth_invalid) {
call->fault_code = DCERPC_NCA_S_PROTO_ERROR;
return false;
}
if (pkt->auth_length == 0) {
call->fault_code = DCERPC_NCA_S_FAULT_REMOTE_NO_MEMORY;
return false; return false;
} }
@ -465,23 +492,36 @@ bool dcesrv_auth_prepare_auth3(struct dcesrv_call_state *call)
status = dcerpc_pull_auth_trailer(pkt, call, &pkt->u.auth3.auth_info, status = dcerpc_pull_auth_trailer(pkt, call, &pkt->u.auth3.auth_info,
&call->in_auth_info, NULL, true); &call->in_auth_info, NULL, true);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
struct dcerpc_auth *auth_info = &call->in_auth_info;
uint32_t nr = auth_info->auth_context_id;
/* /*
* Windows returns DCERPC_NCA_S_FAULT_REMOTE_NO_MEMORY * Windows returns DCERPC_NCA_S_FAULT_REMOTE_NO_MEMORY
* instead of DCERPC_NCA_S_PROTO_ERROR. * instead of DCERPC_NCA_S_PROTO_ERROR in most cases.
*/ */
call->fault_code = DCERPC_NCA_S_FAULT_REMOTE_NO_MEMORY; call->fault_code = DCERPC_NCA_S_FAULT_REMOTE_NO_MEMORY;
if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROTOCOL_ERROR) &&
nr != DCERPC_BIND_NAK_REASON_PROTOCOL_VERSION_NOT_SUPPORTED)
{
call->fault_code = DCERPC_NCA_S_PROTO_ERROR;
}
return false; return false;
} }
if (call->in_auth_info.auth_type != auth->auth_type) { if (call->in_auth_info.auth_type != auth->auth_type) {
call->fault_code = DCERPC_NCA_S_FAULT_REMOTE_NO_MEMORY;
return false; return false;
} }
if (call->in_auth_info.auth_level != auth->auth_level) { if (call->in_auth_info.auth_level != auth->auth_level) {
call->fault_code = DCERPC_NCA_S_FAULT_REMOTE_NO_MEMORY;
return false; return false;
} }
if (call->in_auth_info.auth_context_id != auth->auth_context_id) { if (call->in_auth_info.auth_context_id != auth->auth_context_id) {
call->fault_code = DCERPC_FAULT_ACCESS_DENIED;
return false; return false;
} }

8
librpc/rpc/dcesrv_core.c
View File

@ -1419,14 +1419,6 @@ static NTSTATUS dcesrv_auth3(struct dcesrv_call_state *call)
struct tevent_req *subreq = NULL; struct tevent_req *subreq = NULL;
NTSTATUS status; NTSTATUS status;
if (!auth->auth_started) {
return dcesrv_fault_disconnect(call, DCERPC_NCA_S_PROTO_ERROR);
}
if (auth->auth_finished) {
return dcesrv_fault_disconnect(call, DCERPC_NCA_S_PROTO_ERROR);
}
status = dcerpc_verify_ncacn_packet_header(&call->pkt, status = dcerpc_verify_ncacn_packet_header(&call->pkt,
DCERPC_PKT_AUTH3, DCERPC_PKT_AUTH3,
call->pkt.u.auth3.auth_info.length, call->pkt.u.auth3.auth_info.length,

3
selftest/knownfail.d/dcerpc-auth-pad
View File

@ -1,3 +0,0 @@
^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_auth_pad_auth3_align2_ntlm
^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_auth_pad_auth3_align2_spnego
^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_auth_tail_pad_spnego_auth3