From 028c9b1c154ce9b5d7876df76b04aba1f976d1a2 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Wed, 18 Nov 2009 21:07:25 +0300 Subject: [PATCH] s4: regroup gpo modification in one function, set acl on files accordingly with ACL in LDAP --- source4/scripting/python/samba/misc.py | 120 ++++++++++++++++++++++++++++ source4/scripting/python/samba/provision.py | 63 ++++++++++----- source4/setup/provision | 3 +- 3 files changed, 166 insertions(+), 20 deletions(-) create mode 100644 source4/scripting/python/samba/misc.py diff --git a/source4/scripting/python/samba/misc.py b/source4/scripting/python/samba/misc.py new file mode 100644 index 00000000000..b548fbceabf --- /dev/null +++ b/source4/scripting/python/samba/misc.py @@ -0,0 +1,120 @@ +#!/usr/bin/python + +# Unix SMB/CIFS implementation. +# Copyright (C) Matthieu Patou 2009 +# +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + + +import samba.xattr +from samba.dcerpc import security, xattr +from samba.ndr import ndr_pack, ndr_unpack + + +def getntacl(file): + attribute = samba.xattr.wrap_getxattr(file,xattr.XATTR_NTACL_NAME) + anysid=security.dom_sid(security.SID_NT_SELF) + ntacl = ndr_unpack(xattr.NTACL,attribute,1) + return ntacl.info.as_sddl(anysid) + +def setntacl(file,sddl): + ntacl=xattr.NTACL() + ntacl.version = 1 + anysid=security.dom_sid(security.SID_NT_SELF) + sd = security.descriptor.from_sddl(sddl, anysid) + ntacl.info = sd + attribute = samba.xattr.wrap_setxattr(file,xattr.XATTR_NTACL_NAME,ndr_pack(ntacl)) + +# Takes the access mask of a DS ACE and transform them in a File ACE mask +def ldapmask2filemask(ldm): + RIGHT_DS_CREATE_CHILD = 0x00000001 + RIGHT_DS_DELETE_CHILD = 0x00000002 + RIGHT_DS_LIST_CONTENTS = 0x00000004 + ACTRL_DS_SELF = 0x00000008 + RIGHT_DS_READ_PROPERTY = 0x00000010 + RIGHT_DS_WRITE_PROPERTY = 0x00000020 + RIGHT_DS_DELETE_TREE = 0x00000040 + RIGHT_DS_LIST_OBJECT = 0x00000080 + RIGHT_DS_CONTROL_ACCESS = 0x00000100 + FILE_READ_DATA = 0x0001 + FILE_LIST_DIRECTORY = 0x0001 + FILE_WRITE_DATA = 0x0002 + FILE_ADD_FILE = 0x0002 + FILE_APPEND_DATA = 0x0004 + FILE_ADD_SUBDIRECTORY = 0x0004 + FILE_CREATE_PIPE_INSTANCE = 0x0004 + FILE_READ_EA = 0x0008 + FILE_WRITE_EA = 0x0010 + FILE_EXECUTE = 0x0020 + FILE_TRAVERSE = 0x0020 + FILE_DELETE_CHILD = 0x0040 + FILE_READ_ATTRIBUTES = 0x0080 + FILE_WRITE_ATTRIBUTES = 0x0100 + DELETE = 0x00010000 + READ_CONTROL = 0x00020000 + WRITE_DAC = 0x00040000 + WRITE_OWNER = 0x00080000 + SYNCHRONIZE = 0x00100000 + STANDARD_RIGHTS_ALL = 0x001F0000 + + filemask = ldm & STANDARD_RIGHTS_ALL + #filemask = 0 + + if( (ldm & RIGHT_DS_READ_PROPERTY) and (ldm & RIGHT_DS_LIST_CONTENTS) ): + filemask = filemask | (SYNCHRONIZE | FILE_LIST_DIRECTORY |\ + FILE_READ_ATTRIBUTES | FILE_READ_EA |\ + FILE_READ_DATA | FILE_EXECUTE) + + if( (ldm & RIGHT_DS_WRITE_PROPERTY) ): + filemask = filemask | (SYNCHRONIZE | FILE_WRITE_DATA |\ + FILE_APPEND_DATA | FILE_WRITE_EA |\ + FILE_WRITE_ATTRIBUTES | FILE_ADD_FILE |\ + FILE_ADD_SUBDIRECTORY) + + if( (ldm & RIGHT_DS_CREATE_CHILD) ): + filemask = filemask | (FILE_ADD_SUBDIRECTORY | FILE_ADD_FILE) + + if( (ldm & RIGHT_DS_DELETE_CHILD) ): + filemask = filemask | FILE_DELETE_CHILD + + return filemask + +# This function takes an the SDDL representation of a DS +# ACL and return the SDDL representation of this ACL adapted +# for files. It's used for Policy object provision + +def dsacl2fsacl(dssddl): + anysid = security.dom_sid(security.SID_NT_SELF) + ref = security.descriptor.from_sddl(dssddl,anysid) + fdescr = security.descriptor() + fdescr.owner_sid = ref.owner_sid + fdescr.group_sid = ref.group_sid + fdescr.type = ref.type + fdescr.revision = ref.revision + fdescr.sacl = ref.sacl + aces = ref.dacl.aces + for i in range(0,len(aces)): + ace = aces[i] + if not ace.type & security.SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT and str(ace.trustee) != security.SID_BUILTIN_PREW2K: + # if fdescr.type & security.SEC_DESC_DACL_AUTO_INHERITED: + ace.flags = ace.flags | security.SEC_ACE_FLAG_OBJECT_INHERIT | security.SEC_ACE_FLAG_CONTAINER_INHERIT + if str(ace.trustee) == security.SID_CREATOR_OWNER: + # For Creator/Owner the IO flag is set as this ACE has only a sense for child objects + ace.flags = ace.flags | security.SEC_ACE_FLAG_INHERIT_ONLY + ace.access_mask = ldapmask2filemask(ace.access_mask) + fdescr.dacl_add(ace) + + return fdescr.as_sddl(anysid) diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 07de4253705..c7db82e6f14 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -47,7 +47,8 @@ from samba import DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008, DS_DC_FUNCTI from samba.samdb import SamDB from samba.idmap import IDmapDB from samba.dcerpc import security -from samba.ndr import ndr_pack +from samba.misc import setntacl,dsacl2fsacl +from samba.ndr import ndr_pack,ndr_unpack import urllib from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError from ms_display_specifiers import read_ms_ldif @@ -56,7 +57,6 @@ from provisionbackend import LDBBackend, ExistingBackend, FDSBackend, OpenLDAPBa from provisionexceptions import ProvisioningError, InvalidNetbiosName from signal import SIGTERM from dcerpc.misc import SEC_CHAN_BDC, SEC_CHAN_WKSTA - __docformat__ = "restructuredText" def find_setup_dir(): @@ -828,6 +828,46 @@ def setup_self_join(samdb, names, "DNSPASS_B64": b64encode(dnspass), }) +def set_gpo_acl(path,acl,setfileacl): + if setfileacl: + setntacl(path,acl) + for root, dirs, files in os.walk(path, topdown=False): + for name in files: + setntacl(os.path.join(root, name),acl) + for name in dirs: + setntacl(os.path.join(root, name),acl) + +def setup_gpo(paths,names,samdb,policyguid,policyguid_dc,domainsid,setfileacl): + policy_path = os.path.join(paths.sysvol, names.dnsdomain, "Policies", + "{" + policyguid + "}") + os.makedirs(policy_path, 0755) + open(os.path.join(policy_path, "GPT.INI"), 'w').write( + "[General]\r\nVersion=65543") + os.makedirs(os.path.join(policy_path, "MACHINE"), 0755) + os.makedirs(os.path.join(policy_path, "USER"), 0755) + + policy_path_dc = os.path.join(paths.sysvol, names.dnsdomain, "Policies", + "{" + policyguid_dc + "}") + os.makedirs(policy_path_dc, 0755) + open(os.path.join(policy_path_dc, "GPT.INI"), 'w').write( + "[General]\r\nVersion=2") + os.makedirs(os.path.join(policy_path_dc, "MACHINE"), 0755) + os.makedirs(os.path.join(policy_path_dc, "USER"), 0755) +# call setntacl ... + res = samdb.search(base="CN={%s},CN=Policies,CN=System,%s"%(policyguid,names.domaindn), + attrs=["nTSecurityDescriptor"], + expression="", scope=SCOPE_BASE) + assert(len(res) > 0) + acl = ndr_unpack(security.descriptor,str(res[0]["nTSecurityDescriptor"])).as_sddl(security.dom_sid("S-1-5-21-1")) + set_gpo_acl(policy_path_dc,dsacl2fsacl(acl),setfileacl) + + res = samdb.search(base="CN={%s},CN=Policies,CN=System,%s"%(policyguid_dc,names.domaindn), + attrs=["nTSecurityDescriptor"], + expression="", scope=SCOPE_BASE) + assert(len(res) > 0) + acl = ndr_unpack(security.descriptor,str(res[0]["nTSecurityDescriptor"])).as_sddl(security.dom_sid("S-1-5-21-1")) + set_gpo_acl(policy_path,dsacl2fsacl(acl),setfileacl) + def setup_samdb(path, setup_path, session_info, provision_backend, lp, names, message, @@ -1054,7 +1094,7 @@ def provision(setup_dir, message, session_info, sitename=None, ol_mmr_urls=None, ol_olc=None, setup_ds_path=None, slapd_path=None, nosync=False, - ldap_dryrun_mode=False): + ldap_dryrun_mode=False,setfileacl=False): """Provision samba4 :note: caution, this wipes all existing data! @@ -1253,22 +1293,7 @@ def provision(setup_dir, message, session_info, assert(paths.sysvol is not None) # Set up group policies (domain policy and domain controller policy) - - policy_path = os.path.join(paths.sysvol, names.dnsdomain, "Policies", - "{" + policyguid + "}") - os.makedirs(policy_path, 0755) - open(os.path.join(policy_path, "GPT.INI"), 'w').write( - "[General]\r\nVersion=65543") - os.makedirs(os.path.join(policy_path, "MACHINE"), 0755) - os.makedirs(os.path.join(policy_path, "USER"), 0755) - - policy_path_dc = os.path.join(paths.sysvol, names.dnsdomain, "Policies", - "{" + policyguid_dc + "}") - os.makedirs(policy_path_dc, 0755) - open(os.path.join(policy_path_dc, "GPT.INI"), 'w').write( - "[General]\r\nVersion=2") - os.makedirs(os.path.join(policy_path_dc, "MACHINE"), 0755) - os.makedirs(os.path.join(policy_path_dc, "USER"), 0755) + setup_gpo(paths,names,samdb,policyguid,policyguid_dc,domainsid,setfileacl) if not os.path.isdir(paths.netlogon): os.makedirs(paths.netlogon, 0755) diff --git a/source4/setup/provision b/source4/setup/provision index b855dc2f30e..ada976be286 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -110,6 +110,7 @@ parser.add_option("--slapd-path", type="string", metavar="SLAPD-PATH", parser.add_option("--setup-ds-path", type="string", metavar="SETUP_DS-PATH", help="Path to setup-ds.pl script for Fedora DS LDAP backend [e.g.:'/usr/sbin/setup-ds.pl']. Required for Setup with Fedora DS backend.") parser.add_option("--nosync", help="Configure LDAP backend not to call fsync() (for performance in test environments)", action="store_true") +parser.add_option("--setfileacl", help="Set NT ACL on files", action="store_true") parser.add_option("--ldap-dryrun-mode", help="Configure LDAP backend, but do not run any binaries and exit early. Used only for the test environment. DO NOT USE", action="store_true") opts = parser.parse_args()[0] @@ -219,4 +220,4 @@ provision(setup_dir, message, backend_type=opts.ldap_backend_type, ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls, slapd_path=opts.slapd_path, setup_ds_path=opts.setup_ds_path, - nosync=opts.nosync,ldap_dryrun_mode=opts.ldap_dryrun_mode) + nosync=opts.nosync,ldap_dryrun_mode=opts.ldap_dryrun_mode,setfileacl=opts.setfileacl) -- 2.11.4.GIT