[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Mon Mar 8 20:58:01 UTC 2021


The branch, master has been updated
       via  77f96a3079e samba-tool: Add a gpo command for setting VGP Issue Group Policy
       via  7593e067fa2 samba-tool: Test gpo manage issue set command
       via  0f5af87fbf8 samba-tool: Add a gpo command for listing VGP Issue Group Policy
       via  bb47a68ca9c samba-tool: Test gpo manage issue list command
       via  2461c89c079 gpo: Apply Group Policy Issue setting from VGP
       via  9df279dde61 gpo: Test Group Policy VGP Issue Policy
       via  5046912ceb3 samba-tool: Add a gpo command for setting VGP MOTD Group Policy
       via  4715a0ee0d9 samba-tool: Test gpo manage motd set command
       via  0fbc5e54142 samba-tool: Add a gpo command for listing VGP MOTD Group Policy
       via  f8d68d9f84d samba-tool: Test gpo manage motd list command
       via  efc9bce8689 gpo: Apply Group Policy MOTD setting from VGP
       via  f200c6933b3 gpo: Test Group Policy VGP MOTD Policy
      from  e5e0a9a7318 gpo: Don't free talloc pointer held elsewhere

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 77f96a3079ef4cad1aa45f08588c179264b0bab9
Author: David Mulder <dmulder at suse.com>
Date:   Fri Feb 19 12:36:50 2021 -0700

    samba-tool: Add a gpo command for setting VGP Issue Group Policy
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Mon Mar  8 20:57:50 UTC 2021 on sn-devel-184

commit 7593e067fa20b459ba7d9f77984e52cf6b4e6ee6
Author: David Mulder <dmulder at suse.com>
Date:   Fri Feb 19 12:33:42 2021 -0700

    samba-tool: Test gpo manage issue set command
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 0f5af87fbf8aa4f6a4f95c2e3e85a53846441dd6
Author: David Mulder <dmulder at suse.com>
Date:   Fri Feb 19 12:25:00 2021 -0700

    samba-tool: Add a gpo command for listing VGP Issue Group Policy
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit bb47a68ca9cfabadf2f70210be7d5f90dc92ee62
Author: David Mulder <dmulder at suse.com>
Date:   Fri Feb 19 11:01:08 2021 -0700

    samba-tool: Test gpo manage issue list command
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 2461c89c079cc99ea2c6806fda52e76d7814d494
Author: David Mulder <dmulder at suse.com>
Date:   Fri Feb 19 10:22:04 2021 -0700

    gpo: Apply Group Policy Issue setting from VGP
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 9df279dde61ab5449f8e15098f7a2c191bf45aaa
Author: David Mulder <dmulder at suse.com>
Date:   Fri Feb 19 09:45:38 2021 -0700

    gpo: Test Group Policy VGP Issue Policy
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 5046912ceb369c754a60be230f964aaeafb20b19
Author: David Mulder <dmulder at suse.com>
Date:   Thu Feb 18 09:42:49 2021 -0700

    samba-tool: Add a gpo command for setting VGP MOTD Group Policy
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 4715a0ee0d946caca1fab3e1218205ad68f5b20b
Author: David Mulder <dmulder at suse.com>
Date:   Thu Feb 18 08:50:25 2021 -0700

    samba-tool: Test gpo manage motd set command
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 0fbc5e5414296f71719553103d330a3524369bf3
Author: David Mulder <dmulder at suse.com>
Date:   Thu Feb 18 07:50:08 2021 -0700

    samba-tool: Add a gpo command for listing VGP MOTD Group Policy
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit f8d68d9f84d9d306297db94810d6e2f9bd4f8efb
Author: David Mulder <dmulder at suse.com>
Date:   Wed Feb 17 14:58:51 2021 -0700

    samba-tool: Test gpo manage motd list command
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit efc9bce8689ee1354648feee008cc255e653df92
Author: David Mulder <dmulder at suse.com>
Date:   Wed Feb 17 14:43:50 2021 -0700

    gpo: Apply Group Policy MOTD setting from VGP
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit f200c6933b39988a815a064efd165aee106d117d
Author: David Mulder <dmulder at suse.com>
Date:   Wed Feb 17 13:24:55 2021 -0700

    gpo: Test Group Policy VGP MOTD Policy
    
    Signed-off-by: David Mulder <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages/samba-tool.8.xml                 |  20 ++
 python/samba/netcmd/gpo.py                         | 332 +++++++++++++++++++++
 python/samba/tests/gpo.py                          | 100 +++++++
 python/samba/tests/samba_tool/gpo.py               | 166 +++++++++++
 .../samba/{vgp_symlink_ext.py => vgp_issue_ext.py} |  53 ++--
 .../samba/{vgp_symlink_ext.py => vgp_motd_ext.py}  |  53 ++--
 source4/scripting/bin/samba-gpupdate               |   4 +
 7 files changed, 670 insertions(+), 58 deletions(-)
 copy python/samba/{vgp_symlink_ext.py => vgp_issue_ext.py} (54%)
 copy python/samba/{vgp_symlink_ext.py => vgp_motd_ext.py} (54%)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/samba-tool.8.xml b/docs-xml/manpages/samba-tool.8.xml
index b808c9b2616..346143ddafe 100644
--- a/docs-xml/manpages/samba-tool.8.xml
+++ b/docs-xml/manpages/samba-tool.8.xml
@@ -954,6 +954,26 @@
 	<para>Removes VGP Startup Script Group Policy from the sysvol</para>
 </refsect3>
 
+<refsect3>
+	<title>gpo manage motd list</title>
+	<para>List VGP MOTD Group Policy from the sysvol.</para>
+</refsect3>
+
+<refsect3>
+	<title>gpo manage motd set</title>
+	<para>Sets a VGP MOTD Group Policy to the sysvol</para>
+</refsect3>
+
+<refsect3>
+	<title>gpo manage issue list</title>
+	<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 818c46ddb1a..cb70367509e 100644
--- a/python/samba/netcmd/gpo.py
+++ b/python/samba/netcmd/gpo.py
@@ -3323,6 +3323,336 @@ class cmd_scripts(SuperCommand):
     subcommands = {}
     subcommands["startup"] = cmd_startup()
 
+class cmd_list_motd(Command):
+    """List VGP MOTD Group Policy from the sysvol
+
+This command lists the Message of the Day from the sysvol that will be applied
+to winbind clients.
+
+Example:
+samba-tool gpo manage motd list {31B2F340-016D-11D2-945F-00C04FB984F9}
+    """
+
+    synopsis = "%prog <gpo> [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"]
+
+    def run(self, gpo, H=None, sambaopts=None, credopts=None, versionopts=None):
+        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_xml = '\\'.join([realm.lower(), 'Policies', gpo,
+                                'MACHINE\\VGP\\VTLA\\Unix',
+                                'MOTD\\manifest.xml'])
+        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]:
+                return # The file doesn't exist, so there is nothing to list
+            if e.args[0] == 0xC0000022: # STATUS_ACCESS_DENIED
+                raise CommandError("The authenticated user does "
+                                   "not have sufficient privileges")
+            raise
+
+        policy = xml_data.find('policysetting')
+        data = policy.find('data')
+        text = data.find('text')
+        self.outf.write(text.text)
+
+class cmd_set_motd(Command):
+    """Sets a VGP MOTD Group Policy to the sysvol
+
+This command sets the Message of the Day to the sysvol for applying to winbind
+clients. Not providing a value will unset the policy.
+
+Example:
+samba-tool gpo manage motd set {31B2F340-016D-11D2-945F-00C04FB984F9} "Message for today"
+    """
+
+    synopsis = "%prog <gpo> [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):
+        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\\MOTD'])
+        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 = 'motd'
+            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_motd(SuperCommand):
+    """Manage Message of the Day Group Policy Objects"""
+    subcommands = {}
+    subcommands["list"] = cmd_list_motd()
+    subcommands["set"] = cmd_set_motd()
+
+class cmd_list_issue(Command):
+    """List VGP Issue Group Policy from the sysvol
+
+This command lists the Prelogin Message from the sysvol that will be applied
+to winbind clients.
+
+Example:
+samba-tool gpo manage issue list {31B2F340-016D-11D2-945F-00C04FB984F9}
+    """
+
+    synopsis = "%prog <gpo> [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"]
+
+    def run(self, gpo, H=None, sambaopts=None, credopts=None, versionopts=None):
+        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_xml = '\\'.join([realm.lower(), 'Policies', gpo,
+                                'MACHINE\\VGP\\VTLA\\Unix',
+                                'Issue\\manifest.xml'])
+        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]:
+                return # The file doesn't exist, so there is nothing to list
+            if e.args[0] == 0xC0000022: # STATUS_ACCESS_DENIED
+                raise CommandError("The authenticated user does "
+                                   "not have sufficient privileges")
+            raise
+
+        policy = xml_data.find('policysetting')
+        data = policy.find('data')
+        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 <gpo> [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):
+        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"""
+    subcommands = {}
+    subcommands["list"] = cmd_list_issue()
+    subcommands["set"] = cmd_set_issue()
+
 class cmd_manage(SuperCommand):
     """Manage Group Policy Objects"""
     subcommands = {}
@@ -3333,6 +3663,8 @@ class cmd_manage(SuperCommand):
     subcommands["files"] = cmd_files()
     subcommands["openssh"] = cmd_openssh()
     subcommands["scripts"] = cmd_scripts()
+    subcommands["motd"] = cmd_motd()
+    subcommands["issue"] = cmd_issue()
 
 class cmd_gpo(SuperCommand):
     """Group Policy Object (GPO) management."""
diff --git a/python/samba/tests/gpo.py b/python/samba/tests/gpo.py
index f849ff2c031..dfd2394f353 100644
--- a/python/samba/tests/gpo.py
+++ b/python/samba/tests/gpo.py
@@ -34,6 +34,8 @@ from samba.gp_smb_conf_ext import gp_smb_conf_ext
 from samba.vgp_files_ext import vgp_files_ext
 from samba.vgp_openssh_ext import vgp_openssh_ext
 from samba.vgp_startup_scripts_ext import vgp_startup_scripts_ext
+from samba.vgp_motd_ext import vgp_motd_ext
+from samba.vgp_issue_ext import vgp_issue_ext
 import logging
 from samba.credentials import Credentials
 from samba.gp_msgs_ext import gp_msgs_ext
@@ -1256,3 +1258,101 @@ class GPOTests(tests.TestCase):
         # Unstage the manifest.xml and script files
         unstage_file(manifest)
         unstage_file(test_script)
+
+    def test_vgp_motd(self):
+        local_path = self.lp.cache_path('gpo_cache')
+        guid = '{31B2F340-016D-11D2-945F-00C04FB984F9}'
+        manifest = os.path.join(local_path, policies, guid, 'MACHINE',
+            'VGP/VTLA/UNIX/MOTD/MANIFEST.XML')
+        logger = logging.getLogger('gpo_tests')
+        cache_dir = self.lp.get('cache directory')
+        store = GPOStorage(os.path.join(cache_dir, 'gpo.tdb'))
+
+        machine_creds = Credentials()
+        machine_creds.guess(self.lp)
+        machine_creds.set_machine_account()
+
+        # Initialize the group policy extension
+        ext = vgp_motd_ext(logger, self.lp, machine_creds, store)
+
+        ads = gpo.ADS_STRUCT(self.server, self.lp, machine_creds)
+        if ads.connect():
+            gpos = ads.get_gpo_list(machine_creds.get_username())
+
+        # Stage the manifest.xml file with test data
+        stage = etree.Element('vgppolicy')
+        policysetting = etree.SubElement(stage, 'policysetting')
+        version = etree.SubElement(policysetting, 'version')
+        version.text = '1'
+        data = etree.SubElement(policysetting, 'data')
+        filename = etree.SubElement(data, 'filename')
+        filename.text = 'motd'
+        text = etree.SubElement(data, 'text')
+        text.text = 'This is the message of the day'
+        ret = stage_file(manifest, etree.tostring(stage))
+        self.assertTrue(ret, 'Could not create the target %s' % manifest)
+
+        # Process all gpos, with temp output directory
+        with NamedTemporaryFile() as f:
+            ext.process_group_policy([], gpos, f.name)
+            self.assertEquals(open(f.name, 'r').read(), text.text,
+                              'The motd was not applied')
+
+            # Remove policy
+            gp_db = store.get_gplog(machine_creds.get_username())
+            del_gpos = get_deleted_gpos_list(gp_db, [])
+            ext.process_group_policy(del_gpos, [], f.name)
+            self.assertNotEquals(open(f.name, 'r').read(), text.text,
+                                 'The motd was not unapplied')
+
+        # Unstage the Registry.pol file
+        unstage_file(manifest)
+
+    def test_vgp_issue(self):
+        local_path = self.lp.cache_path('gpo_cache')
+        guid = '{31B2F340-016D-11D2-945F-00C04FB984F9}'
+        manifest = os.path.join(local_path, policies, guid, 'MACHINE',
+            'VGP/VTLA/UNIX/ISSUE/MANIFEST.XML')
+        logger = logging.getLogger('gpo_tests')
+        cache_dir = self.lp.get('cache directory')
+        store = GPOStorage(os.path.join(cache_dir, 'gpo.tdb'))
+
+        machine_creds = Credentials()
+        machine_creds.guess(self.lp)
+        machine_creds.set_machine_account()
+
+        # Initialize the group policy extension
+        ext = vgp_issue_ext(logger, self.lp, machine_creds, store)
+
+        ads = gpo.ADS_STRUCT(self.server, self.lp, machine_creds)
+        if ads.connect():
+            gpos = ads.get_gpo_list(machine_creds.get_username())
+
+        # Stage the manifest.xml file with test data
+        stage = etree.Element('vgppolicy')
+        policysetting = etree.SubElement(stage, 'policysetting')
+        version = etree.SubElement(policysetting, 'version')
+        version.text = '1'
+        data = etree.SubElement(policysetting, 'data')
+        filename = etree.SubElement(data, 'filename')
+        filename.text = 'issue'
+        text = etree.SubElement(data, 'text')
+        text.text = 'Welcome to Samba!'
+        ret = stage_file(manifest, etree.tostring(stage))
+        self.assertTrue(ret, 'Could not create the target %s' % manifest)
+
+        # Process all gpos, with temp output directory
+        with NamedTemporaryFile() as f:
+            ext.process_group_policy([], gpos, f.name)
+            self.assertEquals(open(f.name, 'r').read(), text.text,
+                              'The issue was not applied')
+
+            # Remove policy
+            gp_db = store.get_gplog(machine_creds.get_username())
+            del_gpos = get_deleted_gpos_list(gp_db, [])
+            ext.process_group_policy(del_gpos, [], f.name)
+            self.assertNotEquals(open(f.name, 'r').read(), text.text,
+                                 'The issue was not unapplied')
+
+        # Unstage the manifest.xml file
+        unstage_file(manifest)
diff --git a/python/samba/tests/samba_tool/gpo.py b/python/samba/tests/samba_tool/gpo.py
index 13734f3b163..851a76b9885 100644
--- a/python/samba/tests/samba_tool/gpo.py
+++ b/python/samba/tests/samba_tool/gpo.py


-- 
Samba Shared Repository



More information about the samba-cvs mailing list