r5674: - Re-enable DCOM support.

- Always put IID in vtables (useful for asserts)
- Add table to keep track of DCOM proxy classes
- Bunch of smaller bug fixes
(This used to be commit 26d5a0b92c66bc86d0c26f687f83fa712342ac32)

4 files changed, 448 insertions, 0 deletions

diff --git a/source4/lib/com/com.h b/source4/lib/com/com.h
index be7dcde5b5..a056d1d9ee 100644
--- a/source4/lib/com/com.h
+++ b/source4/lib/com/com.h
@@ -21,8 +21,21 @@
 #ifndef _COM_H /* _COM_H */
 #define _COM_H 
 
+struct IUnknown_vtable;
+
 struct com_context 
 {
+	struct {
+		const char *domain;
+		const char *user;
+		const char *password;
+		struct dcom_object_exporter {
+			uint64_t oxid;	
+			struct DUALSTRINGARRAY bindings;
+			struct dcerpc_pipe *pipe;
+			struct dcom_object_exporter *prev, *next;
+		} *object_exporters;
+	} dcom;
 };
 
 typedef struct IUnknown *(*get_class_object_function) (const struct GUID *clsid);
diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk
index 006ea212c1..a4fe891864 100644
--- a/source4/lib/com/config.mk
+++ b/source4/lib/com/config.mk
@@ -4,6 +4,17 @@ INIT_OBJ_FILES = \
 		lib/com/rot.o \
 		lib/com/main.o
 
+################################################
+# Start SUBSYSTEM LIBDCOM
+[SUBSYSTEM::LIBDCOM]
+INIT_OBJ_FILES = \
+		lib/com/dcom/main.o \
+		lib/com/dcom/tables.o
+REQUIRED_SUBSYSTEMS = LIBCOM DCOM_PROXY_DCOM RPC_NDR_REMACT \
+					  RPC_NDR_OXIDRESOLVER
+# End SUBSYSTEM LIBDCOM
+################################################
+
 [MODULE::com_simple]
 SUBSYSTEM = LIBCOM
 INIT_OBJ_FILES = lib/com/classes/simple.o
diff --git a/source4/lib/com/dcom/main.c b/source4/lib/com/dcom/main.c
new file mode 100644
index 0000000000..b8c2eef82c
--- /dev/null
+++ b/source4/lib/com/dcom/main.c
@@ -0,0 +1,374 @@
+/*
+   Unix SMB/CIFS implementation.
+   Main DCOM functionality
+   Copyright (C) 2004 Jelmer Vernooij <jelmer@samba.org>
+
+   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
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.
+*/
+
+#include "includes.h"
+#include "system/filesys.h"
+#include "dlinklist.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/gen_ndr/ndr_remact.h"
+#include "librpc/gen_ndr/ndr_oxidresolver.h"
+#include "librpc/gen_ndr/ndr_dcom.h"
+#include "librpc/gen_ndr/com_dcom.h"
+
+#define DCOM_NEGOTIATED_PROTOCOLS { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB, EPM_PROTOCOL_NCALRPC }
+
+static NTSTATUS dcerpc_binding_from_STRINGBINDING(TALLOC_CTX *mem_ctx, struct dcerpc_binding *b, struct STRINGBINDING *bd)
+{
+	char *host, *endpoint;
+
+	ZERO_STRUCTP(b);
+	
+	b->transport = dcerpc_transport_by_endpoint_protocol(bd->wTowerId);
+
+	if (b->transport == -1) {
+		DEBUG(1, ("Can't find transport match endpoint protocol %d\n", bd->wTowerId));
+		return NT_STATUS_NOT_SUPPORTED;
+	}
+
+	host = talloc_strdup(mem_ctx, bd->NetworkAddr);
+	endpoint = strchr(host, '[');
+
+	if (endpoint) {
+		*endpoint = '\0';
+		endpoint++;
+
+		endpoint[strlen(endpoint)-1] = '\0';
+	}
+
+	b->host = host;
+	b->endpoint = endpoint;
+
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS dcom_connect_host(struct com_context *ctx, struct dcerpc_pipe **p, const char *server)
+{
+	struct dcerpc_binding bd;
+	enum dcerpc_transport_t available_transports[] = { NCACN_IP_TCP, NCACN_NP };
+	int i;
+	NTSTATUS status;
+	TALLOC_CTX *mem_ctx = talloc_init("dcom_connect");
+
+	if (server == NULL) { 
+		bd.transport = NCALRPC; 
+		return dcerpc_pipe_connect_b(p, &bd, 
+					DCERPC_IREMOTEACTIVATION_UUID, 
+					DCERPC_IREMOTEACTIVATION_VERSION, 
+					ctx->dcom.domain, ctx->dcom.user, ctx->dcom.password);
+	}
+
+	/* Allow server name to contain a binding string */
+	if (NT_STATUS_IS_OK(dcerpc_parse_binding(mem_ctx, server, &bd))) {
+		status = dcerpc_pipe_connect_b(p, &bd, 
+					DCERPC_IREMOTEACTIVATION_UUID, 
+					DCERPC_IREMOTEACTIVATION_VERSION, 
+					ctx->dcom.domain, ctx->dcom.user, ctx->dcom.password);
+
+		talloc_free(mem_ctx);
+		return status;
+	}
+	talloc_free(mem_ctx);
+
+	ZERO_STRUCT(bd);
+	bd.host = server;
+	
+	for (i = 0; i < ARRAY_SIZE(available_transports); i++)
+	{
+		bd.transport = available_transports[i];
+		
+		status = dcerpc_pipe_connect_b(p, &bd, 
+						DCERPC_IREMOTEACTIVATION_UUID, 
+						DCERPC_IREMOTEACTIVATION_VERSION, 
+						ctx->dcom.domain, ctx->dcom.user, ctx->dcom.password);
+
+		if (NT_STATUS_IS_OK(status)) {
+			return status;
+		}
+	}
+	
+	return status;
+}
+
+struct dcom_object_exporter *object_exporter_by_oxid(struct com_context *ctx, uint64_t oxid)
+{
+	return NULL; /* FIXME */
+}
+
+struct dcom_object_exporter *object_exporter_by_ip(struct com_context *ctx, struct IUnknown *ip)
+{
+	return NULL; /* FIXME */
+}
+
+WERROR dcom_create_object(struct com_context *ctx, struct GUID *clsid, const char *server, int num_ifaces, struct GUID *iid, struct IUnknown ***ip, WERROR *results)
+{
+	uint16_t protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
+	struct dcerpc_pipe *p;
+	struct dcom_object_exporter *m;
+	NTSTATUS status;
+	struct RemoteActivation r;
+	struct DUALSTRINGARRAY dualstring;
+	int i;
+
+	status = dcom_connect_host(ctx, &p, server);
+	if (NT_STATUS_IS_ERR(status)) {
+		DEBUG(1, ("Unable to connect to %s - %s\n", server, nt_errstr(status)));
+		return ntstatus_to_werror(status);
+	}
+
+	ZERO_STRUCT(r.in);
+	r.in.this.version.MajorVersion = COM_MAJOR_VERSION;
+	r.in.this.version.MinorVersion = COM_MINOR_VERSION;
+	r.in.this.cid = GUID_random();
+	r.in.Clsid = *clsid;
+	r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;
+	r.in.num_protseqs = ARRAY_SIZE(protseq);
+	r.in.protseq = protseq;
+	r.in.Interfaces = num_ifaces;
+	r.in.pIIDs = iid;
+	r.out.ifaces = talloc_array(ctx, struct MInterfacePointer, num_ifaces);
+	r.out.pdsaOxidBindings = &dualstring;
+	
+	status = dcerpc_RemoteActivation(p, ctx, &r);
+	if(NT_STATUS_IS_ERR(status)) {
+		DEBUG(1, ("Error while running RemoteActivation %s\n", nt_errstr(status)));
+		return ntstatus_to_werror(status);
+	}
+
+	if(!W_ERROR_IS_OK(r.out.result)) {
+		return r.out.result; 
+	}
+	
+	if(!W_ERROR_IS_OK(r.out.hr)) { 
+		return r.out.hr; 
+	}
+
+	*ip = talloc_array(ctx, struct IUnknown *, num_ifaces);
+	for (i = 0; i < num_ifaces; i++) {
+		results[i] = r.out.results[i];
+		(*ip)[i] = NULL;
+		if (W_ERROR_IS_OK(results[i])) {
+			status = dcom_IUnknown_from_OBJREF(ctx, &(*ip)[i], &r.out.ifaces[i].obj);
+			if (!NT_STATUS_IS_OK(status)) {
+				results[i] = ntstatus_to_werror(status);
+			}
+		}
+	}
+
+	/* Add the OXID data for the returned oxid */
+	m = object_exporter_by_oxid(ctx, r.out.pOxid);
+	m->bindings = *r.out.pdsaOxidBindings;
+	
+	return WERR_OK;
+}
+
+WERROR dcom_get_class_object(struct com_context *ctx, struct GUID *clsid, const char *server, struct GUID *iid, struct IUnknown **ip)
+{
+	struct dcom_object_exporter *m;
+	struct RemoteActivation r;
+	struct dcerpc_pipe *p;
+	struct DUALSTRINGARRAY dualstring;
+	NTSTATUS status;
+	struct MInterfacePointer pm;
+	uint16_t protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
+
+	if (!server) {
+		return com_get_class_object(ctx, clsid, iid, ip);
+	}
+
+	status = dcom_connect_host(ctx, &p, server);
+	if (NT_STATUS_IS_ERR(status)) {
+		DEBUG(1, ("Unable to connect to %s - %s\n", server, nt_errstr(status)));
+		return ntstatus_to_werror(status);
+	}
+
+	ZERO_STRUCT(r.in);
+	r.in.this.version.MajorVersion = COM_MAJOR_VERSION;
+	r.in.this.version.MinorVersion = COM_MINOR_VERSION;
+	r.in.this.cid = GUID_random();
+	r.in.Clsid = *clsid;
+	r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;
+	r.in.num_protseqs = ARRAY_SIZE(protseq);
+	r.in.protseq = protseq;
+	r.in.Interfaces = 1;
+	r.in.pIIDs = iid;
+	r.in.Mode = MODE_GET_CLASS_OBJECT;
+	r.out.ifaces = &pm;
+	r.out.pdsaOxidBindings = &dualstring;
+
+	status = dcerpc_RemoteActivation(p, ctx, &r);
+	if(NT_STATUS_IS_ERR(status)) {
+		DEBUG(1, ("Error while running RemoteActivation - %s\n", nt_errstr(status)));
+		return ntstatus_to_werror(status);
+	}
+
+	if(!W_ERROR_IS_OK(r.out.result)) { return r.out.result; }
+	if(!W_ERROR_IS_OK(r.out.hr)) { return r.out.hr; }
+	if(!W_ERROR_IS_OK(r.out.results[0])) { return r.out.results[0]; }
+	
+	/* Set up the interface data */
+	dcom_IUnknown_from_OBJREF(ctx, ip, &pm.obj);
+	
+	/* Add the OXID data for the returned oxid */
+	m = object_exporter_by_oxid(ctx, r.out.pOxid);
+	m->bindings = *r.out.pdsaOxidBindings;
+
+	return WERR_OK;
+}
+
+NTSTATUS dcom_get_pipe (struct IUnknown *iface, struct dcerpc_pipe **pp)
+{
+	struct dcerpc_binding binding;
+	struct GUID iid;
+	uint64_t oxid;
+	NTSTATUS status;
+	int i;
+	struct dcerpc_pipe *p;
+	TALLOC_CTX *tmp_ctx;
+	const char *uuid;
+	struct dcom_object_exporter *ox;
+
+	ox = object_exporter_by_ip(iface->ctx, iface);
+
+	tmp_ctx = talloc_new(NULL);
+
+	p = ox->pipe;
+	
+	iid = iface->vtable->iid;
+
+	uuid = GUID_string(tmp_ctx, &iid);
+	
+	if (p) {
+		if (!GUID_equal(&p->syntax.uuid, &iid)) {
+			struct dcerpc_pipe *p2;
+			ox->pipe->syntax.uuid = iid;
+			status = dcerpc_secondary_context(p, &p2, uuid, 0);
+			if (NT_STATUS_IS_OK(status)) {
+				p = p2;
+			}
+		} else {
+			p = talloc_reference(NULL, p);
+		}
+		*pp = p;
+		talloc_free(tmp_ctx);
+		return status;
+	}
+
+	i = 0;
+	do {
+		status = dcerpc_binding_from_STRINGBINDING(iface->ctx, &binding, 
+							   ox->bindings.stringbindings[i]);
+		if (!NT_STATUS_IS_OK(status)) {
+			DEBUG(1, ("Error parsing string binding"));
+		} else {
+			status = dcerpc_pipe_connect_b(&p, &binding, 
+						       uuid, 0.0, 
+						       iface->ctx->dcom.domain, iface->ctx->dcom.user, 
+						       iface->ctx->dcom.password);
+		}
+
+		i++;
+	} while (NT_STATUS_IS_ERR(status) && ox->bindings.stringbindings[i]);
+
+	if (NT_STATUS_IS_ERR(status)) {
+		DEBUG(0, ("Unable to connect to remote host - %s\n", nt_errstr(status)));
+		talloc_free(tmp_ctx);
+		return status;
+	}
+
+	DEBUG(2, ("Successfully connected to OXID %llx\n", oxid));
+	
+	*pp = p;
+	talloc_free(tmp_ctx);
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS dcom_OBJREF_from_IUnknown(struct OBJREF *o, struct IUnknown *p)
+{
+	/* FIXME: Cache generated objref objects? */
+	ZERO_STRUCTP(o);
+	
+	o->signature = OBJREF_SIGNATURE;
+	
+	if (!p) {
+		o->flags = OBJREF_NULL;
+	} else {
+		o->iid = p->vtable->iid;
+		/* 
+		OBJREF_STANDARD
+		OBJREF_CUSTOM
+		OBJREF_HANDLER
+		*/
+	}
+
+	return NT_STATUS_NOT_IMPLEMENTED;	
+}
+
+NTSTATUS dcom_IUnknown_from_OBJREF(struct com_context *ctx, struct IUnknown **_p, struct OBJREF *o)
+{
+	struct IUnknown *p;
+	struct dcom_object_exporter *ox;
+
+	switch(o->flags) {
+	case OBJREF_NULL: 
+		*_p = NULL;
+		return NT_STATUS_OK;
+		
+	case OBJREF_STANDARD:
+		p = talloc(ctx, struct IUnknown);
+		p->ctx = ctx;	
+		p->vtable = dcom_proxy_vtable_by_iid(&o->iid);
+		if (!p->vtable) {
+			DEBUG(0, ("Unable to find proxy class for interface with IID %s\n", GUID_string(ctx, &o->iid)));
+			return NT_STATUS_NOT_SUPPORTED;
+		}
+
+		ox = object_exporter_by_oxid(ctx, o->u_objref.u_standard.std.oxid);
+		/* FIXME: Add object to list of objects to ping */
+		*_p = p;
+		return NT_STATUS_OK;
+		
+	case OBJREF_HANDLER:
+		p = talloc(ctx, struct IUnknown);
+		p->ctx = ctx;	
+		ox = object_exporter_by_oxid(ctx, o->u_objref.u_handler.std.oxid );
+		/* FIXME: Add object to list of objects to ping */
+/*FIXME		p->vtable = dcom_vtable_by_clsid(&o->u_objref.u_handler.clsid);*/
+		/* FIXME: Do the custom unmarshaling call */
+	
+		*_p = p;
+		return NT_STATUS_OK;
+		
+	case OBJREF_CUSTOM:
+		p = talloc(ctx, struct IUnknown);
+		p->ctx = ctx;	
+		p->vtable = NULL;
+		/* FIXME: Do the actual custom unmarshaling call */
+		*_p = p;
+		return NT_STATUS_NOT_SUPPORTED;
+	}
+
+	return NT_STATUS_NOT_SUPPORTED;
+}
+
+uint64_t dcom_get_current_oxid(void)
+{
+	return getpid();
+}
diff --git a/source4/lib/com/dcom/tables.c b/source4/lib/com/dcom/tables.c
new file mode 100644
index 0000000000..a824413b34
--- /dev/null
+++ b/source4/lib/com/dcom/tables.c
@@ -0,0 +1,50 @@
+/*
+   Unix SMB/CIFS implementation.
+   DCOM proxy tables functionality
+   Copyright (C) 2005 Jelmer Vernooij <jelmer@samba.org>
+
+   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
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.
+*/
+
+#include "includes.h"
+#include "system/filesys.h"
+#include "dlinklist.h"
+#include "librpc/gen_ndr/com_dcom.h"
+
+static struct dcom_proxy {
+	struct IUnknown_vtable *vtable;
+	struct dcom_proxy *prev, *next;
+}  *proxies = NULL;
+
+NTSTATUS dcom_register_proxy(struct IUnknown_vtable *proxy_vtable)
+{
+	struct dcom_proxy *proxy = talloc(talloc_autofree_context(), struct dcom_proxy);
+
+	proxy->vtable = proxy_vtable;
+	DLIST_ADD(proxies, proxy);
+
+	return NT_STATUS_OK;
+}
+
+struct IUnknown_vtable *dcom_proxy_vtable_by_iid(struct GUID *iid)
+{
+	struct dcom_proxy *p;
+	for (p = proxies; p; p = p->next) {
+		if (GUID_equal(&p->vtable->iid, iid)) {
+			return p->vtable;
+		}
+	}
+	return NULL;
+}