#include "includes.h"
#include "../libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/ndr_schannel.h"
+#include "../libcli/auth/schannel.h"
+#include "../libcli/auth/schannel_proto.h"
+#include "../libcli/auth/spnego.h"
extern struct current_user current_user;
memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
/* Change the incoming request header to a response. */
- p->hdr.pkt_type = RPC_RESPONSE;
+ p->hdr.pkt_type = DCERPC_PKT_RESPONSE;
/* Set up rpc header flags. */
if (p->out_data.data_sent_length == 0) {
- p->hdr.flags = RPC_FLG_FIRST;
+ p->hdr.flags = DCERPC_PFC_FLAG_FIRST;
} else {
p->hdr.flags = 0;
}
*/
if(p->out_data.data_sent_length + data_len >= prs_offset(&p->out_data.rdata)) {
- p->hdr.flags |= RPC_FLG_LAST;
+ p->hdr.flags |= DCERPC_PFC_FLAG_LAST;
if (data_len_left % 8) {
ss_padding_len = 8 - (data_len_left % 8);
DEBUG(10,("create_next_pdu_ntlmssp: adding sign/seal padding of %u\n",
uint32 data_space_available;
uint32 data_len_left;
uint32 data_pos;
+ NTSTATUS status;
/*
* If we're in the fault state, keep returning fault PDU's until
memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
/* Change the incoming request header to a response. */
- p->hdr.pkt_type = RPC_RESPONSE;
+ p->hdr.pkt_type = DCERPC_PKT_RESPONSE;
/* Set up rpc header flags. */
if (p->out_data.data_sent_length == 0) {
- p->hdr.flags = RPC_FLG_FIRST;
+ p->hdr.flags = DCERPC_PFC_FLAG_FIRST;
} else {
p->hdr.flags = 0;
}
*/
if(p->out_data.data_sent_length + data_len >= prs_offset(&p->out_data.rdata)) {
- p->hdr.flags |= RPC_FLG_LAST;
+ p->hdr.flags |= DCERPC_PFC_FLAG_LAST;
if (data_len_left % 8) {
ss_padding_len = 8 - (data_len_left % 8);
DEBUG(10,("create_next_pdu_schannel: adding sign/seal padding of %u\n",
* Schannel processing.
*/
RPC_HDR_AUTH auth_info;
- struct NL_AUTH_SIGNATURE verf;
DATA_BLOB blob;
- enum ndr_err_code ndr_err;
+ uint8_t *data;
/* Check it's the type of reply we were expecting to decode */
return False;
}
- schannel_encode(p->auth.a_u.schannel_auth,
- p->auth.auth_level, SENDER_IS_ACCEPTOR, &verf,
- prs_data_p(&p->out_data.frag) + data_pos,
- data_len + ss_padding_len);
+ data = (uint8_t *)prs_data_p(&p->out_data.frag) + data_pos;
- /* Finally marshall the blob. */
+ switch (p->auth.auth_level) {
+ case DCERPC_AUTH_LEVEL_PRIVACY:
+ status = netsec_outgoing_packet(p->auth.a_u.schannel_auth,
+ talloc_tos(),
+ true,
+ data,
+ data_len + ss_padding_len,
+ &blob);
+ break;
+ case DCERPC_AUTH_LEVEL_INTEGRITY:
+ status = netsec_outgoing_packet(p->auth.a_u.schannel_auth,
+ talloc_tos(),
+ false,
+ data,
+ data_len + ss_padding_len,
+ &blob);
+ break;
+ default:
+ status = NT_STATUS_INTERNAL_ERROR;
+ break;
+ }
- ndr_err = ndr_push_struct_blob(&blob, talloc_tos(), NULL, &verf,
- (ndr_push_flags_fn_t)ndr_push_NL_AUTH_SIGNATURE);
- if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0,("create_next_pdu_schannel: failed to process packet: %s\n",
+ nt_errstr(status)));
prs_mem_free(&p->out_data.frag);
return false;
}
+ /* Finally marshall the blob. */
+
if (DEBUGLEVEL >= 10) {
- NDR_PRINT_DEBUG(NL_AUTH_SIGNATURE, &verf);
+ dump_NL_AUTH_SIGNATURE(talloc_tos(), &blob);
}
if (!prs_copy_data_in(&p->out_data.frag, (const char *)blob.data, blob.length)) {
prs_mem_free(&p->out_data.frag);
return false;
}
-
- p->auth.a_u.schannel_auth->seq_num++;
}
/*
memset((char *)&hdr_resp, '\0', sizeof(hdr_resp));
/* Change the incoming request header to a response. */
- p->hdr.pkt_type = RPC_RESPONSE;
+ p->hdr.pkt_type = DCERPC_PKT_RESPONSE;
/* Set up rpc header flags. */
if (p->out_data.data_sent_length == 0) {
- p->hdr.flags = RPC_FLG_FIRST;
+ p->hdr.flags = DCERPC_PFC_FLAG_FIRST;
} else {
p->hdr.flags = 0;
}
*/
if(p->out_data.data_sent_length + data_len >= prs_offset(&p->out_data.rdata)) {
- p->hdr.flags |= RPC_FLG_LAST;
+ p->hdr.flags |= DCERPC_PFC_FLAG_LAST;
}
/*
bool ret;
DEBUG(5,("pipe_ntlmssp_verify_final: pipe %s checking user details\n",
- get_pipe_name_from_iface(&p->syntax)));
+ get_pipe_name_tos(p)));
ZERO_STRUCT(reply);
if (!(a->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
DEBUG(0,("pipe_ntlmssp_verify_final: pipe %s : packet integrity requested "
"but client declined signing.\n",
- get_pipe_name_from_iface(&p->syntax)));
+ get_pipe_name_tos(p)));
return False;
}
}
if (!(a->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL)) {
DEBUG(0,("pipe_ntlmssp_verify_final: pipe %s : packet privacy requested "
"but client declined sealing.\n",
- get_pipe_name_from_iface(&p->syntax)));
+ get_pipe_name_tos(p)));
return False;
}
}
* Initialize a bind_nak header.
*/
- init_rpc_hdr(&nak_hdr, RPC_BINDNACK, RPC_FLG_FIRST | RPC_FLG_LAST,
+ init_rpc_hdr(&nak_hdr, DCERPC_PKT_BIND_NAK, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
p->hdr.call_id, RPC_HEADER_LEN + sizeof(uint16), 0);
/*
* Initialize a fault header.
*/
- init_rpc_hdr(&fault_hdr, RPC_FAULT, RPC_FLG_FIRST | RPC_FLG_LAST | RPC_FLG_NOCALL,
+ init_rpc_hdr(&fault_hdr, DCERPC_PKT_FAULT, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST | DCERPC_PFC_FLAG_DID_NOT_EXECUTE,
p->hdr.call_id, RPC_HEADER_LEN + RPC_HDR_RESP_LEN + RPC_HDR_FAULT_LEN, 0);
/*
* Initialize a cancel_ack header.
*/
- init_rpc_hdr(&ack_reply_hdr, RPC_CANCEL_ACK, RPC_FLG_FIRST | RPC_FLG_LAST,
+ init_rpc_hdr(&ack_reply_hdr, DCERPC_PKT_CANCEL_ACK, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
p->hdr.call_id, RPC_HEADER_LEN, 0);
/*
int i=0;
struct pipe_rpc_fns *context_fns;
- DEBUG(3,("check_bind_req for %s\n",
- get_pipe_name_from_iface(&p->syntax)));
+ DEBUG(3,("check_bind_req for %s\n", get_pipe_name_tos(p)));
/* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */
*******************************************************************/
NTSTATUS rpc_srv_register(int version, const char *clnt, const char *srv,
- const struct ndr_interface_table *iface,
+ const char *interface, uint32_t interface_version,
const struct api_struct *cmds, int size)
{
struct rpc_table *rpc_entry;
+ struct ndr_syntax_id syntax;
if (!clnt || !srv || !cmds) {
return NT_STATUS_INVALID_PARAMETER;
}
+ if (!ndr_syntax_from_string(interface, interface_version, &syntax)) {
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
if (version != SMB_RPC_INTERFACE_VERSION) {
DEBUG(0,("Can't register rpc commands!\n"
"You tried to register a rpc module with SMB_RPC_INTERFACE_VERSION %d"
ZERO_STRUCTP(rpc_entry);
rpc_entry->pipe.clnt = SMB_STRDUP(clnt);
rpc_entry->pipe.srv = SMB_STRDUP(srv);
- rpc_entry->rpc_interface = iface->syntax_id;
+ rpc_entry->rpc_interface = syntax;
rpc_entry->cmds = cmds;
rpc_entry->n_cmds = size;
{
const char *pipename = cli_filename;
int i;
+ NTSTATUS status;
if (strnequal(pipename, "\\PIPE\\", 6)) {
pipename += 5;
}
}
- DEBUG(10, ("is_known_pipename: %s unknown\n", cli_filename));
+ status = smb_probe_module("rpc", pipename);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(10, ("is_known_pipename: %s unknown\n", cli_filename));
+ return false;
+ }
+ DEBUG(10, ("is_known_pipename: %s loaded dynamically\n", pipename));
+
+ /*
+ * Scan the list again for the interface id
+ */
+
+ for (i=0; i<rpc_lookup_size; i++) {
+ if (strequal(pipename, rpc_lookup[i].pipe.clnt)) {
+ *syntax = rpc_lookup[i].rpc_interface;
+ return true;
+ }
+ }
+
+ DEBUG(10, ("is_known_pipename: pipe %s did not register itself!\n",
+ pipename));
+
return false;
}
*/
become_root();
- status = schannel_fetch_session_key(p->mem_ctx,
+ status = schannel_fetch_session_key(p,
neg.oem_netbios_computer.a,
&creds);
unbecome_root();
return False;
}
- p->auth.a_u.schannel_auth = talloc(p, struct schannel_auth_struct);
+ p->auth.a_u.schannel_auth = talloc(p, struct schannel_state);
if (!p->auth.a_u.schannel_auth) {
TALLOC_FREE(creds);
return False;
}
- memset(p->auth.a_u.schannel_auth->sess_key, 0, sizeof(p->auth.a_u.schannel_auth->sess_key));
- memcpy(p->auth.a_u.schannel_auth->sess_key, creds->session_key,
- sizeof(creds->session_key));
-
- TALLOC_FREE(creds);
-
+ p->auth.a_u.schannel_auth->state = SCHANNEL_STATE_START;
p->auth.a_u.schannel_auth->seq_num = 0;
+ p->auth.a_u.schannel_auth->initiator = false;
+ p->auth.a_u.schannel_auth->creds = creds;
/*
* JRA. Should we also copy the schannel session key into the pipe session key p->session_key
DEBUG(10,("pipe_ntlmssp_auth_bind: NTLMSSP auth started\n"));
- /* We can't set pipe_bound True yet - we need an RPC_AUTH3 response packet... */
+ /* We can't set pipe_bound True yet - we need an DCERPC_PKT_AUTH3 response packet... */
return True;
err:
prs_struct out_auth;
int i = 0;
int auth_len = 0;
- unsigned int auth_type = RPC_ANONYMOUS_AUTH_TYPE;
+ unsigned int auth_type = DCERPC_AUTH_TYPE_NONE;
/* No rebinds on a bound pipe - use alter context. */
if (p->pipe_bound) {
DEBUG(2,("api_pipe_bind_req: rejecting bind request on bound "
- "pipe %s.\n", get_pipe_name_from_iface(&p->syntax)));
+ "pipe %s.\n", get_pipe_name_tos(p)));
return setup_bind_nak(p);
}
NTSTATUS status;
status = smb_probe_module(
- "rpc", get_pipe_name_from_iface(
+ "rpc", get_pipe_name_from_syntax(
+ talloc_tos(),
&hdr_rb.rpc_context[0].abstract));
if (NT_STATUS_IS_ERR(status)) {
DEBUG(3,("api_pipe_bind_req: Unknown pipe name %s in bind request.\n",
- get_pipe_name_from_iface(&hdr_rb.rpc_context[0].abstract)));
+ get_pipe_name_from_syntax(
+ talloc_tos(),
+ &hdr_rb.rpc_context[0].abstract)));
prs_mem_free(&p->out_data.frag);
prs_mem_free(&out_hdr_ba);
prs_mem_free(&out_auth);
for (i = 0; i < rpc_lookup_size; i++) {
if (strequal(rpc_lookup[i].pipe.clnt,
- get_pipe_name_from_iface(&p->syntax))) {
+ get_pipe_name_tos(p))) {
DEBUG(3, ("api_pipe_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
rpc_lookup[i].pipe.clnt, rpc_lookup[i].pipe.srv));
break;
if (i == rpc_lookup_size) {
DEBUG(0, ("module %s doesn't provide functions for "
- "pipe %s!\n",
- get_pipe_name_from_iface(&p->syntax),
- get_pipe_name_from_iface(&p->syntax)));
+ "pipe %s!\n", get_pipe_name_tos(p),
+ get_pipe_name_tos(p)));
goto err_exit;
}
}
}
break;
- case RPC_ANONYMOUS_AUTH_TYPE:
+ case DCERPC_AUTH_TYPE_NONE:
/* Unauthenticated bind request. */
/* We're finished - no more packets. */
p->auth.auth_type = PIPE_AUTH_TYPE_NONE;
auth_len = prs_offset(&out_auth) - RPC_HDR_AUTH_LEN;
}
- init_rpc_hdr(&p->hdr, RPC_BINDACK, RPC_FLG_FIRST | RPC_FLG_LAST,
+ init_rpc_hdr(&p->hdr, DCERPC_PKT_BIND_ACK, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
p->hdr.call_id,
RPC_HEADER_LEN + prs_offset(&out_hdr_ba) + prs_offset(&out_auth),
auth_len);
auth_len = prs_offset(&out_auth) - RPC_HDR_AUTH_LEN;
}
- init_rpc_hdr(&p->hdr, RPC_ALTCONTRESP, RPC_FLG_FIRST | RPC_FLG_LAST,
+ init_rpc_hdr(&p->hdr, DCERPC_PKT_ALTER_RESP, DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST,
p->hdr.call_id,
RPC_HEADER_LEN + prs_offset(&out_hdr_ba) + prs_offset(&out_auth),
auth_len);
uint32 auth_len;
uint32 save_offset = prs_offset(rpc_in);
RPC_HDR_AUTH auth_info;
- struct NL_AUTH_SIGNATURE schannel_chk;
- enum ndr_err_code ndr_err;
DATA_BLOB blob;
+ NTSTATUS status;
+ uint8_t *data;
auth_len = p->hdr.auth_len;
blob = data_blob_const(prs_data_p(rpc_in) + prs_offset(rpc_in), auth_len);
- ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), NULL, &schannel_chk,
- (ndr_pull_flags_fn_t)ndr_pull_NL_AUTH_SIGNATURE);
- if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- DEBUG(0,("failed to pull NL_AUTH_SIGNATURE\n"));
- dump_data(2, blob.data, blob.length);
- return false;
- }
-
if (DEBUGLEVEL >= 10) {
- NDR_PRINT_DEBUG(NL_AUTH_SIGNATURE, &schannel_chk);
+ dump_NL_AUTH_SIGNATURE(talloc_tos(), &blob);
+ }
+
+ data = (uint8_t *)prs_data_p(rpc_in)+RPC_HDR_REQ_LEN;
+
+ switch (auth_info.auth_level) {
+ case DCERPC_AUTH_LEVEL_PRIVACY:
+ status = netsec_incoming_packet(p->auth.a_u.schannel_auth,
+ talloc_tos(),
+ true,
+ data,
+ data_len,
+ &blob);
+ break;
+ case DCERPC_AUTH_LEVEL_INTEGRITY:
+ status = netsec_incoming_packet(p->auth.a_u.schannel_auth,
+ talloc_tos(),
+ false,
+ data,
+ data_len,
+ &blob);
+ break;
+ default:
+ status = NT_STATUS_INTERNAL_ERROR;
+ break;
}
- if (!schannel_decode(p->auth.a_u.schannel_auth,
- p->auth.auth_level,
- SENDER_IS_INITIATOR,
- &schannel_chk,
- prs_data_p(rpc_in)+RPC_HDR_REQ_LEN, data_len)) {
- DEBUG(3,("failed to decode PDU\n"));
- return False;
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0,("failed to unseal packet: %s\n", nt_errstr(status)));
+ return false;
}
/*
return False;
}
- /* The sequence number gets incremented on both send and receive. */
- p->auth.a_u.schannel_auth->seq_num++;
-
/*
* Remember the padding length. We must remove it from the real data
* stream once the sign/seal is done.
changed_user = True;
}
- DEBUG(5, ("Requested \\PIPE\\%s\n",
- get_pipe_name_from_iface(&p->syntax)));
+ DEBUG(5, ("Requested \\PIPE\\%s\n", get_pipe_name_tos(p)));
/* get the set of RPC functions for this context */
}
else {
DEBUG(0,("api_pipe_request: No rpc function table associated with context [%d] on pipe [%s]\n",
- p->hdr_req.context_id,
- get_pipe_name_from_iface(&p->syntax)));
+ p->hdr_req.context_id, get_pipe_name_tos(p)));
}
if (changed_user) {
uint32 offset1, offset2;
/* interpret the command */
- DEBUG(4,("api_rpcTNP: %s op 0x%x - ",
- get_pipe_name_from_iface(&p->syntax), p->hdr_req.opnum));
+ DEBUG(4,("api_rpcTNP: %s op 0x%x - ", get_pipe_name_tos(p),
+ p->hdr_req.opnum));
if (DEBUGLEVEL >= 50) {
fstring name;
- slprintf(name, sizeof(name)-1, "in_%s",
- get_pipe_name_from_iface(&p->syntax));
+ slprintf(name, sizeof(name)-1, "in_%s", get_pipe_name_tos(p));
prs_dump(name, p->hdr_req.opnum, &p->in_data.data);
}
fn_num, api_rpc_cmds[fn_num].fn));
/* do the actual command */
if(!api_rpc_cmds[fn_num].fn(p)) {
- DEBUG(0,("api_rpcTNP: %s: %s failed.\n",
- get_pipe_name_from_iface(&p->syntax),
+ DEBUG(0,("api_rpcTNP: %s: %s failed.\n", get_pipe_name_tos(p),
api_rpc_cmds[fn_num].name));
prs_mem_free(&p->out_data.rdata);
return False;
prs_set_offset(&p->out_data.rdata, offset1);
if (DEBUGLEVEL >= 50) {
fstring name;
- slprintf(name, sizeof(name)-1, "out_%s",
- get_pipe_name_from_iface(&p->syntax));
+ slprintf(name, sizeof(name)-1, "out_%s", get_pipe_name_tos(p));
prs_dump(name, p->hdr_req.opnum, &p->out_data.rdata);
}
prs_set_offset(&p->out_data.rdata, offset2);
DEBUG(5,("api_rpcTNP: called %s successfully\n",
- get_pipe_name_from_iface(&p->syntax)));
+ get_pipe_name_tos(p)));
/* Check for buffer underflow in rpc parsing */
git.samba.org / samba.git / blobdiff