Add extra parm to cli_full_connection call. Tim, you should probably look at this.

[gd/samba-autobuild/.git] / source3 / python / py_common.c

diff --git a/source3/python/py_common.c b/source3/python/py_common.c
index d81e141e9ceb63d4b25cbde023c7ebd629d94ed7..364271d57c4aa05bf9d2563d3099808c1b78ff8f 100644 (file)
--- a/source3/python/py_common.c
+++ b/source3/python/py_common.c
@@ -126,67 +126,123 @@ PyObject *py_setup_logging(PyObject *self, PyObject *args, PyObject *kw)
        return Py_None;
 }
 
-/* Return a cli_state to a RPC pipe on the given server.  Use the
-   credentials passed if not NULL.  If an error occurs errstr is set to a
-   string describing the error and NULL is returned.  If set, errstr must
-   be freed by calling free(). */
-
-struct cli_state *open_pipe_creds(char *server, PyObject *creds, 
-                                 char *pipe_name, char **errstr)
+/* Parse credentials from a python dictionary.  The dictionary can
+   only have the keys "username", "domain" and "password".  Return
+   True for valid credentials in which case the username, domain and
+   password are set to pointers to their values from the dicationary.
+   If returns False, the errstr is set to point at some mallocated
+   memory describing the error. */
+
+BOOL py_parse_creds(PyObject *creds, char **username, char **domain, 
+                   char **password, char **errstr)
 {
-       char *username = "", *password = "", *domain = "";
-       struct cli_state *cli;
-       NTSTATUS result;
-       struct in_addr server_ip;
-       extern pstring global_myname;
-       
-       /* Extract credentials from the python dictionary */
+       /* Initialise anonymous credentials */
+
+       *username = "";
+       *domain = "";
+       *password = "";
 
        if (creds && PyDict_Size(creds) > 0) {
                PyObject *username_obj, *password_obj, *domain_obj;
+               PyObject *key, *value;
+               int i;
 
-               /* Check credentials passed are valid.  This means the
-                  username, domain and password keys must exist and be
-                  string objects. */
+               /* Check for presence of required fields */
 
                username_obj = PyDict_GetItemString(creds, "username");
                domain_obj = PyDict_GetItemString(creds, "domain");
                password_obj = PyDict_GetItemString(creds, "password");
 
-               if (!username_obj || !domain_obj || !password_obj) {
-               creds_error:
-                       *errstr = strdup("invalid credentials");
-                       return NULL;
+               if (!username_obj) {
+                       *errstr = strdup("no username field in credential");
+                       return False;
                }
 
-               if (!PyString_Check(username_obj) || 
-                   !PyString_Check(domain_obj) || 
-                   !PyString_Check(password_obj))
-                       goto creds_error;
+               if (!domain_obj) {
+                       *errstr = strdup("no domain field in credential");
+                       return False;
+               }
 
-               username = PyString_AsString(username_obj);
-               domain = PyString_AsString(domain_obj);
-               password = PyString_AsString(password_obj);
+               if (!password_obj) {
+                       *errstr = strdup("no password field in credential");
+                       return False;
+               }
+
+               /* Check type of required fields */
+
+               if (!PyString_Check(username_obj)) {
+                       *errstr = strdup("username field is not string type");
+                       return False;
+               }
+
+               if (!PyString_Check(domain_obj)) {
+                       *errstr = strdup("domain field is not string type");
+                       return False;
+               }
+
+               if (!PyString_Check(password_obj)) {
+                       *errstr = strdup("password field is not string type");
+                       return False;
+               }
+
+               /* Look for any extra fields */
+
+               i = 0;
+
+               while (PyDict_Next(creds, &i, &key, &value)) {
+                       if (strcmp(PyString_AsString(key), "domain") != 0 &&
+                           strcmp(PyString_AsString(key), "username") != 0 &&
+                           strcmp(PyString_AsString(key), "password") != 0) {
+                               asprintf(errstr,
+                                        "creds contain extra field '%s'",
+                                        PyString_AsString(key));
+                               return False;
+                       }
+               }
 
-               if (!username || !domain || !password)
-                       goto creds_error;
+               /* Assign values */
+
+               *username = PyString_AsString(username_obj);
+               *domain = PyString_AsString(domain_obj);
+               *password = PyString_AsString(password_obj);
        }
 
-       /* Now try to connect */
+       *errstr = NULL;
+
+       return True;
+}
+
+/* Return a cli_state to a RPC pipe on the given server.  Use the
+   credentials passed if not NULL.  If an error occurs errstr is set to a
+   string describing the error and NULL is returned.  If set, errstr must
+   be freed by calling free(). */
+
+struct cli_state *open_pipe_creds(char *server, PyObject *creds, 
+                                 int pipe_idx, char **errstr)
+{
+       char *username, *password, *domain;
+       struct cli_state *cli;
+       NTSTATUS result;
+       
+       /* Extract credentials from the python dictionary */
 
-       if (!resolve_name(server, &server_ip, 0x20))  {
-               asprintf(errstr, "unable to resolve %s", server);
+       if (!py_parse_creds(creds, &username, &domain, &password, errstr))
                return NULL;
-       }
+
+       /* Now try to connect */
 
        result = cli_full_connection(
-               &cli, global_myname, server, &server_ip, 0, "IPC$", "IPC",
-               username, domain, password, strlen(password));
+               &cli, NULL, server, NULL, 0, "IPC$", "IPC",
+               username, domain, password, 0, NULL);
        
-       if (!NT_STATUS_IS_OK(result) || !cli_nt_session_open(cli, pipe_name)) {
+       if (!NT_STATUS_IS_OK(result)) {
+               *errstr = strdup("error connecting to IPC$ pipe");
+               return NULL;
+       }
+
+       if (!cli_nt_session_open(cli, pipe_idx)) {
                cli_shutdown(cli);
-               free(cli);
-               *errstr = strdup("pipe not available");
+               asprintf(errstr, "error opening pipe index %d", pipe_idx);
                return NULL;
        }