sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-24 04:23:53 +03:00
Code Activity

samba-tool: gpo load add Registry ext by default

Browse Source 
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Tested-by: Kees van Vloten <keesvanvloten@gmail.com>
This commit is contained in:
David Mulder
2022-02-15 14:45:41 -07:00
committed by Andrew Bartlett
parent a345214712
commit e7737d6bb2
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/samba/netcmd/gpo.py
View File

@@ -723,6 +723,8 @@ class cmd_load(GPOCommand):
names for Windows Group Policy to work correctly. These GUIDs represent
the client side extensions to apply on the machine. Linux Group Policy does
not enforce this constraint.
{35378EAC-683F-11D2-A89A-00C04FBBCFA2} is provided by default, which
enables most Registry policies.
"""
synopsis = "%prog <gpo> [options]"
@@ -739,14 +741,18 @@ class cmd_load(GPOCommand):
Option("-H", help="LDB URL for database or target server", type=str),
Option("--content", help="JSON file of policy inputs", type=str),
Option("--machine-ext-name",
action="append", default=[], dest="machine_exts",
action="append", dest="machine_exts",
default=['{35378EAC-683F-11D2-A89A-00C04FBBCFA2}'],
help="A machine extension name to add to gPCMachineExtensionNames"),
Option("--user-ext-name",
action="append", default=[], dest="user_exts",
action="append", dest="user_exts",
default=['{35378EAC-683F-11D2-A89A-00C04FBBCFA2}'],
help="A user extension name to add to gPCUserExtensionNames")
]
def run(self, gpo, H=None, content=None, machine_exts=[], user_exts=[],
def run(self, gpo, H=None, content=None,
machine_exts=['{35378EAC-683F-11D2-A89A-00C04FBBCFA2}'],
user_exts=['{35378EAC-683F-11D2-A89A-00C04FBBCFA2}'],
sambaopts=None, credopts=None, versionopts=None):
if content is None:
policy_defs = json.loads(sys.stdin.read())

16
python/samba/tests/samba_tool/gpo.py
View File

@@ -1583,6 +1583,20 @@ class GpoCmdTestCase(SambaToolCmdTest):
(os.environ["USERNAME"],
os.environ["PASSWORD"]))
self.assertCmdSuccess(result, out, err, 'Loading policy failed')
# Write the default registry extension
with NamedTemporaryFile() as f:
f.write(b'[]') # Intentionally empty policy
f.flush()
# Load an empty policy, taking the default client extension
(result, out, err) = self.runsubcmd("gpo", "load",
self.gpo_guid,
"--content=%s" % f.name,
"-H", "ldap://%s" %
os.environ["SERVER"],
"-U%s%%%s" %
(os.environ["USERNAME"],
os.environ["PASSWORD"]))
self.assertCmdSuccess(result, out, err, 'Loading policy failed')
(result, out, err) = self.runsubcmd("gpo", "show", self.gpo_guid, "-H",
"ldap://%s" % os.environ["SERVER"])
@@ -1591,6 +1605,8 @@ class GpoCmdTestCase(SambaToolCmdTest):
self.assertIn('samba.org', out, 'Homepage policy not loaded')
self.assertIn(ext_guids[0], out, 'Machine extension not loaded')
self.assertIn(ext_guids[1], out, 'User extension not loaded')
self.assertIn('{35378eac-683f-11d2-a89a-00c04fbbcfa2}', out,
'Default extension not loaded')
toolbar_data = '"valuename": "IEToolbar",\n "class": "USER",' + \
'\n "type": "REG_BINARY",' + \
'\n "data": [\n 0\n ]'