r3032: Somewhat stricter syntax for binding strings:

 [] is now mandatory
 : after the hostname is no longer allowed

examples of allowed binding strings:

ncacn_np:myhost[samr]
ncacn_ip_tcp:10.0.0.1[1045]
ncacn_ip_tcp:2001:7b8:37b:1:210:dcff:fecb:a9e3[1024,sign,seal]
ncacn_np:myhost
ncacn_ip_tcp:192.168.4.2
308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_ip_tcp:192.168.4.2
308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_ip_tcp:192.168.4.2[,print]

Note that the last two lines are not recognized by smbtorture as a binding
 string yet. dcerpc_parse_binding() does accept them though.
(This used to be commit c15862e778507287bddef7967383d4b5d22eaee9)

diff --git a/prog_guide.txt b/prog_guide.txt
index a8becef80a1c9dcf7a522e36118de278fce2172e..8ab96fb1012d6b0fec2364391d249010659b2c52 100644 (file)
--- a/prog_guide.txt
+++ b/prog_guide.txt
@@ -525,12 +525,13 @@ string.
 
 The format is:
 
-  TRANSPORT:host:[flags] or 
-  TRANSPORT:[flags] (for server side or general specifications)
+  TRANSPORT:host[flags]
 
 where TRANSPORT is either ncacn_np for SMB or ncacn_ip_tcp for RPC/TCP
 
-"host" is an IP or hostname or netbios name
+"host" is an IP or hostname or netbios name. If the binding string 
+identifies the server side of an endpoint, "host" may be an empty 
+string.
 
 "flags" can include a SMB pipe name if using the ncacn_np transport or
 a TCP port number if using the ncacn_ip_tcp transport, otherwise they
@@ -550,27 +551,24 @@ other recognised flags are:
 For example, these all connect to the samr pipe:
 
    ncacn_np:myserver
-   ncacn_np:myserver:samr
-   ncacn_np:myserver:samr,seal
-   ncacn_np:myserver:\pipe\samr
-   ncacn_np:myserver:/pipe/samr
    ncacn_np:myserver[samr]
    ncacn_np:myserver[\pipe\samr]
    ncacn_np:myserver[/pipe/samr]
-   ncacn_np:myserver:[samr,sign,print]
-   ncacn_np:myserver:[\pipe\samr,sign,seal,bigendian]
-   ncacn_np:myserver:[/pipe/samr,seal,validate]
+   ncacn_np:myserver[samr,sign,print]
+   ncacn_np:myserver[\pipe\samr,sign,seal,bigendian]
+   ncacn_np:myserver[/pipe/samr,seal,validate]
+   ncacn_np:
+   ncacn_np:[/pipe/samr]
 
    ncacn_ip_tcp:myserver
-   ncacn_ip_tcp:myserver:1024
    ncacn_ip_tcp:myserver[1024]
-   ncacn_ip_tcp:myserver:[1024,sign,seal]
+   ncacn_ip_tcp:myserver[1024,sign,seal]
 
 
 IDEA: Maybe extend UNC names like this?
 
  smbclient //server/share
- smbclient //server/share:[sign,seal,spnego]
+ smbclient //server/share[sign,seal,spnego]
 
 DCERPC Handles
 --------------

diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index 011d70ec0c47797d63e6711bcfae49d91941def8..3dd81435117aa935afa29182d3f65b8499dbc77f 100644 (file)
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -142,6 +142,7 @@ struct dcerpc_interface_table {
 /* this describes a binding to a particular transport/pipe */
 struct dcerpc_binding {
        enum dcerpc_transport_t transport;
+       struct GUID *object;
        const char *host;
        const char **options;
        uint32_t flags;

diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 5f3d911d15618571078d7e9a9199d415f72d7000..747f8d1277ae98666ab64c107dbd3d05fb631bd9 100644 (file)
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -273,7 +273,11 @@ const char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_bindi
                return NULL;
        }
 
-       s = talloc_asprintf(mem_ctx, "%s:%s:[", t_name, b->host);
+       if (b->object) { 
+               s = talloc_asprintf(mem_ctx, "%s@", GUID_string(mem_ctx, b->object));
+       }
+
+       s = talloc_asprintf_append(s, "%s:%s[", t_name, b->host);
        if (!s) return NULL;
 
        /* this is a *really* inefficent way of dealing with strings,
@@ -302,81 +306,90 @@ const char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_bindi
 */
 NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_binding *b)
 {
-       char *part1, *part2, *part3;
+       char *options, *type;
        char *p;
        int i, j, comma_count;
 
-       p = strchr(s, ':');
-       if (!p) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-       part1 = talloc_strndup(mem_ctx, s, PTR_DIFF(p, s));
-       if (!part1) {
-               return NT_STATUS_NO_MEMORY;
+       p = strchr(s, '@');
+
+       if (p && PTR_DIFF(p, s) == 36) { /* 36 is the length of a UUID */
+               NTSTATUS status;
+
+               b->object = talloc_p(mem_ctx, struct GUID);
+               
+               status = GUID_from_string(s, b->object);
+
+               if (NT_STATUS_IS_ERR(status)) {
+                       DEBUG(0, ("Failed parsing UUID\n"));
+                       return status;
+               }
+
+               s = p + 1;
+       } else {
+               b->object = NULL;
        }
-       s = p+1;
 
        p = strchr(s, ':');
        if (!p) {
-               p = strchr(s, '[');
-               if (p) {
-                       part2 = talloc_strndup(mem_ctx, s, PTR_DIFF(p, s));
-                       part3 = talloc_strdup(mem_ctx, p+1);
-                       if (part3[strlen(part3)-1] != ']') {
-                               return NT_STATUS_INVALID_PARAMETER;
-                       }
-                       part3[strlen(part3)-1] = 0;
-               } else {
-                       part2 = talloc_strdup(mem_ctx, s);
-                       part3 = NULL;
-               }
-       } else {
-               part2 = talloc_strndup(mem_ctx, s, PTR_DIFF(p, s));
-               part3 = talloc_strdup(mem_ctx, p+1);
+               return NT_STATUS_INVALID_PARAMETER;
        }
-       if (!part2) {
+
+       type = talloc_strndup(mem_ctx, s, PTR_DIFF(p, s));
+       if (!type) {
                return NT_STATUS_NO_MEMORY;
        }
 
        for (i=0;i<ARRAY_SIZE(ncacn_transports);i++) {
-               if (strcasecmp(part1, ncacn_transports[i].name) == 0) {
+               if (strcasecmp(type, ncacn_transports[i].name) == 0) {
                        b->transport = ncacn_transports[i].transport;
                        break;
                }
        }
        if (i==ARRAY_SIZE(ncacn_transports)) {
-               DEBUG(0,("Unknown dcerpc transport '%s'\n", part1));
+               DEBUG(0,("Unknown dcerpc transport '%s'\n", type));
                return NT_STATUS_INVALID_PARAMETER;
        }
+       
+       s = p+1;
+
+       p = strchr(s, '[');
+       if (p) {
+               b->host = talloc_strndup(mem_ctx, s, PTR_DIFF(p, s));
+               options = talloc_strdup(mem_ctx, p+1);
+               if (options[strlen(options)-1] != ']') {
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
+               options[strlen(options)-1] = 0;
+       } else {
+               b->host = talloc_strdup(mem_ctx, s);
+               options = NULL;
+       }
+
+       if (!b->host) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       b->host = part2;
        b->options = NULL;
        b->flags = 0;
 
-       if (!part3) {
+       if (!options) {
                return NT_STATUS_OK;
        }
 
-       /* the [] brackets are optional */
-       if (*part3 == '[' && part3[strlen(part3)-1] == ']') {
-               part3++;
-               part3[strlen(part3)-1] = 0;
-       }
-
-       comma_count = count_chars(part3, ',');
+       comma_count = count_chars(options, ',');
        b->options = talloc_array_p(mem_ctx, const char *, comma_count+2);
        if (!b->options) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       for (i=0; (p = strchr(part3, ',')); i++) {
-               b->options[i] = talloc_strndup(mem_ctx, part3, PTR_DIFF(p, part3));
+       for (i=0; (p = strchr(options, ',')); i++) {
+               b->options[i] = talloc_strndup(mem_ctx, options, PTR_DIFF(p, options));
                if (!b->options[i]) {
                        return NT_STATUS_NO_MEMORY;
                }
-               part3 = p+1;
+               options = p+1;
        }
-       b->options[i] = part3;
+       b->options[i] = options;
        b->options[i+1] = NULL;
 
        /* some options are pre-parsed for convenience */
@@ -413,7 +426,7 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_np(struct dcerpc_pipe **p,
        struct smbcli_state *cli;
        const char *pipe_name;
        
-       if (!binding->options || !binding->options[0]) {
+       if (!binding->options || !binding->options[0] || !strlen(binding->options[0])) {
                const struct dcerpc_interface_table *table = idl_iface_by_uuid(pipe_uuid);
                if (!table) {
                        DEBUG(0,("Unknown interface endpoint '%s'\n", pipe_uuid));
@@ -501,7 +514,7 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp(struct dcerpc_pipe **p,
        NTSTATUS status;
        uint32_t port = 0;
 
-       if (binding->options && binding->options[0]) {
+       if (binding->options && binding->options[0] && strlen(binding->options[0])) {
                port = atoi(binding->options[0]);
        }
 

diff --git a/source4/script/tests/test_binding_string.sh b/source4/script/tests/test_binding_string.sh
new file mode 100755 (executable)
index 0000000..5a5e190
--- /dev/null
+++ b/source4/script/tests/test_binding_string.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+if [ $# -lt 4 ]; then
+cat <<EOF
+Usage: test_binding_string.sh SERVER USERNAME PASSWORD DOMAIN
+EOF
+exit 1;
+fi
+
+server="$1"
+username="$2"
+password="$3"
+domain="$4"
+shift 4
+
+testit() {
+   cmdline="$*"
+   if ! $cmdline > test.$$ 2>&1; then
+       cat test.$$;
+       rm -f test.$$;
+       echo "TEST FAILED - $cmdline";
+       exit 1;
+   fi
+   rm -f test.$$;
+}
+
+for I in "ncacn_np:$server" \
+                "ncacn_ip_tcp:$server" \
+                "ncacn_np:$server[rpcecho]"  \
+                "ncacn_np:$server[/pipe/rpcecho]" \
+                "ncacn_np:$server[/pipe/rpcecho,sign,seal]" \
+                "ncacn_np:$server[,sign]" \
+                "ncacn_ip_tcp:$server[,sign]" \
+                "308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_np:$server" \
+                "308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_ip_tcp:$server" 
+do
+       testit bin/smbtorture "$I" -U"$username"%"$password" -W $domain RPC-ECHO "$*"
+done
+
+echo "ALL OK";

diff --git a/source4/script/tests/test_echo.sh b/source4/script/tests/test_echo.sh
index 724f4cff5ed9eb53e1377c13ebb03cdad36318b7..3aebb11b6be56a188f2301986732788ff25e3db2 100755 (executable)
--- a/source4/script/tests/test_echo.sh
+++ b/source4/script/tests/test_echo.sh
@@ -35,13 +35,13 @@ for transport in ncacn_np ncacn_ip_tcp; do
         "--option=ntlmssp_client:ntlm2=no  --option=ntlmssp_client:keyexchange=no" \
     ; do
    echo Testing $transport with $bindoptions and $ntlmoptions
-   testit bin/smbtorture $transport:"$server":$bindoptions $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*"
+   testit bin/smbtorture $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*"
   done
  done
 done
 
 # separately test the print option - its v slow
 echo Testing print option
-testit bin/smbtorture ncacn_np:"$server":print -U"$username"%"$password" -W $domain RPC-ECHO "$*"
+testit bin/smbtorture ncacn_np:"$server[print]" -U"$username"%"$password" -W $domain RPC-ECHO "$*"
 
 echo "ALL OK";