summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source4/torture/rpc/oxidresolve.c135
-rw-r--r--source4/torture/rpc/remact.c28
-rw-r--r--source4/utils/ndrdump.c1
3 files changed, 156 insertions, 8 deletions
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index ce7563bee8..1865cbceb1 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -21,6 +21,58 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_oxidresolver.h"
+#include "librpc/gen_ndr/ndr_remact.h"
+#include "librpc/gen_ndr/ndr_epmapper.h"
+
+#define CLSID_TEST "00000316-0000-0000-C000-000000000046"
+#define CLSID_SIMPLE "5e9ddec7-5767-11cf-beab-00aa006c3606"
+#define CLSID_COFFEEMACHINE "DB7C21F8-FE33-4C11-AEA5-CEB56F076FBB"
+
+static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, HYPER_T *oxid, struct GUID *oid)
+{
+ struct RemoteActivation r;
+ NTSTATUS status;
+ struct GUID iids[2];
+ uint16 protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
+
+ ZERO_STRUCT(r.in);
+ r.in.this.version.MajorVersion = 5;
+ r.in.this.version.MinorVersion = 1;
+ uuid_generate_random(&r.in.this.cid);
+ GUID_from_string(CLSID_SIMPLE, &r.in.Clsid);
+ r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;
+ r.in.num_protseqs = 3;
+ r.in.protseq = protseq;
+ r.in.Interfaces = 1;
+ GUID_from_string(DCERPC_IUNKNOWN_UUID, &iids[0]);
+ r.in.pIIDs = iids;
+
+ status = dcerpc_RemoteActivation(p, mem_ctx, &r);
+ if(NT_STATUS_IS_ERR(status)) {
+ fprintf(stderr, "RemoteActivation: %s\n", nt_errstr(status));
+ return 0;
+ }
+
+ if(!W_ERROR_IS_OK(r.out.result)) {
+ fprintf(stderr, "RemoteActivation: %s\n", win_errstr(r.out.result));
+ return 0;
+ }
+
+ if(!W_ERROR_IS_OK(r.out.hr)) {
+ fprintf(stderr, "RemoteActivation: %s\n", win_errstr(r.out.hr));
+ return 0;
+ }
+
+ if(!W_ERROR_IS_OK(r.out.results[0])) {
+ fprintf(stderr, "RemoteActivation: %s\n", win_errstr(r.out.results[0]));
+ return 0;
+ }
+
+ *oid = r.out.ipidRemUnknown;
+ *oxid = r.out.pOxid;
+
+ return 1;
+}
static int test_SimplePing(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, HYPER_T setid)
{
@@ -43,7 +95,7 @@ static int test_SimplePing(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, HYPER_T s
return 1;
}
-static int test_ComplexPing(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, HYPER_T *setid)
+static int test_ComplexPing(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, HYPER_T *setid, struct GUID oid)
{
struct ComplexPing r;
NTSTATUS status;
@@ -54,6 +106,8 @@ static int test_ComplexPing(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, HYPER_T
r.in.SequenceNum = 0;
r.in.SetId = setid;
r.out.SetId = setid;
+ r.in.cAddToSet = 1;
+ r.in.AddToSet = &oid;
status = dcerpc_ComplexPing(p, mem_ctx, &r);
if(NT_STATUS_IS_ERR(status)) {
@@ -90,6 +144,57 @@ static int test_ServerAlive(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
return 1;
}
+static int test_ResolveOxid(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, HYPER_T oxid)
+{
+ struct ResolveOxid r;
+ NTSTATUS status;
+ uint16 protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };
+
+ r.in.pOxid = &oxid;
+ r.in.cRequestedProtseqs = 2;
+ r.in.arRequestedProtseqs = protseq;
+
+ status = dcerpc_ResolveOxid(p, mem_ctx, &r);
+ if(NT_STATUS_IS_ERR(status)) {
+ fprintf(stderr, "ResolveOxid: %s\n", nt_errstr(status));
+ return 0;
+ }
+
+ if(!W_ERROR_IS_OK(r.out.result)) {
+ fprintf(stderr, "ResolveOxid: %s\n", win_errstr(r.out.result));
+ return 0;
+ }
+
+ return 1;
+}
+
+static int test_ResolveOxid2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, HYPER_T oxid)
+{
+ struct ResolveOxid2 r;
+ NTSTATUS status;
+ uint16 protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };
+
+ r.in.pOxid = &oxid;
+ r.in.cRequestedProtseqs = 2;
+ r.in.arRequestedProtseqs = protseq;
+
+ status = dcerpc_ResolveOxid2(p, mem_ctx, &r);
+ if(NT_STATUS_IS_ERR(status)) {
+ fprintf(stderr, "ResolveOxid2: %s\n", nt_errstr(status));
+ return 0;
+ }
+
+ if(!W_ERROR_IS_OK(r.out.result)) {
+ fprintf(stderr, "ResolveOxid2: %s\n", win_errstr(r.out.result));
+ return 0;
+ }
+
+ printf("Remote server versions: %d, %d\n", r.out.pComVersion->MajorVersion, r.out.pComVersion->MinorVersion);
+
+ return 1;
+}
+
+
static int test_ServerAlive2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
{
@@ -113,26 +218,36 @@ static int test_ServerAlive2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
BOOL torture_rpc_oxidresolve(void)
{
NTSTATUS status;
- struct dcerpc_pipe *p;
+ struct dcerpc_pipe *p, *premact;
TALLOC_CTX *mem_ctx;
BOOL ret = True;
HYPER_T setid;
+ HYPER_T oxid;
+ struct GUID oid;
mem_ctx = talloc_init("torture_rpc_oxidresolve");
- status = torture_rpc_connection(&p,
+ status = torture_rpc_connection(&premact,
+ DCERPC_IREMOTEACTIVATION_NAME,
+ DCERPC_IREMOTEACTIVATION_UUID,
+ DCERPC_IREMOTEACTIVATION_VERSION);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ return False;
+ }
+
+ status = dcerpc_secondary_connection(premact, &p,
DCERPC_IOXIDRESOLVER_NAME,
DCERPC_IOXIDRESOLVER_UUID,
DCERPC_IOXIDRESOLVER_VERSION);
- if (!NT_STATUS_IS_OK(status)) {
+ if(!test_RemoteActivation(premact, mem_ctx, &oxid, &oid))
return False;
- }
if(!test_ServerAlive(p, mem_ctx))
ret = False;
- if(!test_ComplexPing(p, mem_ctx, &setid))
+ if(!test_ComplexPing(p, mem_ctx, &setid, oid))
ret = False;
if(!test_SimplePing(p, mem_ctx, setid))
@@ -141,9 +256,15 @@ BOOL torture_rpc_oxidresolve(void)
if(!test_ServerAlive2(p, mem_ctx))
ret = False;
+ if(!test_ResolveOxid(p, mem_ctx, oxid))
+ ret = False;
+
+ if(!test_ResolveOxid2(p, mem_ctx, oxid))
+ ret = False;
+
talloc_destroy(mem_ctx);
- torture_rpc_close(p);
+ torture_rpc_close(p);
return ret;
}
diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index 38d80e1bea..b28be9222f 100644
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -62,6 +62,34 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
return 0;
}
+ if(!W_ERROR_IS_OK(r.out.results[0])) {
+ fprintf(stderr, "RemoteActivation: %s\n", win_errstr(r.out.results[0]));
+ return 0;
+ }
+
+ r.in.Mode = MODE_GET_CLASS_OBJECT;
+
+ status = dcerpc_RemoteActivation(p, mem_ctx, &r);
+ if(NT_STATUS_IS_ERR(status)) {
+ fprintf(stderr, "RemoteActivation(GetClassObject): %s\n", nt_errstr(status));
+ return 0;
+ }
+
+ if(!W_ERROR_IS_OK(r.out.result)) {
+ fprintf(stderr, "RemoteActivation(GetClassObject): %s\n", win_errstr(r.out.result));
+ return 0;
+ }
+
+ if(!W_ERROR_IS_OK(r.out.hr)) {
+ fprintf(stderr, "RemoteActivation(GetClassObject): %s\n", win_errstr(r.out.hr));
+ return 0;
+ }
+
+ if(!W_ERROR_IS_OK(r.out.results[0])) {
+ fprintf(stderr, "RemoteActivation: %s\n", win_errstr(r.out.results[0]));
+ return 0;
+ }
+
return 1;
}
diff --git a/source4/utils/ndrdump.c b/source4/utils/ndrdump.c
index a4182281c8..75f6ea0b32 100644
--- a/source4/utils/ndrdump.c
+++ b/source4/utils/ndrdump.c
@@ -181,7 +181,6 @@ static void show_functions(const struct dcerpc_interface_table *p)
if (ndr->offset != ndr->data_size) {
printf("WARNING! %d unread bytes while parsing context file\n", ndr->data_size - ndr->offset);
- exit(1);
}
if (!NT_STATUS_IS_OK(status)) {
generated by cgit (git 2.34.1) at 2024-12-16 04:53:30 +0000