]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
gpo: Apply Group Policy Sudo Rights from VGP
authorDavid Mulder <dmulder@suse.com>
Tue, 3 Nov 2020 17:45:45 +0000 (10:45 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 19 Dec 2020 08:11:50 +0000 (08:11 +0000)
This adds a Group Policy extension which applies
Sudo rights set by Vintela Group Policy in the
SYSVOL.

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Dec 19 08:11:50 UTC 2020 on sn-devel-184

python/samba/vgp_sudoers_ext.py
selftest/knownfail.d/gpo [deleted file]
source4/scripting/bin/samba-gpupdate

index 3b7515387840e4d13050b769648f00d7bba0b091..278f3558cc25aec35729277085d99f997643ebc3 100644 (file)
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
 from samba.gpclass import gp_xml_ext
+from base64 import b64encode
+from tempfile import NamedTemporaryFile
+from subprocess import Popen, PIPE
+from samba.gp_sudoers_ext import visudo, intro
 
 class vgp_sudoers_ext(gp_xml_ext):
+    def __str__(self):
+        return 'VGP/Unix Settings/Sudo Rights'
+
     def process_group_policy(self, deleted_gpo_list, changed_gpo_list,
             sdir='/etc/sudoers.d'):
-        pass
+        for guid, settings in deleted_gpo_list:
+            self.gp_db.set_guid(guid)
+            if str(self) in settings:
+                for attribute, sudoers in settings[str(self)].items():
+                    if os.path.exists(sudoers):
+                        os.unlink(sudoers)
+                    self.gp_db.delete(str(self), attribute)
+            self.gp_db.commit()
+
+        for gpo in changed_gpo_list:
+            if gpo.file_sys_path:
+                self.gp_db.set_guid(gpo.name)
+                xml = 'MACHINE/VGP/VTLA/Sudo/SudoersConfiguration/manifest.xml'
+                path = os.path.join(gpo.file_sys_path, xml)
+                xml_conf = self.parse(path)
+                if not xml_conf:
+                    continue
+                policy = xml_conf.find('policysetting')
+                data = policy.find('data')
+                for entry in data.findall('sudoers_entry'):
+                    command = entry.find('command').text
+                    user = entry.find('user').text
+                    principals = [p.text for p in entry.find('listelement').findall('principal')]
+                    nopassword = entry.find('password') == None
+                    np_entry = ' NOPASSWD:' if nopassword else ''
+                    p = '%s ALL=(%s)%s %s' % (','.join(principals), user, np_entry, command)
+                    attribute = b64encode(p.encode()).decode()
+                    old_val = self.gp_db.retrieve(str(self), attribute)
+                    if not old_val:
+                        contents = intro
+                        contents += '%s\n' % p
+                        with NamedTemporaryFile() as f:
+                            with open(f.name, 'w') as w:
+                                w.write(contents)
+                            sudo_validation = \
+                                    Popen([visudo, '-c', '-f', f.name],
+                                        stdout=PIPE, stderr=PIPE).wait()
+                        if sudo_validation == 0:
+                            with NamedTemporaryFile(prefix='gp_',
+                                                    delete=False,
+                                                    dir=sdir) as f:
+                                with open(f.name, 'w') as w:
+                                    w.write(contents)
+                                self.gp_db.store(str(self),
+                                                 attribute,
+                                                 f.name)
+                        else:
+                            self.logger.warn('Sudoers apply "%s" failed'
+                                    % p)
+                    self.gp_db.commit()
+
+    def rsop(self, gpo):
+        output = {}
+        xml = 'MACHINE/VGP/VTLA/Sudo/SudoersConfiguration/manifest.xml'
+        if gpo.file_sys_path:
+            path = os.path.join(gpo.file_sys_path, xml)
+            xml_conf = self.parse(path)
+            if not xml_conf:
+                return output
+            policy = xml_conf.find('policysetting')
+            data = policy.find('data')
+            for entry in data.findall('sudoers_entry'):
+                command = entry.find('command').text
+                user = entry.find('user').text
+                principals = [p.text for p in entry.find('listelement').findall('principal')]
+                nopassword = entry.find('password') == None
+                np_entry = ' NOPASSWD:' if nopassword else ''
+                p = '%s ALL=(%s)%s %s' % (','.join(principals), user, np_entry, command)
+                if str(self) not in output.keys():
+                    output[str(self)] = []
+                output[str(self)].append(p)
+        return output
diff --git a/selftest/knownfail.d/gpo b/selftest/knownfail.d/gpo
deleted file mode 100644 (file)
index 4be23fb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-^samba.tests.gpo.samba.tests.gpo.GPOTests.test_vgp_sudoers
index dfbb1901457dae426d6c2dfca1ef0a3132da05db..85300e156554df2828c170bd59a4a720c77ee2b7 100755 (executable)
@@ -34,6 +34,7 @@ from samba.gp_sec_ext import gp_krb_ext, gp_access_ext
 from samba.gp_ext_loader import get_gp_client_side_extensions
 from samba.gp_scripts_ext import gp_scripts_ext
 from samba.gp_sudoers_ext import gp_sudoers_ext
+from samba.vgp_sudoers_ext import vgp_sudoers_ext
 from samba.gp_smb_conf_ext import gp_smb_conf_ext
 from samba.gp_msgs_ext import gp_msgs_ext
 import logging
@@ -89,6 +90,7 @@ if __name__ == "__main__":
         gp_extensions.append(gp_krb_ext)
         gp_extensions.append(gp_scripts_ext)
         gp_extensions.append(gp_sudoers_ext)
+        gp_extensions.append(vgp_sudoers_ext)
         gp_extensions.append(gp_smb_conf_ext)
         gp_extensions.append(gp_msgs_ext)
         gp_extensions.extend(machine_exts)