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,
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 "Python.h"
-
#include "python/py_common.h"
/* Return a tuple of (error code, error string) from a WERROR */
if (initialised)
return;
+ load_case_tables();
+
/* Load configuration file */
- if (!lp_load(dyn_CONFIGFILE, True, False, False))
+ if (!lp_load(dyn_CONFIGFILE, True, False, False, True))
fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
/* Misc other stuff */
load_interfaces();
-
+ init_names();
+
initialised = True;
}
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(). */
+/* 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. */
-struct cli_state *open_pipe_creds(char *server, PyObject *creds,
- cli_pipe_fn *connect_fn, char **errstr)
+BOOL py_parse_creds(PyObject *creds, char **username, char **domain,
+ char **password, char **errstr)
{
- struct ntuser_creds nt_creds;
- struct cli_state *cli;
-
- cli = (struct cli_state *)malloc(sizeof(struct cli_state));
- if (!cli) {
- *errstr = strdup("out of memory");
- return NULL;
- }
-
- ZERO_STRUCTP(cli);
-
- /* Extract credentials from the python dictionary and initialise
- the ntuser_creds struct from them. */
+ /* Initialise anonymous credentials */
- ZERO_STRUCT(nt_creds);
- nt_creds.pwd.null_pwd = True;
+ *username = "";
+ *domain = "";
+ *password = "";
if (creds && PyDict_Size(creds) > 0) {
- char *username, *password, *domain;
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 = SMB_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 = SMB_STRDUP("no domain field in credential");
+ return False;
+ }
+
+ if (!password_obj) {
+ *errstr = SMB_STRDUP("no password field in credential");
+ return False;
+ }
+
+ /* Check type of required fields */
+
+ if (!PyString_Check(username_obj)) {
+ *errstr = SMB_STRDUP("username field is not string type");
+ return False;
+ }
+
+ if (!PyString_Check(domain_obj)) {
+ *errstr = SMB_STRDUP("domain field is not string type");
+ return False;
+ }
- username = PyString_AsString(username_obj);
- domain = PyString_AsString(domain_obj);
- password = PyString_AsString(password_obj);
+ if (!PyString_Check(password_obj)) {
+ *errstr = SMB_STRDUP("password field is not string type");
+ return False;
+ }
- if (!username || !domain || !password)
- goto creds_error;
+ /* Look for any extra fields */
- /* Initialise nt_creds structure with passed creds */
+ i = 0;
- fstrcpy(nt_creds.user_name, username);
- fstrcpy(nt_creds.domain, domain);
+ 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 (lp_encrypted_passwords())
- pwd_make_lm_nt_16(&nt_creds.pwd, password);
- else
- pwd_set_cleartext(&nt_creds.pwd, password);
+ /* Assign values */
- nt_creds.pwd.null_pwd = False;
+ *username = PyString_AsString(username_obj);
+ *domain = PyString_AsString(domain_obj);
+ *password = PyString_AsString(password_obj);
}
+ *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;
+ struct rpc_pipe_client *pipe_hnd;
+ NTSTATUS result;
+
+ /* Extract credentials from the python dictionary */
+
+ if (!py_parse_creds(creds, &username, &domain, &password, errstr))
+ return NULL;
+
/* Now try to connect */
- if (!connect_fn(cli, server, &nt_creds)) {
- *errstr = strdup("error connecting to RPC pipe");
+ result = cli_full_connection(
+ &cli, NULL, server, NULL, 0, "IPC$", "IPC",
+ username, domain, password, 0, Undefined, NULL);
+
+ if (!NT_STATUS_IS_OK(result)) {
+ *errstr = SMB_STRDUP("error connecting to IPC$ pipe");
+ return NULL;
+ }
+
+ pipe_hnd = cli_rpc_pipe_open_noauth(cli, pipe_idx, &result);
+ if (!pipe_hnd) {
+ cli_shutdown(cli);
+ asprintf(errstr, "error opening pipe index %d", pipe_idx);
return NULL;
}
git.samba.org / samba.git / blobdiff