summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Mulder <dmulder@suse.com>2021-02-19 12:36:50 -0700
committerJeremy Allison <jra@samba.org>2021-03-08 20:57:50 +0000
commit77f96a3079ef4cad1aa45f08588c179264b0bab9 (patch)
tree56630a585e869ca228cd99b87795ea12d0403409
parent7593e067fa20b459ba7d9f77984e52cf6b4e6ee6 (diff)
downloadsamba-77f96a3079ef4cad1aa45f08588c179264b0bab9.tar.gz
samba-tool: Add a gpo command for setting VGP Issue Group Policy
Signed-off-by: David Mulder <dmulder@suse.com> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Mon Mar 8 20:57:50 UTC 2021 on sn-devel-184
-rw-r--r--docs-xml/manpages/samba-tool.8.xml5
-rw-r--r--python/samba/netcmd/gpo.py68
-rw-r--r--selftest/knownfail.d/gpo1
3 files changed, 72 insertions, 2 deletions
diff --git a/docs-xml/manpages/samba-tool.8.xml b/docs-xml/manpages/samba-tool.8.xml
index 2d1920a2c23..346143ddafe 100644
--- a/docs-xml/manpages/samba-tool.8.xml
+++ b/docs-xml/manpages/samba-tool.8.xml
@@ -969,6 +969,11 @@
<para>List VGP Issue Group Policy from the sysvol.</para>
</refsect3>
+<refsect3>
+ <title>gpo manage issue set</title>
+ <para>Sets a VGP Issue Group Policy to the sysvol</para>
+</refsect3>
+
<refsect2>
<title>group</title>
<para>Manage groups.</para>
diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py
index d22c76c8a4a..cb70367509e 100644
--- a/python/samba/netcmd/gpo.py
+++ b/python/samba/netcmd/gpo.py
@@ -3579,7 +3579,73 @@ samba-tool gpo manage issue set {31B2F340-016D-11D2-945F-00C04FB984F9} "Welcome
def run(self, gpo, value=None, 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\\Issue'])
+ vgp_xml = '\\'.join([vgp_dir, 'manifest.xml'])
+
+ if value is None:
+ conn.unlink(vgp_xml)
+ return
+
+ try:
+ xml_data = ET.fromstring(conn.loadfile(vgp_xml))
+ 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]:
+ # The file doesn't exist, so create the xml structure
+ xml_data = ET.ElementTree(ET.Element('vgppolicy'))
+ policysetting = ET.SubElement(xml_data.getroot(),
+ 'policysetting')
+ pv = ET.SubElement(policysetting, 'version')
+ pv.text = '1'
+ name = ET.SubElement(policysetting, 'name')
+ name.text = 'Text File'
+ description = ET.SubElement(policysetting, 'description')
+ description.text = 'Represents a Generic Text File'
+ apply_mode = ET.SubElement(policysetting, 'apply_mode')
+ apply_mode.text = 'replace'
+ data = ET.SubElement(policysetting, 'data')
+ filename = ET.SubElement(data, 'filename')
+ filename.text = 'issue'
+ elif e.args[0] == 0xC0000022: # STATUS_ACCESS_DENIED
+ raise CommandError("The authenticated user does "
+ "not have sufficient privileges")
+ else:
+ raise
+
+ text = ET.SubElement(data, 'text')
+ text.text = value
+
+ 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_issue(SuperCommand):
"""Manage Issue Group Policy Objects"""
diff --git a/selftest/knownfail.d/gpo b/selftest/knownfail.d/gpo
deleted file mode 100644
index 67dfdba0d28..00000000000
--- a/selftest/knownfail.d/gpo
+++ /dev/null
@@ -1 +0,0 @@
-^samba.tests.samba_tool.gpo.samba.tests.samba_tool.gpo.GpoCmdTestCase.test_vgp_issue_set