From 7593e067fa20b459ba7d9f77984e52cf6b4e6ee6 Mon Sep 17 00:00:00 2001 From: David Mulder Date: Fri, 19 Feb 2021 12:33:42 -0700 Subject: [PATCH] samba-tool: Test gpo manage issue set command Signed-off-by: David Mulder Reviewed-by: Jeremy Allison --- python/samba/netcmd/gpo.py | 30 +++++++++++++++++++ python/samba/tests/samba_tool/gpo.py | 44 ++++++++++++++++++++++++++++ selftest/knownfail.d/gpo | 1 + 3 files changed, 75 insertions(+) create mode 100644 selftest/knownfail.d/gpo diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py index 566f3bf3e9d..d22c76c8a4a 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -3552,10 +3552,40 @@ samba-tool gpo manage issue list {31B2F340-016D-11D2-945F-00C04FB984F9} text = data.find('text') self.outf.write(text.text) +class cmd_set_issue(Command): + """Sets a VGP Issue Group Policy to the sysvol + +This command sets the Prelogin Message to the sysvol for applying to winbind +clients. Not providing a value will unset the policy. + +Example: +samba-tool gpo manage issue set {31B2F340-016D-11D2-945F-00C04FB984F9} "Welcome to Samba!" + """ + + synopsis = "%prog [value] [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", "value?"] + + def run(self, gpo, value=None, H=None, sambaopts=None, credopts=None, + versionopts=None): + pass + class cmd_issue(SuperCommand): """Manage Issue Group Policy Objects""" subcommands = {} subcommands["list"] = cmd_list_issue() + subcommands["set"] = cmd_set_issue() class cmd_manage(SuperCommand): """Manage Group Policy Objects""" diff --git a/python/samba/tests/samba_tool/gpo.py b/python/samba/tests/samba_tool/gpo.py index 50d25d74a52..851a76b9885 100644 --- a/python/samba/tests/samba_tool/gpo.py +++ b/python/samba/tests/samba_tool/gpo.py @@ -1345,6 +1345,50 @@ class GpoCmdTestCase(SambaToolCmdTest): # Unstage the manifest.xml file unstage_file(vgp_xml) + def test_vgp_issue_set(self): + text = 'Welcome to Samba!' + msg = '"%s\n"' % text + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "issue", "set"), + self.gpo_guid, + msg, "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertCmdSuccess(result, out, err, 'Issue set failed') + + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "issue", "list"), + self.gpo_guid, "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertIn(text, out, 'The test entry was not found!') + + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "issue", "set"), + self.gpo_guid, "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertCmdSuccess(result, out, err, 'Issue unset failed') + + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "issue", "list"), + self.gpo_guid, "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertNotIn(text, out, 'The test entry was still found!') + 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..67dfdba0d28 --- /dev/null +++ b/selftest/knownfail.d/gpo @@ -0,0 +1 @@ +^samba.tests.samba_tool.gpo.samba.tests.samba_tool.gpo.GpoCmdTestCase.test_vgp_issue_set -- 2.47.3