sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-23 20:59:10 +03:00
Code Activity

pylibsmb: Move get_acl() to python

Browse Source 
The previous code was not available in threaded environments

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke
2020-11-11 13:20:39 +01:00
committed by Jeremy Allison
parent 57f8e7eb11
commit 472c16d554
2 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
python/samba/samba3/libsmb_samba_internal.py
View File

@ -14,6 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from samba.samba3.libsmb_samba_cwrapper import *
from samba.dcerpc import security
class Conn(LibsmbCConn):
def deltree(self, path):
@ -23,3 +24,28 @@ class Conn(LibsmbCConn):
self.rmdir(path)
else:
self.unlink(path)
SECINFO_DEFAULT_FLAGS = \
security.SECINFO_OWNER | \
security.SECINFO_GROUP | \
security.SECINFO_DACL | \
security.SECINFO_PROTECTED_DACL | \
security.SECINFO_UNPROTECTED_DACL | \
security.SECINFO_SACL | \
security.SECINFO_PROTECTED_SACL | \
security.SECINFO_UNPROTECTED_SACL
def get_acl(self,
filename,
sinfo = SECINFO_DEFAULT_FLAGS,
access_mask = security.SEC_FLAG_MAXIMUM_ALLOWED):
"""Get security descriptor for file."""
fnum = self.create(
Name=filename,
DesiredAccess=access_mask,
ShareAccess=(FILE_SHARE_READ|FILE_SHARE_WRITE))
try:
sd = self.get_sd(fnum, sinfo)
finally:
self.close(fnum)
return sd

47
source3/libsmb/pylibsmb.c
View File

@ -1336,50 +1336,6 @@ static PyObject *py_smb_chkpath(struct py_cli_state *self, PyObject *args)
return PyBool_FromLong(dir_exists);
}
/*
* Read ACL on a given file/directory as a security descriptor object
*/
static PyObject *py_smb_getacl(struct py_cli_state *self, PyObject *args)
{
NTSTATUS status;
const char *filename = NULL;
unsigned int sinfo = SECINFO_DEFAULT_FLAGS;
unsigned int access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
uint16_t fnum;
struct security_descriptor *sd = NULL;
/* there's no async version of cli_query_security_descriptor() */
if (self->thread_state != NULL) {
PyErr_SetString(PyExc_RuntimeError,
"get_acl() is not supported on "
"a multi_threaded connection");
return NULL;
}
if (!PyArg_ParseTuple(args, "s|II:get_acl", &filename, &sinfo,
&access_mask)) {
return NULL;
}
/* get a file handle with the desired access */
status = cli_ntcreate(self->cli, filename, 0, access_mask, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_OPEN, 0x0, 0x0, &fnum, NULL);
PyErr_NTSTATUS_IS_ERR_RAISE(status);
/* query the security descriptor for this file */
status = cli_query_security_descriptor(self->cli, fnum, sinfo,
NULL, &sd);
PyErr_NTSTATUS_IS_ERR_RAISE(status);
/* close the file handle and convert the SD to a python struct */
status = cli_close(self->cli, fnum);
PyErr_NTSTATUS_IS_ERR_RAISE(status);
return py_return_ndr_struct("samba.dcerpc.security", "descriptor",
sd, sd);
}
static PyObject *py_smb_get_sd(struct py_cli_state *self, PyObject *args)
{
int fnum;
@ -1504,9 +1460,6 @@ static PyMethodDef py_cli_state_methods[] = {
{ "loadfile", (PyCFunction)py_smb_loadfile, METH_VARARGS,
"loadfile(path) -> file contents as a " PY_DESC_PY3_BYTES
"\n\n\t\tRead contents of a file." },
{ "get_acl", (PyCFunction)py_smb_getacl, METH_VARARGS,
"get_acl(path[, security_info=0]) -> security_descriptor object\n\n"
"\t\tGet security descriptor for file." },
{ "get_sd", (PyCFunction)py_smb_get_sd, METH_VARARGS,
"get_sd(fnum[, security_info=0]) -> security_descriptor object\n\n"
"\t\tGet security descriptor for opened file." },