[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Thu Jun 28 10:16:06 UTC 2018
The branch, master has been updated
via 975b751 tests/ntacls: fix pep8 warnings
via 3262f01 tests/ntacls: use global vars to make code DRY
via 178c7d4 tests/ntacls_backup: register test
via b334615 ntacls: add extra test file for ntacls backup
via 132fa04 ntacls: add functions to backup and restore ntacls
via 1078c96 pysmbd: add py_smbd_create_file
via 747c3f1 pysmbd: extract init_files_struct function
via f1566c2 pysmbd: add py_smbd_mkdir
via 4320dcc pysmb: add py_smb_unlink and test
from 211275f samba-tool showrepl tests: test all-good with --pull-summary
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 975b751bb60c935f2ef5b86fa27dc19b38cdc9d2
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Fri Jun 1 14:28:43 2018 +1200
tests/ntacls: fix pep8 warnings
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Thu Jun 28 12:14:59 CEST 2018 on sn-devel-144
commit 3262f01d3667debe1b273f509c92ef55ac024d81
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Fri Jun 1 14:23:54 2018 +1200
tests/ntacls: use global vars to make code DRY
Move acl and dommain_sid to global vars so we don't repeat them in every
test.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 178c7d4f2b3d904f62525a30c431678bb0ec0230
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Thu Jun 28 10:47:42 2018 +1200
tests/ntacls_backup: register test
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit b3346158c6fde072b9cfbd888d24c268eae326f3
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Thu Jun 28 10:45:28 2018 +1200
ntacls: add extra test file for ntacls backup
The ntacls backup tests have to run in ad_dc:local env, which is
different from existing ntacls tests. Add a separate file for backup
tests.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 132fa04c77c9428dcbc30c3b4abc4ff91467c3cf
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Fri Jun 1 13:50:05 2018 +1200
ntacls: add functions to backup and restore ntacls
1. backup a share online from a smb connection with ntacls using pysmb API.
2. backup a share offline from service path with ntacls using pysmbd API.
3. restore from tarfile with pysmdb API.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 1078c969abfa2f6c24e66eb7c2cafa6d1dc31f81
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Fri Jun 1 13:48:31 2018 +1200
pysmbd: add py_smbd_create_file
Add create_file function to smbd API.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 747c3f1fb379bb68cc7479501b85741493c05812
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Fri Jun 1 13:45:25 2018 +1200
pysmbd: extract init_files_struct function
Extract initialization code from set_nt_acl_conn for reuse.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit f1566c2ef9af0ca86778a58f855e1602ac43c3c2
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Fri Jun 1 13:40:42 2018 +1200
pysmbd: add py_smbd_mkdir
Add mkdir for smbd API.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 4320dcc4bc32ef26c2bd512b94e3bc9aedb9d192
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Wed Jun 13 10:39:57 2018 +1200
pysmb: add py_smb_unlink and test
Add unlink api to delete a file with a smb connection.
Test added.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
python/samba/ntacls.py | 327 ++++++++++++++++++++++++++++++++++++
python/samba/tests/ntacls.py | 69 ++++----
python/samba/tests/ntacls_backup.py | 185 ++++++++++++++++++++
python/samba/tests/smb.py | 8 +
source3/smbd/pysmbd.c | 194 +++++++++++++++++----
source4/libcli/pysmb.c | 24 +++
source4/selftest/tests.py | 4 +
7 files changed, 742 insertions(+), 69 deletions(-)
create mode 100644 python/samba/tests/ntacls_backup.py
Changeset truncated at 500 lines:
diff --git a/python/samba/ntacls.py b/python/samba/ntacls.py
index 6bb55b4..e517811 100644
--- a/python/samba/ntacls.py
+++ b/python/samba/ntacls.py
@@ -21,10 +21,34 @@ from __future__ import print_function
import os
+import tarfile
+import tempfile
+import shutil
+
import samba.xattr_native, samba.xattr_tdb, samba.posix_eadb
+from samba.samba3 import param as s3param
from samba.dcerpc import security, xattr, idmap
from samba.ndr import ndr_pack, ndr_unpack
from samba.samba3 import smbd
+from samba import smb
+
+# don't include volumes
+SMB_FILE_ATTRIBUTE_FLAGS = smb.FILE_ATTRIBUTE_SYSTEM | \
+ smb.FILE_ATTRIBUTE_DIRECTORY | \
+ smb.FILE_ATTRIBUTE_ARCHIVE | \
+ smb.FILE_ATTRIBUTE_HIDDEN
+
+
+SECURITY_SECINFO_FLAGS = security.SECINFO_OWNER | \
+ security.SECINFO_GROUP | \
+ security.SECINFO_DACL | \
+ security.SECINFO_SACL
+
+
+# SEC_FLAG_SYSTEM_SECURITY is required otherwise get Access Denied
+SECURITY_SEC_FLAGS = security.SEC_FLAG_SYSTEM_SECURITY | \
+ security.SEC_FLAG_MAXIMUM_ALLOWED
+
class XattrBackendError(Exception):
"""A generic xattr backend error."""
@@ -247,3 +271,306 @@ def dsacl2fsacl(dssddl, sid, as_sddl=True):
return fdescr
return fdescr.as_sddl(sid)
+
+
+class SMBHelper:
+ """
+ A wrapper class for SMB connection
+
+ smb_path: path with separator "\\" other than "/"
+ """
+
+ def __init__(self, smb_conn, dom_sid):
+ self.smb_conn = smb_conn
+ self.dom_sid = dom_sid
+
+ def get_acl(self, smb_path, as_sddl=False):
+ assert '/' not in smb_path
+
+ ntacl_sd = self.smb_conn.get_acl(
+ smb_path, SECURITY_SECINFO_FLAGS, SECURITY_SEC_FLAGS)
+
+ return ntacl_sd.as_sddl(self.dom_sid) if as_sddl else ntacl_sd
+
+ def list(self, smb_path=''):
+ """
+ List file and dir base names in smb_path without recursive.
+ """
+ assert '/' not in smb_path
+ return self.smb_conn.list(smb_path, attribs=SMB_FILE_ATTRIBUTE_FLAGS)
+
+ def is_dir(self, attrib):
+ """
+ Check whether the attrib value is a directory.
+
+ attrib is from list method.
+ """
+ return bool(attrib & smb.FILE_ATTRIBUTE_DIRECTORY)
+
+ def join(self, root, name):
+ """
+ Join path with '\\'
+ """
+ return root + '\\' + name if root else name
+
+ def loadfile(self, smb_path):
+ assert '/' not in smb_path
+ return self.smb_conn.loadfile(smb_path)
+
+ def create_tree(self, tree, smb_path=''):
+ """
+ Create files as defined in tree
+ """
+ for name, content in tree.items():
+ fullname = self.join(smb_path, name)
+ if isinstance(content, dict): # a dir
+ if not self.smb_conn.chkpath(fullname):
+ self.smb_conn.mkdir(fullname)
+ self.create_tree(content, smb_path=fullname)
+ else: # a file
+ self.smb_conn.savefile(fullname, content)
+
+ def get_tree(self, smb_path=''):
+ """
+ Get the tree structure via smb conn
+
+ self.smb_conn.list example:
+
+ [
+ {
+ 'attrib': 16,
+ 'mtime': 1528848309,
+ 'name': 'dir1',
+ 'short_name': 'dir1',
+ 'size': 0L
+ }, {
+ 'attrib': 32,
+ 'mtime': 1528848309,
+ 'name': 'file0.txt',
+ 'short_name': 'file0.txt',
+ 'size': 10L
+ }
+ ]
+ """
+ tree = {}
+ for item in self.list(smb_path):
+ name = item['name']
+ fullname = self.join(smb_path, name)
+ if self.is_dir(item['attrib']):
+ tree[name] = self.get_tree(smb_path=fullname)
+ else:
+ tree[name] = self.loadfile(fullname)
+ return tree
+
+ def get_ntacls(self, smb_path=''):
+ """
+ Get ntacl for each file and dir via smb conn
+ """
+ ntacls = {}
+ for item in self.list(smb_path):
+ name = item['name']
+ fullname = self.join(smb_path, name)
+ if self.is_dir(item['attrib']):
+ ntacls.update(self.get_ntacls(smb_path=fullname))
+ else:
+ ntacl_sd = self.get_acl(fullname)
+ ntacls[fullname] = ntacl_sd.as_sddl(self.dom_sid)
+ return ntacls
+
+ def delete_tree(self):
+ for item in self.list():
+ name = item['name']
+ if self.is_dir(item['attrib']):
+ self.smb_conn.deltree(name)
+ else:
+ self.smb_conn.unlink(name)
+
+
+class NtaclsHelper:
+
+ def __init__(self, service, smb_conf_path, dom_sid):
+ self.service = service
+ self.dom_sid = dom_sid
+
+ # this is important to help smbd find services.
+ self.lp = s3param.get_context()
+ self.lp.load(smb_conf_path)
+
+ self.use_ntvfs = "smb" in self.lp.get("server services")
+
+ def getntacl(self, path, as_sddl=False, direct_db_access=None):
+ if direct_db_access is None:
+ direct_db_access = self.use_ntvfs
+
+ ntacl_sd = getntacl(
+ self.lp, path,
+ direct_db_access=direct_db_access,
+ service=self.service)
+
+ return ntacl_sd.as_sddl(self.dom_sid) if as_sddl else ntacl_sd
+
+ def setntacl(self, path, ntacl_sd):
+ # ntacl_sd can be obj or str
+ return setntacl(self.lp, path, ntacl_sd, self.dom_sid)
+
+
+def _create_ntacl_file(dst, ntacl_sddl_str):
+ with open(dst + '.NTACL', 'w') as f:
+ f.write(ntacl_sddl_str)
+
+
+def _read_ntacl_file(src):
+ with open(src + '.NTACL', 'r') as f:
+ return f.read()
+
+
+def backup_online(smb_conn, dest_tarfile_path, dom_sid):
+ """
+ Backup all files and dirs with ntacl for the serive behind smb_conn.
+
+ 1. Create a temp dir as container dir
+ 2. Backup all files with dir structure into container dir
+ 3. Generate file.NTACL files for each file and dir in contianer dir
+ 4. Create a tar file from container dir(without top level folder)
+ 5. Delete contianer dir
+ """
+
+ if isinstance(dom_sid, str):
+ dom_sid = security.dom_sid(dom_sid)
+
+ smb_helper = SMBHelper(smb_conn, dom_sid)
+
+ remotedir = '' # root dir
+
+ localdir = tempfile.mkdtemp()
+
+ r_dirs = [remotedir]
+ l_dirs = [localdir]
+
+ while r_dirs:
+ r_dir = r_dirs.pop()
+ l_dir = l_dirs.pop()
+
+ for e in smb_helper.list(smb_path=r_dir):
+ r_name = smb_helper.join(r_dir, e['name'])
+ l_name = os.path.join(l_dir, e['name'])
+
+ if smb_helper.is_dir(e['attrib']):
+ r_dirs.append(r_name)
+ l_dirs.append(l_name)
+ os.mkdir(l_name)
+ else:
+ data = smb_helper.loadfile(r_name)
+ with open(l_name, 'wb') as f:
+ f.write(data)
+
+ # get ntacl for this entry and save alongside
+ ntacl_sddl_str = smb_helper.get_acl(r_name, as_sddl=True)
+ _create_ntacl_file(l_name, ntacl_sddl_str)
+
+ with tarfile.open(name=dest_tarfile_path, mode='w:gz') as tar:
+ for name in os.listdir(localdir):
+ path = os.path.join(localdir, name)
+ tar.add(path, arcname=name)
+
+ shutil.rmtree(localdir)
+
+
+def backup_offline(src_service_path, dest_tarfile_path, samdb_conn, smb_conf_path):
+ """
+ Backup files and ntacls to a tarfile for a service
+ """
+ service = src_service_path.rstrip('/').rsplit('/', 1)[-1]
+ tempdir = tempfile.mkdtemp()
+
+ dom_sid_str = samdb_conn.get_domain_sid()
+ dom_sid = security.dom_sid(dom_sid_str)
+
+ ntacls_helper = NtaclsHelper(service, smb_conf_path, dom_sid)
+
+ for dirpath, dirnames, filenames in os.walk(src_service_path):
+ # each dir only cares about its direct children
+ rel_dirpath = os.path.relpath(dirpath, start=src_service_path)
+ dst_dirpath = os.path.join(tempdir, rel_dirpath)
+
+ # create sub dirs and NTACL file
+ for dirname in dirnames:
+ src = os.path.join(dirpath, dirname)
+ dst = os.path.join(dst_dirpath, dirname)
+ # mkdir with metadata
+ smbd.mkdir(dst, service)
+ ntacl_sddl_str = ntacls_helper.getntacl(src, as_sddl=True)
+ _create_ntacl_file(dst, ntacl_sddl_str)
+
+ # create files and NTACL file, then copy data
+ for filename in filenames:
+ src = os.path.join(dirpath, filename)
+ dst = os.path.join(dst_dirpath, filename)
+ # create an empty file with metadata
+ smbd.create_file(dst, service)
+ ntacl_sddl_str = ntacls_helper.getntacl(src, as_sddl=True)
+ _create_ntacl_file(dst, ntacl_sddl_str)
+
+ # now put data in
+ with open(src, 'rb') as src_file:
+ data = src_file.read()
+ with open(dst, 'wb') as dst_file:
+ dst_file.write(data)
+
+ # add all files in tempdir to tarfile without a top folder
+ with tarfile.open(name=dest_tarfile_path, mode='w:gz') as tar:
+ for name in os.listdir(tempdir):
+ path = os.path.join(tempdir, name)
+ tar.add(path, arcname=name)
+
+ shutil.rmtree(tempdir)
+
+
+def backup_restore(src_tarfile_path, dst_service_path, samdb_conn, smb_conf_path):
+ """
+ Restore files and ntacls from a tarfile to a service
+ """
+ service = dst_service_path.rstrip('/').rsplit('/', 1)[-1]
+ tempdir = tempfile.mkdtemp() # src files
+
+ dom_sid_str = samdb_conn.get_domain_sid()
+ dom_sid = security.dom_sid(dom_sid_str)
+
+ ntacls_helper = NtaclsHelper(service, smb_conf_path, dom_sid)
+
+ with tarfile.open(src_tarfile_path) as f:
+ f.extractall(path=tempdir)
+ # e.g.: /tmp/tmpRNystY/{dir1,dir1.NTACL,...file1,file1.NTACL}
+
+ for dirpath, dirnames, filenames in os.walk(tempdir):
+ rel_dirpath = os.path.relpath(dirpath, start=tempdir)
+ dst_dirpath = os.path.normpath(
+ os.path.join(dst_service_path, rel_dirpath))
+
+ for dirname in dirnames:
+ if not dirname.endswith('.NTACL'):
+ src = os.path.join(dirpath, dirname)
+ dst = os.path.join(dst_dirpath, dirname)
+ if not os.path.isdir(dst):
+ # dst must be absolute path for smbd API
+ smbd.mkdir(dst, service)
+ ntacl_sddl_str = _read_ntacl_file(src)
+ ntacls_helper.setntacl(dst, ntacl_sddl_str)
+
+ for filename in filenames:
+ if not filename.endswith('.NTACL'):
+ src = os.path.join(dirpath, filename)
+ dst = os.path.join(dst_dirpath, filename)
+ if not os.path.isfile(dst):
+ # dst must be absolute path for smbd API
+ smbd.create_file(dst, service)
+ ntacl_sddl_str = _read_ntacl_file(src)
+ ntacls_helper.setntacl(dst, ntacl_sddl_str)
+
+ # now put data in
+ with open(src, 'rb') as src_file:
+ data = src_file.read()
+ with open(dst, 'wb') as dst_file:
+ dst_file.write(data)
+
+ shutil.rmtree(tempdir)
diff --git a/python/samba/tests/ntacls.py b/python/samba/tests/ntacls.py
index 8cd09fb..b345b28 100644
--- a/python/samba/tests/ntacls.py
+++ b/python/samba/tests/ntacls.py
@@ -18,65 +18,68 @@
"""Tests for samba.ntacls."""
+import os
+
from samba.ntacls import setntacl, getntacl, XattrBackendError
from samba.param import LoadParm
from samba.dcerpc import security
from samba.tests import TestCaseInTempDir, SkipTest
-import os
+
+NTACL_SDDL = "O:S-1-5-21-2212615479-2695158682-2101375467-512G:S-1-5-21-2212615479-2695158682-2101375467-513D:(A;OICI;0x001f01ff;;;S-1-5-21-2212615479-2695158682-2101375467-512)"
+DOMAIN_SID = "S-1-5-21-2212615479-2695158682-2101375467"
+
class NtaclsTests(TestCaseInTempDir):
+ def setUp(self):
+ super(NtaclsTests, self).setUp()
+ self.tempf = os.path.join(self.tempdir, "test")
+ open(self.tempf, 'w').write("empty")
+
+ def tearDown(self):
+ os.unlink(self.tempf)
+ super(NtaclsTests, self).tearDown()
+
def test_setntacl(self):
lp = LoadParm()
- acl = "O:S-1-5-21-2212615479-2695158682-2101375467-512G:S-1-5-21-2212615479-2695158682-2101375467-513D:(A;OICI;0x001f01ff;;;S-1-5-21-2212615479-2695158682-2101375467-512)"
open(self.tempf, 'w').write("empty")
- lp.set("posix:eadb",os.path.join(self.tempdir,"eadbtest.tdb"))
- setntacl(lp, self.tempf, acl, "S-1-5-21-2212615479-2695158682-2101375467")
- os.unlink(os.path.join(self.tempdir,"eadbtest.tdb"))
+ lp.set("posix:eadb", os.path.join(self.tempdir, "eadbtest.tdb"))
+ setntacl(lp, self.tempf, NTACL_SDDL, DOMAIN_SID)
+ os.unlink(os.path.join(self.tempdir, "eadbtest.tdb"))
def test_setntacl_getntacl(self):
lp = LoadParm()
- acl = "O:S-1-5-21-2212615479-2695158682-2101375467-512G:S-1-5-21-2212615479-2695158682-2101375467-513D:(A;OICI;0x001f01ff;;;S-1-5-21-2212615479-2695158682-2101375467-512)"
open(self.tempf, 'w').write("empty")
- lp.set("posix:eadb",os.path.join(self.tempdir,"eadbtest.tdb"))
- setntacl(lp,self.tempf,acl,"S-1-5-21-2212615479-2695158682-2101375467")
- facl = getntacl(lp,self.tempf)
+ lp.set("posix:eadb", os.path.join(self.tempdir, "eadbtest.tdb"))
+ setntacl(lp, self.tempf, NTACL_SDDL, DOMAIN_SID)
+ facl = getntacl(lp, self.tempf)
anysid = security.dom_sid(security.SID_NT_SELF)
- self.assertEquals(facl.as_sddl(anysid),acl)
- os.unlink(os.path.join(self.tempdir,"eadbtest.tdb"))
+ self.assertEquals(facl.as_sddl(anysid), NTACL_SDDL)
+ os.unlink(os.path.join(self.tempdir, "eadbtest.tdb"))
def test_setntacl_getntacl_param(self):
lp = LoadParm()
- acl = "O:S-1-5-21-2212615479-2695158682-2101375467-512G:S-1-5-21-2212615479-2695158682-2101375467-513D:(A;OICI;0x001f01ff;;;S-1-5-21-2212615479-2695158682-2101375467-512)"
open(self.tempf, 'w').write("empty")
- setntacl(lp,self.tempf,acl,"S-1-5-21-2212615479-2695158682-2101375467","tdb",os.path.join(self.tempdir,"eadbtest.tdb"))
- facl=getntacl(lp,self.tempf,"tdb",os.path.join(self.tempdir,"eadbtest.tdb"))
- domsid=security.dom_sid(security.SID_NT_SELF)
- self.assertEquals(facl.as_sddl(domsid),acl)
- os.unlink(os.path.join(self.tempdir,"eadbtest.tdb"))
+ setntacl(lp, self.tempf, NTACL_SDDL, DOMAIN_SID, "tdb",
+ os.path.join(self.tempdir, "eadbtest.tdb"))
+ facl = getntacl(lp, self.tempf, "tdb", os.path.join(
+ self.tempdir, "eadbtest.tdb"))
+ domsid = security.dom_sid(security.SID_NT_SELF)
+ self.assertEquals(facl.as_sddl(domsid), NTACL_SDDL)
+ os.unlink(os.path.join(self.tempdir, "eadbtest.tdb"))
def test_setntacl_invalidbackend(self):
lp = LoadParm()
- acl = "O:S-1-5-21-2212615479-2695158682-2101375467-512G:S-1-5-21-2212615479-2695158682-2101375467-513D:(A;OICI;0x001f01ff;;;S-1-5-21-2212615479-2695158682-2101375467-512)"
open(self.tempf, 'w').write("empty")
- self.assertRaises(XattrBackendError, setntacl, lp, self.tempf, acl, "S-1-5-21-2212615479-2695158682-2101375467","ttdb", os.path.join(self.tempdir,"eadbtest.tdb"))
+ self.assertRaises(XattrBackendError, setntacl, lp, self.tempf,
+ NTACL_SDDL, DOMAIN_SID, "ttdb",
+ os.path.join(self.tempdir, "eadbtest.tdb"))
def test_setntacl_forcenative(self):
if os.getuid() == 0:
raise SkipTest("Running test as root, test skipped")
lp = LoadParm()
- acl = "O:S-1-5-21-2212615479-2695158682-2101375467-512G:S-1-5-21-2212615479-2695158682-2101375467-513D:(A;OICI;0x001f01ff;;;S-1-5-21-2212615479-2695158682-2101375467-512)"
- open(self.tempf, 'w').write("empty")
- lp.set("posix:eadb", os.path.join(self.tempdir,"eadbtest.tdb"))
- self.assertRaises(Exception, setntacl, lp, self.tempf ,acl,
- "S-1-5-21-2212615479-2695158682-2101375467","native")
-
-
- def setUp(self):
- super(NtaclsTests, self).setUp()
- self.tempf = os.path.join(self.tempdir, "test")
open(self.tempf, 'w').write("empty")
-
- def tearDown(self):
- os.unlink(self.tempf)
- super(NtaclsTests, self).tearDown()
+ lp.set("posix:eadb", os.path.join(self.tempdir, "eadbtest.tdb"))
+ self.assertRaises(Exception, setntacl, lp, self.tempf, NTACL_SDDL,
+ DOMAIN_SID, "native")
diff --git a/python/samba/tests/ntacls_backup.py b/python/samba/tests/ntacls_backup.py
new file mode 100644
index 0000000..9ab264a
--- /dev/null
+++ b/python/samba/tests/ntacls_backup.py
@@ -0,0 +1,185 @@
+# Unix SMB/CIFS implementation. Tests for ntacls manipulation
+# Copyright (C) Andrew Bartlett 2018
+# Copyright (C) Joe Guo <joeg at catalyst.net.nz> 2018
+#
+# 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 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# 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, see <http://www.gnu.org/licenses/>.
+#
+
+"""Tests for samba ntacls backup"""
+import os
+
+from samba import smb
+from samba.samba3 import smbd
+from samba import samdb
+from samba import ntacls
+
+from samba.auth import system_session
+from samba.param import LoadParm
+from samba.dcerpc import security
+from samba.tests import TestCaseInTempDir
+
+
+class NtaclsBackupRestoreTests(TestCaseInTempDir):
+ """
+ Tests for NTACLs backup and restore.
+ """
+
+ def setUp(self):
+ super(NtaclsBackupRestoreTests, self).setUp()
+
+ self.server = os.environ["SERVER"] # addc
+ samdb_url='ldap://' + self.server
--
Samba Shared Repository
More information about the samba-cvs
mailing list