X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source4%2Frpc_server%2Fremote%2Fdcesrv_remote.c;h=45944bc227ecacb973989156339c4ea04c4022a6;hb=refs%2Fheads%2Frpc-proxy;hp=825adddfee2f09f75aa3d207639dde9bc89bc5e9;hpb=645711c602313940dcf80ec786557920ecfbf884;p=abartlet%2Fsamba.git%2F.git

diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c
index 825adddfee2..45944bc227e 100644
--- a/source4/rpc_server/remote/dcesrv_remote.c
+++ b/source4/rpc_server/remote/dcesrv_remote.c
@@ -3,10 +3,12 @@
    remote dcerpc operations
 
    Copyright (C) Stefan (metze) Metzmacher 2004
-   
+   Copyright (C) Julien Kerihuel 2008-2009
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2010
+
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,69 +17,148 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "rpc_server/dcerpc_server.h"
+#include "auth/auth.h"
+#include "auth/credentials/credentials.h"
+#include "librpc/ndr/ndr_table.h"
+#include "param/param.h"
+
 
 struct dcesrv_remote_private {
 	struct dcerpc_pipe *c_pipe;
 };
 
-static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct dcesrv_interface *iface)
+static NTSTATUS remote_op_reply(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, void *r)
+{
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct dcesrv_interface *iface, uint32_t if_version)
 {
         NTSTATUS status;
-        struct dcesrv_remote_private *private;
-	const char *binding = lp_parm_string(-1, "dcerpc_remote", "binding");
+	const struct ndr_interface_table *table;
+	struct dcesrv_remote_private *priv;
+	const char *binding = lp_parm_string(dce_call->conn->dce_ctx->lp_ctx, NULL, "dcerpc_remote", "binding");
+	const char *user, *pass, *domain;
 	struct cli_credentials *credentials;
+	bool must_free_credentials = true;
+	bool machine_account;
+	struct dcerpc_binding		*b;
+	struct composite_context	*pipe_conn_req;
+
+	machine_account = lp_parm_bool(dce_call->conn->dce_ctx->lp_ctx, NULL, "dcerpc_remote", "use_machine_account", false);
+
+	priv = talloc(dce_call->conn, struct dcesrv_remote_private);
+	if (!priv) {
+		return NT_STATUS_NO_MEMORY;	
+	}
+	
+	priv->c_pipe = NULL;
+	dce_call->context->private_data = priv;
 
 	if (!binding) {
-		DEBUG(0,("You must specify a ncacn binding string\n"));
+		DEBUG(0,("You must specify a DCE/RPC binding string\n"));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
-	private = talloc(dce_call->conn, struct dcesrv_remote_private);
-	if (!private) {
-		return NT_STATUS_NO_MEMORY;	
+	user = lp_parm_string(dce_call->conn->dce_ctx->lp_ctx, NULL, "dcerpc_remote", "user");
+	pass = lp_parm_string(dce_call->conn->dce_ctx->lp_ctx, NULL, "dcerpc_remote", "password");
+	domain = lp_parm_string(dce_call->conn->dce_ctx->lp_ctx, NULL, "dceprc_remote", "domain");
+
+	table = ndr_table_by_uuid(&iface->syntax_id.uuid); /* FIXME: What about if_version ? */
+	if (!table) {
+		dce_call->fault_code = DCERPC_FAULT_UNK_IF;
+		return NT_STATUS_NET_WRITE_FAULT;
+	}
+
+	if (user && pass) {
+		DEBUG(5, ("dcerpc_remote: RPC Proxy: Using specified account\n"));
+		credentials = cli_credentials_init(priv);
+		if (!credentials) {
+			return NT_STATUS_NO_MEMORY;
+		}
+		cli_credentials_set_conf(credentials, dce_call->conn->dce_ctx->lp_ctx);
+		cli_credentials_set_username(credentials, user, CRED_SPECIFIED);
+		if (domain) {
+			cli_credentials_set_domain(credentials, domain, CRED_SPECIFIED);
+		}
+		cli_credentials_set_password(credentials, pass, CRED_SPECIFIED);
+	} else if (machine_account) {
+		DEBUG(5, ("dcerpc_remote: RPC Proxy: Using machine account\n"));
+		credentials = cli_credentials_init(priv);
+		cli_credentials_set_conf(credentials, dce_call->conn->dce_ctx->lp_ctx);
+		if (domain) {
+			cli_credentials_set_domain(credentials, domain, CRED_SPECIFIED);
+		}
+		status = cli_credentials_set_machine_account(credentials, dce_call->conn->dce_ctx->lp_ctx);
+		if (!NT_STATUS_IS_OK(status)) {
+			return status;
+		}
+	} else if (dce_call->conn->auth_state.session_info->credentials) {
+		DEBUG(5, ("dcerpc_remote: RPC Proxy: Using delegated credentials\n"));
+		credentials = dce_call->conn->auth_state.session_info->credentials;
+		must_free_credentials = false;
+	} else {
+		DEBUG(1,("dcerpc_remote: RPC Proxy: You must supply binding, user and password or have delegated credentials\n"));
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	/* parse binding string to the structure */
+	status = dcerpc_parse_binding(dce_call->context, binding, &b);
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(0, ("Failed to parse dcerpc binding '%s'\n", binding));
+		return status;
 	}
 	
-	credentials = cli_credentials_init(private);
+	DEBUG(3, ("Using binding %s\n", dcerpc_binding_string(dce_call->context, b)));
+	
+	/* If we already have a remote association group ID, then use that */
+	if (dce_call->context->assoc_group->proxied_id != 0) {
+		b->assoc_group_id = dce_call->context->assoc_group->proxied_id;
+	}
 
-	cli_credentials_set_username(credentials, lp_parm_string(-1, "dcerpc_remote", "username"), CRED_SPECIFIED);
-	cli_credentials_set_workstation(credentials, lp_netbios_name(), CRED_SPECIFIED);
-	cli_credentials_set_domain(credentials, lp_workgroup(), CRED_SPECIFIED);
-	cli_credentials_set_password(credentials, lp_parm_string(-1, "dcerpc_remote", "password"), CRED_SPECIFIED);
+	b->object.if_version = if_version;
 
-	status = dcerpc_pipe_connect(private, 
-				     &(private->c_pipe), binding, 
-				     iface->uuid, iface->if_version, 
-				     credentials);
+	pipe_conn_req = dcerpc_pipe_connect_b_send(dce_call->context, b, table,
+						   credentials, dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx);
+	status = dcerpc_pipe_connect_b_recv(pipe_conn_req, dce_call->context, &(priv->c_pipe));
+	
+	if (must_free_credentials) {
+		talloc_free(credentials);
+	}
 
-	talloc_free(credentials);
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	dce_call->context->private = private;
+	if (dce_call->context->assoc_group->proxied_id == 0) {
+		dce_call->context->assoc_group->proxied_id = priv->c_pipe->assoc_group_id;
+	}
+
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 
 	return NT_STATUS_OK;	
 }
 
 static void remote_op_unbind(struct dcesrv_connection_context *context, const struct dcesrv_interface *iface)
 {
-	struct dcesrv_remote_private *private = context->private;
+	struct dcesrv_remote_private *priv = (struct dcesrv_remote_private *)context->private_data;
 
-	talloc_free(private->c_pipe);
+	talloc_free(priv->c_pipe);
 
 	return;	
 }
 
 static NTSTATUS remote_op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_pull *pull, void **r)
 {
-	NTSTATUS status;
-	const struct dcerpc_interface_table *table = dce_call->context->iface->private;
+	enum ndr_err_code ndr_err;
+	const struct ndr_interface_table *table = (const struct ndr_interface_table *)dce_call->context->iface->private_data;
 	uint16_t opnum = dce_call->pkt.u.request.opnum;
 
 	dce_call->fault_code = 0;
@@ -93,9 +174,10 @@ static NTSTATUS remote_op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_CT
 	}
 
         /* unravel the NDR for the packet */
-	status = table->calls[opnum].ndr_pull(pull, NDR_IN, *r);
-	if (!NT_STATUS_IS_OK(status)) {
-		dcerpc_log_packet(table, opnum, NDR_IN,
+	ndr_err = table->calls[opnum].ndr_pull(pull, NDR_IN, *r);
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		dcerpc_log_packet(dce_call->conn->packet_log_dir,
+						  table, opnum, NDR_IN,
 				  &dce_call->pkt.u.request.stub_and_verifier);
 		dce_call->fault_code = DCERPC_FAULT_NDR;
 		return NT_STATUS_NET_WRITE_FAULT;
@@ -106,45 +188,47 @@ static NTSTATUS remote_op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_CT
 
 static NTSTATUS remote_op_dispatch(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, void *r)
 {
-	struct dcesrv_remote_private *private = dce_call->context->private;
+	struct dcesrv_remote_private *priv = dce_call->context->private_data;
 	uint16_t opnum = dce_call->pkt.u.request.opnum;
-	const struct dcerpc_interface_table *table = dce_call->context->iface->private;
-	const struct dcerpc_interface_call *call;
+	const struct ndr_interface_table *table = dce_call->context->iface->private_data;
+	const struct ndr_interface_call *call;
 	const char *name;
 
 	name = table->calls[opnum].name;
 	call = &table->calls[opnum];
 
-	if (private->c_pipe->conn->flags & DCERPC_DEBUG_PRINT_IN) {
+	if (priv->c_pipe->conn->flags & DCERPC_DEBUG_PRINT_IN) {
 		ndr_print_function_debug(call->ndr_print, name, NDR_IN | NDR_SET_VALUES, r);		
 	}
 
+	priv->c_pipe->conn->flags |= DCERPC_NDR_REF_ALLOC;
+
 	/* we didn't use the return code of this function as we only check the last_fault_code */
-	dcerpc_ndr_request(private->c_pipe, NULL, table, opnum, mem_ctx,r);
+	dcerpc_ndr_request(priv->c_pipe, NULL, table, opnum, mem_ctx,r);
 
-	dce_call->fault_code = private->c_pipe->last_fault_code;
+	dce_call->fault_code = priv->c_pipe->last_fault_code;
 	if (dce_call->fault_code != 0) {
 		DEBUG(0,("dcesrv_remote: call[%s] failed with: %s!\n",name, dcerpc_errstr(mem_ctx, dce_call->fault_code)));
 		return NT_STATUS_NET_WRITE_FAULT;
 	}
 
 	if ((dce_call->fault_code == 0) && 
-	    (private->c_pipe->conn->flags & DCERPC_DEBUG_PRINT_OUT)) {
+	    (priv->c_pipe->conn->flags & DCERPC_DEBUG_PRINT_OUT)) {
 		ndr_print_function_debug(call->ndr_print, name, NDR_OUT, r);		
 	}
 
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS remote_op_ndr_push(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_push *push, void *r)
+static NTSTATUS remote_op_ndr_push(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_push *push, const void *r)
 {
-	NTSTATUS status;
-	const struct dcerpc_interface_table *table = dce_call->context->iface->private;
+	enum ndr_err_code ndr_err;
+	const struct ndr_interface_table *table = dce_call->context->iface->private_data;
 	uint16_t opnum = dce_call->pkt.u.request.opnum;
 
         /* unravel the NDR for the packet */
-	status = table->calls[opnum].ndr_push(push, NDR_OUT, r);
-	if (!NT_STATUS_IS_OK(status)) {
+	ndr_err = table->calls[opnum].ndr_push(push, NDR_OUT, r);
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		dce_call->fault_code = DCERPC_FAULT_NDR;
 		return NT_STATUS_NET_WRITE_FAULT;
 	}
@@ -155,7 +239,7 @@ static NTSTATUS remote_op_ndr_push(struct dcesrv_call_state *dce_call, TALLOC_CT
 static NTSTATUS remote_register_one_iface(struct dcesrv_context *dce_ctx, const struct dcesrv_interface *iface)
 {
 	int i;
-	const struct dcerpc_interface_table *table = iface->private;
+	const struct ndr_interface_table *table = iface->private_data;
 
 	for (i=0;i<table->endpoints->count;i++) {
 		NTSTATUS ret;
@@ -174,7 +258,7 @@ static NTSTATUS remote_register_one_iface(struct dcesrv_context *dce_ctx, const
 static NTSTATUS remote_op_init_server(struct dcesrv_context *dce_ctx, const struct dcesrv_endpoint_server *ep_server)
 {
 	int i;
-	const char **ifaces = str_list_make(dce_ctx, lp_parm_string(-1,"dcerpc_remote","interfaces"),NULL);
+	const char **ifaces = (const char **)str_list_make(dce_ctx, lp_parm_string(dce_ctx->lp_ctx, NULL, "dcerpc_remote", "interfaces"),NULL);
 
 	if (!ifaces) {
 		DEBUG(3,("remote_op_init_server: no interfaces configured\n"));
@@ -203,49 +287,46 @@ static NTSTATUS remote_op_init_server(struct dcesrv_context *dce_ctx, const stru
 	return NT_STATUS_OK;
 }
 
-static BOOL remote_fill_interface(struct dcesrv_interface *iface, const struct dcerpc_interface_table *if_tabl)
+static bool remote_fill_interface(struct dcesrv_interface *iface, const struct ndr_interface_table *if_tabl)
 {
 	iface->name = if_tabl->name;
-	iface->uuid = if_tabl->uuid;
-	iface->if_version = if_tabl->if_version;
+	iface->syntax_id = if_tabl->syntax_id;
 	
 	iface->bind = remote_op_bind;
 	iface->unbind = remote_op_unbind;
 
 	iface->ndr_pull = remote_op_ndr_pull;
 	iface->dispatch = remote_op_dispatch;
+	iface->reply = remote_op_reply;
 	iface->ndr_push = remote_op_ndr_push;
 
-	iface->private = if_tabl;
+	iface->private_data = if_tabl;
 
-	return True;
+	return true;
 }
 
-static BOOL remote_op_interface_by_uuid(struct dcesrv_interface *iface, const char *uuid, uint32_t if_version)
+static bool remote_op_interface_by_uuid(struct dcesrv_interface *iface, const struct GUID *uuid, uint32_t if_version)
 {
-	const struct dcerpc_interface_list *l;
+	const struct ndr_interface_list *l;
 
-	for (l=librpc_dcerpc_pipes();l;l=l->next) {
-		if (l->table->if_version == if_version &&
-			strcmp(l->table->uuid, uuid)==0) {
+	for (l=ndr_table_list();l;l=l->next) {
+		if (l->table->syntax_id.if_version == if_version &&
+			GUID_equal(&l->table->syntax_id.uuid, uuid)==0) {
 			return remote_fill_interface(iface, l->table);
 		}
 	}
 
-	return False;	
+	return false;	
 }
 
-static BOOL remote_op_interface_by_name(struct dcesrv_interface *iface, const char *name)
+static bool remote_op_interface_by_name(struct dcesrv_interface *iface, const char *name)
 {
-	const struct dcerpc_interface_list *l;
+	const struct ndr_interface_table *tbl = ndr_table_by_name(name);
 
-	for (l=librpc_dcerpc_pipes();l;l=l->next) {
-		if (strcmp(l->table->name, name)==0) {
-			return remote_fill_interface(iface, l->table);
-		}
-	}
+	if (tbl)
+		return remote_fill_interface(iface, tbl);
 
-	return False;	
+	return false;	
 }
 
 NTSTATUS dcerpc_server_remote_init(void)
@@ -271,5 +352,8 @@ NTSTATUS dcerpc_server_remote_init(void)
 		return ret;
 	}
 
+	/* We need the full DCE/RPC interface table */
+	ndr_table_init();
+
 	return ret;
 }