sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

python: Use py_check_dcerpc_type() to safely check for credentials

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2017-10-24 16:40:02 +13:00 committed by Garming Sam
parent 3bc0c1f8ee
commit 0da76af16c
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libgpo/pygpo.c
View File

@ -24,6 +24,7 @@
#include "ads.h"
#include "secrets.h"
#include "../libds/common/flags.h"
#include "librpc/rpc/pyrpc_util.h"
#include "auth/credentials/pycredentials.h"
#include "libcli/util/pyerrors.h"
@ -196,17 +197,27 @@ static int py_ads_init(ADS *self, PyObject *args, PyObject *kwds)
const char *realm = NULL;
const char *workgroup = NULL;
const char *ldap_server = NULL;
PyObject *creds = NULL;
PyObject *py_creds = NULL;
PyObject *lp_obj = NULL;
struct loadparm_context *lp_ctx = NULL;
static const char *kwlist[] = {"ldap_server", "loadparm_context", "credentials", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "sO|O", discard_const_p(char *, kwlist), &ldap_server, &lp_obj, &creds))
if (!PyArg_ParseTupleAndKeywords(args, kwds, "sO|O", discard_const_p(char *, kwlist), &ldap_server, &lp_obj, &py_creds))
return -1;
self->frame = talloc_stackframe();
if (creds) self->cli_creds = pytalloc_get_type(creds, struct cli_credentials);
if (py_creds) {
if (!py_check_dcerpc_type(py_creds, "samba.credentials",
"Credentials")) {
PyErr_Format(PyExc_TypeError,
"Expected samba.credentaials "
"for credentials argument");
return -1;
}
self->cli_creds
= PyCredentials_AsCliCredentials(py_creds);
}
if (lp_obj) {
lp_ctx = pytalloc_get_type(lp_obj, struct loadparm_context);

3
libgpo/wscript_build
View File

@ -8,5 +8,6 @@ bld.SAMBA3_LIBRARY('gpext',
private_library=True)
bld.SAMBA3_PYTHON('python_samba_libgpo', 'pygpo.c',
deps='pyparam_util gpext talloc ads TOKEN_UTIL auth',
deps='''pyparam_util gpext talloc ads TOKEN_UTIL
auth pyrpc_util''',
realname='samba/gpo.so')