From: David Mulder Date: Thu, 21 Jan 2021 16:49:48 +0000 (-0700) Subject: samba-tool: Test gpo manage symlink list command X-Git-Tag: tevent-0.11.0~1974 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9cba18528d6ffa71bfea9a147d2b16f2e057dc2;p=thirdparty%2Fsamba.git samba-tool: Test gpo manage symlink list command Signed-off-by: David Mulder Reviewed-by: Jeremy Allison --- diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py index 8be7368282f..e2cf0dd349f 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -2240,12 +2240,45 @@ class cmd_smb_conf(SuperCommand): subcommands["list"] = cmd_list_smb_conf() subcommands["set"] = cmd_set_smb_conf() +class cmd_list_symlink(Command): + """List VGP Symbolic Link Group Policy from the sysvol + +This command lists symlink settings from the sysvol that will be applied to winbind clients. + +Example: +samba-tool gpo manage symlink list {31B2F340-016D-11D2-945F-00C04FB984F9} + """ + + synopsis = "%prog [options]" + + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + + takes_options = [ + Option("-H", "--URL", help="LDB URL for database or target server", type=str, + metavar="URL", dest="H"), + ] + + takes_args = ["gpo"] + + def run(self, gpo, H=None, sambaopts=None, credopts=None, versionopts=None): + pass + +class cmd_symlink(SuperCommand): + """Manage symlink Group Policy Objects""" + subcommands = {} + subcommands["list"] = cmd_list_symlink() + class cmd_manage(SuperCommand): """Manage Group Policy Objects""" subcommands = {} subcommands["sudoers"] = cmd_sudoers() subcommands["security"] = cmd_security() subcommands["smb_conf"] = cmd_smb_conf() + subcommands["symlink"] = cmd_symlink() class cmd_gpo(SuperCommand): """Group Policy Object (GPO) management.""" diff --git a/python/samba/tests/samba_tool/gpo.py b/python/samba/tests/samba_tool/gpo.py index 24b9c547ee2..351a3f974e2 100644 --- a/python/samba/tests/samba_tool/gpo.py +++ b/python/samba/tests/samba_tool/gpo.py @@ -31,6 +31,7 @@ from samba.ndr import ndr_pack, ndr_unpack from samba.common import get_string from configparser import ConfigParser from io import StringIO +import xml.etree.ElementTree as etree source_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../../..")) @@ -774,6 +775,46 @@ class GpoCmdTestCase(SambaToolCmdTest): # Unstage the Registry.pol file unstage_file(reg_pol) + def test_symlink_list(self): + lp = LoadParm() + lp.load(os.environ['SERVERCONFFILE']) + local_path = lp.get('path', 'sysvol') + vgp_xml = os.path.join(local_path, lp.get('realm').lower(), 'Policies', + self.gpo_guid, 'Machine/VGP/VTLA/Unix', + 'Symlink/manifest.xml') + stage = etree.Element('vgppolicy') + policysetting = etree.SubElement(stage, 'policysetting') + pv = etree.SubElement(policysetting, 'version') + pv.text = '1' + name = etree.SubElement(policysetting, 'name') + name.text = 'Symlink Policy' + description = etree.SubElement(policysetting, 'description') + description.text = 'Specifies symbolic link data' + apply_mode = etree.SubElement(policysetting, 'apply_mode') + apply_mode.text = 'merge' + data = etree.SubElement(policysetting, 'data') + file_properties = etree.SubElement(data, 'file_properties') + source = etree.SubElement(file_properties, 'source') + source.text = os.path.join(self.tempdir, 'test.source') + target = etree.SubElement(file_properties, 'target') + target.text = os.path.join(self.tempdir, 'test.target') + ret = stage_file(vgp_xml, etree.tostring(stage, 'utf-8')) + self.assertTrue(ret, 'Could not create the target %s' % vgp_xml) + + symlink = 'ln -s %s %s' % (source.text, target.text) + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "symlink", "list"), + self.gpo_guid, "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertIn(symlink, out, 'The test entry was not found!') + + # Unstage the manifest.xml file + unstage_file(vgp_xml) + def setUp(self): """set up a temporary GPO to work with""" super(GpoCmdTestCase, self).setUp() diff --git a/selftest/knownfail.d/gpo b/selftest/knownfail.d/gpo new file mode 100644 index 00000000000..193712781d0 --- /dev/null +++ b/selftest/knownfail.d/gpo @@ -0,0 +1 @@ +^samba.tests.samba_tool.gpo.samba.tests.samba_tool.gpo.GpoCmdTestCase.test_symlink_list