From: David Mulder Date: Wed, 23 Dec 2020 21:29:58 +0000 (-0700) Subject: samba-tool: Test gpo manage openssh set command X-Git-Tag: tevent-0.11.0~1776 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be8f0d8ddbb9a145bd171618ef7183b9ed648203;p=thirdparty%2Fsamba.git samba-tool: Test gpo manage openssh set 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 796945f5d2f..ae5ea3be462 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -2831,10 +2831,40 @@ samba-tool gpo manage openssh list {31B2F340-016D-11D2-945F-00C04FB984F9} self.outf.write('%s %s\n' % (kv.find('key').text, kv.find('value').text)) +class cmd_set_openssh(Command): + """Sets a VGP OpenSSH Group Policy to the sysvol + +This command sets an openssh setting to the sysvol for applying to winbind +clients. Not providing a value will unset the policy. + +Example: +samba-tool gpo manage openssh set {31B2F340-016D-11D2-945F-00C04FB984F9} KerberosAuthentication Yes + """ + + 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", "setting", "value?"] + + def run(self, gpo, setting, value=None, H=None, sambaopts=None, + credopts=None, versionopts=None): + pass + class cmd_openssh(SuperCommand): """Manage OpenSSH Group Policy Objects""" subcommands = {} subcommands["list"] = cmd_list_openssh() + subcommands["set"] = cmd_set_openssh() 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 8c6f2592986..d678a96352b 100644 --- a/python/samba/tests/samba_tool/gpo.py +++ b/python/samba/tests/samba_tool/gpo.py @@ -1033,6 +1033,51 @@ class GpoCmdTestCase(SambaToolCmdTest): # Unstage the manifest.xml file unstage_file(vgp_xml) + def test_vgp_openssh_set(self): + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "openssh", "set"), + self.gpo_guid, + "KerberosAuthentication", + "Yes", "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertCmdSuccess(result, out, err, 'OpenSSH set failed') + + openssh = 'KerberosAuthentication Yes' + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "openssh", "list"), + self.gpo_guid, "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertIn(openssh, out, 'The test entry was not found!') + + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "openssh", "set"), + self.gpo_guid, + "KerberosAuthentication", "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertCmdSuccess(result, out, err, 'OpenSSH unset failed') + + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "openssh", "list"), + self.gpo_guid, "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertNotIn(openssh, 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..754773d7596 --- /dev/null +++ b/selftest/knownfail.d/gpo @@ -0,0 +1 @@ +^samba.tests.samba_tool.gpo.samba.tests.samba_tool.gpo.GpoCmdTestCase.test_vgp_openssh_set