diff options
author | David Mulder <dmulder@suse.com> | 2020-11-13 07:28:00 -0700 |
---|---|---|
committer | David Mulder <dmulder@samba.org> | 2020-12-09 17:38:28 +0000 |
commit | 2705d39bff3ddb74c78659866079195b921af5ed (patch) | |
tree | 50a475c462eb64de4a05d74f08ed6a3e7a90960b /python | |
parent | fff3e0eb6afe4ef2d6b74bf80413c74b176bc441 (diff) | |
download | samba-2705d39bff3ddb74c78659866079195b921af5ed.tar.gz |
samba-tool: Test gpo smb.conf set command
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'python')
-rw-r--r-- | python/samba/netcmd/gpo.py | 24 | ||||
-rw-r--r-- | python/samba/tests/samba_tool/gpo.py | 42 |
2 files changed, 66 insertions, 0 deletions
diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py index b9c50c82797..ea3f891a3df 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -2135,10 +2135,34 @@ samba-tool gpo manage smb_conf list {31B2F340-016D-11D2-945F-00C04FB984F9} val = lp.get(entry.valuename) self.outf.write('%s = %s\n' % (entry.valuename, val)) +class cmd_set_smb_conf(Command): + """Sets a Samba smb.conf Group Policy to the sysvol + """ + + synopsis = "%prog <gpo> <entry> [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_smb_conf(SuperCommand): """Manage smb.conf Group Policy Objects""" subcommands = {} subcommands["list"] = cmd_list_smb_conf() + subcommands["set"] = cmd_set_smb_conf() 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 82d9cd4a10b..24b9c547ee2 100644 --- a/python/samba/tests/samba_tool/gpo.py +++ b/python/samba/tests/samba_tool/gpo.py @@ -548,6 +548,48 @@ class GpoCmdTestCase(SambaToolCmdTest): 'Filling PolicyDefinitions failed') shutil.rmtree(admx_path) + def test_smb_conf_set(self): + lp = LoadParm() + lp.load(os.environ['SERVERCONFFILE']) + local_path = lp.get('path', 'sysvol') + reg_pol = os.path.join(local_path, lp.get('realm').lower(), 'Policies', + self.gpo_guid, 'Machine/Registry.pol') + + policy = 'apply group policies' + (result, out, err) = self.runsublevelcmd("gpo", ("manage", "smb_conf", + "set"), self.gpo_guid, + policy, "yes", + "-H", "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertCmdSuccess(result, out, err, + 'Failed to set apply group policies') + + self.assertTrue(os.path.exists(reg_pol), + 'The Registry.pol does not exist') + reg_data = ndr_unpack(preg.file, open(reg_pol, 'rb').read()) + ret = any([get_string(e.valuename) == policy and e.data == 1 \ + for e in reg_data.entries]) + self.assertTrue(ret, 'The sudoers entry was not added') + + # Ensure an empty set command deletes the entry + (result, out, err) = self.runsublevelcmd("gpo", ("manage", "smb_conf", + "set"), self.gpo_guid, + policy, "-H", "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertCmdSuccess(result, out, err, + 'Failed to unset apply group policies') + + reg_data = ndr_unpack(preg.file, open(reg_pol, 'rb').read()) + ret = not any([get_string(e.valuename) == policy and e.data == 1 \ + for e in reg_data.entries]) + self.assertTrue(ret, 'The sudoers entry was not removed') + def test_smb_conf_list(self): lp = LoadParm() lp.load(os.environ['SERVERCONFFILE']) |