sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

pyldb: Don't segfault when invalid type is specified to as_sddl and from_sddl.

Browse Source 
Fix bug #6723
This commit is contained in:
Matthieu Patou 2009-09-17 19:56:02 +04:00 committed by Matthias Dieter Wallnöfer
parent 78338d431c
commit aadf5e3910
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source4/libcli/security/tests/bindings.py
View File

@ -57,6 +57,16 @@ class SecurityDescriptorTests(unittest.TestCase):
self.assertEquals(desc.sacl, None) self.assertEquals(desc.sacl, None)
self.assertEquals(desc.type, 0x8004) self.assertEquals(desc.type, 0x8004)
def test_from_sddl_invalidsddl(self):
self.assertRaises(TypeError,security.descriptor.from_sddl, "foo",security.dom_sid("S-2-0-0"))
def test_from_sddl_invalidtype1(self):
self.assertRaises(TypeError,security.descriptor.from_sddl, security.dom_sid('S-2-0-0-512'),security.dom_sid("S-2-0-0"))
def test_from_sddl_invalidtype1(self):
sddl = "O:AOG:DAD:(A;;RPWPCCDCLCSWRCWDWOGA;;;S-1-0-0)"
self.assertRaises(TypeError,security.descriptor.from_sddl, sddl,"S-2-0-0")
def test_as_sddl(self): def test_as_sddl(self):
text = "O:AOG:DAD:(A;;RPWPCCDCLCSWRCWDWOGA;;;S-1-0-0)" text = "O:AOG:DAD:(A;;RPWPCCDCLCSWRCWDWOGA;;;S-1-0-0)"
dom = security.dom_sid("S-2-0-0") dom = security.dom_sid("S-2-0-0")
@ -67,6 +77,13 @@ class SecurityDescriptorTests(unittest.TestCase):
self.assertEquals(desc1.sacl, desc2.sacl) self.assertEquals(desc1.sacl, desc2.sacl)
self.assertEquals(desc1.type, desc2.type) self.assertEquals(desc1.type, desc2.type)
def test_as_sddl_invalid(self):
text = "O:AOG:DAD:(A;;RPWPCCDCLCSWRCWDWOGA;;;S-1-0-0)"
dom = security.dom_sid("S-2-0-0")
desc1 = security.descriptor.from_sddl(text, dom)
self.assertRaises(TypeError, desc1.as_sddl,text)
def test_as_sddl_no_domainsid(self): def test_as_sddl_no_domainsid(self):
dom = security.dom_sid("S-2-0-0") dom = security.dom_sid("S-2-0-0")
text = "O:AOG:DAD:(A;;RPWPCCDCLCSWRCWDWOGA;;;S-1-0-0)" text = "O:AOG:DAD:(A;;RPWPCCDCLCSWRCWDWOGA;;;S-1-0-0)"

4
source4/librpc/ndr/py_security.c
View File

@ -173,7 +173,7 @@ static PyObject *py_descriptor_from_sddl(PyObject *self, PyObject *args)
PyObject *py_sid; PyObject *py_sid;
struct dom_sid *sid; struct dom_sid *sid;
if (!PyArg_ParseTuple(args, "sO", &sddl, &py_sid)) if (!PyArg_ParseTuple(args, "sO!", &sddl, &dom_sid_Type, &py_sid))
return NULL; return NULL;
sid = py_talloc_get_ptr(py_sid); sid = py_talloc_get_ptr(py_sid);
@ -195,7 +195,7 @@ static PyObject *py_descriptor_as_sddl(PyObject *self, PyObject *args)
char *text; char *text;
PyObject *ret; PyObject *ret;
if (!PyArg_ParseTuple(args, "|O", &py_sid)) if (!PyArg_ParseTuple(args, "|O!", &dom_sid_Type, &py_sid))
return NULL; return NULL;
if (py_sid != Py_None) if (py_sid != Py_None)