From 709a6d6491f24c9325977770d2ab274cf6485b84 Mon Sep 17 00:00:00 2001 From: David Mulder Date: Thu, 21 Jan 2021 12:39:42 -0700 Subject: [PATCH] samba-tool: Add a gpo command for removing VGP Symbolic Link Group Policy Signed-off-by: David Mulder Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Wed Jan 27 07:32:03 UTC 2021 on sn-devel-184 --- docs-xml/manpages/samba-tool.8.xml | 5 +++ python/samba/netcmd/gpo.py | 60 +++++++++++++++++++++++++++++- selftest/knownfail.d/gpo | 1 - 3 files changed, 64 insertions(+), 2 deletions(-) delete mode 100644 selftest/knownfail.d/gpo diff --git a/docs-xml/manpages/samba-tool.8.xml b/docs-xml/manpages/samba-tool.8.xml index ce22af7c115..83511b4ddf6 100644 --- a/docs-xml/manpages/samba-tool.8.xml +++ b/docs-xml/manpages/samba-tool.8.xml @@ -894,6 +894,11 @@ Adds a VGP Symbolic Link Group Policy to the sysvol + + gpo manage symlink remove + Removes a VGP Symbolic Link Group Policy from the sysvol + + group Manage groups. diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py index 52ef041032f..2a3ffdfe557 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -2421,7 +2421,65 @@ samba-tool gpo manage symlink remove {31B2F340-016D-11D2-945F-00C04FB984F9} /tmp def run(self, gpo, source, target, H=None, sambaopts=None, credopts=None, versionopts=None): - pass + self.lp = sambaopts.get_loadparm() + self.creds = credopts.get_credentials(self.lp, fallback_machine=True) + + # We need to know writable DC to setup SMB connection + if H and H.startswith('ldap://'): + dc_hostname = H[7:] + self.url = H + else: + dc_hostname = netcmd_finddc(self.lp, self.creds) + self.url = dc_url(self.lp, self.creds, dc=dc_hostname) + + # SMB connect to DC + conn = smb_connection(dc_hostname, + 'sysvol', + lp=self.lp, + creds=self.creds) + + realm = self.lp.get('realm') + vgp_dir = '\\'.join([realm.lower(), 'Policies', gpo, + 'MACHINE\\VGP\\VTLA\\Unix\\Symlink']) + vgp_xml = '\\'.join([vgp_dir, 'manifest.xml']) + try: + xml_data = ET.ElementTree(ET.fromstring(conn.loadfile(vgp_xml))) + policy = xml_data.getroot().find('policysetting') + data = policy.find('data') + except NTSTATUSError as e: + # STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_NAME_NOT_FOUND, + # STATUS_OBJECT_PATH_NOT_FOUND + if e.args[0] in [0xC0000033, 0xC0000034, 0xC000003A]: + raise CommandError("Cannot remove link from '%s' to '%s' " + "because it does not exist" % source, target) + elif e.args[0] == 0xC0000022: # STATUS_ACCESS_DENIED + raise CommandError("The authenticated user does " + "not have sufficient privileges") + else: + raise + + for file_properties in data.findall('file_properties'): + source_elm = file_properties.find('source') + target_elm = file_properties.find('target') + if source_elm.text == source and target_elm.text == target: + data.remove(file_properties) + break + else: + raise CommandError("Cannot remove link from '%s' to '%s' " + "because it does not exist" % source, target) + + + out = BytesIO() + xml_data.write(out, encoding='UTF-8', xml_declaration=True) + out.seek(0) + try: + create_directory_hier(conn, vgp_dir) + conn.savefile(vgp_xml, out.read()) + except NTSTATUSError as e: + if e.args[0] == 0xC0000022: # STATUS_ACCESS_DENIED + raise CommandError("The authenticated user does " + "not have sufficient privileges") + raise class cmd_symlink(SuperCommand): """Manage symlink Group Policy Objects""" diff --git a/selftest/knownfail.d/gpo b/selftest/knownfail.d/gpo deleted file mode 100644 index c73da923324..00000000000 --- a/selftest/knownfail.d/gpo +++ /dev/null @@ -1 +0,0 @@ -^samba.tests.samba_tool.gpo.samba.tests.samba_tool.gpo.GpoCmdTestCase.test_symlink_add