mirror of
https://github.com/altlinux/gpupdate.git
synced 2025-03-21 18:50:38 +03:00
Massive backend cleanup
- samba_backend now uses 'gpt' objects for operations - SID is calculated each time on backend and frontend in order to allow calculation of SIDs corresponding to both machine and user.
This commit is contained in:
parent
2d9ea4d8ca
commit
cf9b420160
GPG Key ID:
0F3883600CAE7AAC
@ -1,44 +1,31 @@
|
||||
from .applier_backend import applier_backend
|
||||
|
||||
import argparse
|
||||
|
||||
import logging
|
||||
import os
|
||||
# Facility to determine GPTs for user
|
||||
import optparse
|
||||
from samba import getopt as options
|
||||
from samba.gpclass import check_safe_path, check_refresh_gpo_list
|
||||
|
||||
# This is needed by Registry.pol file search
|
||||
import os
|
||||
import re
|
||||
|
||||
# Our native control facility
|
||||
from .applier_backend import applier_backend
|
||||
from storage import cache_factory, registry_factory
|
||||
from gpt import gpt, get_local_gpt
|
||||
import util
|
||||
import util.preg
|
||||
|
||||
from collections import OrderedDict
|
||||
|
||||
from storage import cache_factory, registry_factory
|
||||
|
||||
# Remove print() from code
|
||||
import logging
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
|
||||
class samba_backend(applier_backend):
|
||||
__default_policy_path = '/usr/share/local-policy/default'
|
||||
_mahine_hive = 'HKEY_LOCAL_MACHINE'
|
||||
_user_hive = 'HKEY_CURRENT_USER'
|
||||
_machine_pol_path_pattern = '[Mm][Aa][Cc][Hh][Ii][Nn][Ee].*\.pol$'
|
||||
_user_pol_path_pattern = '[Uu][Ss][Ee][Rr].*\.pol$'
|
||||
|
||||
def __init__(self, loadparm, creds, sid, dc, username):
|
||||
def __init__(self, loadparm, creds, dc, username, domain):
|
||||
# User SID to work with HKCU hive
|
||||
self.username = username
|
||||
self.sid = sid
|
||||
self.domain = domain
|
||||
self._is_machine_username = util.is_machine_name(self.username)
|
||||
self.sid = util.get_sid(self.domain, self.username)
|
||||
if not self._is_machine_username:
|
||||
self.machine_sid = util.get_sid(domain, util.get_machine_name())
|
||||
else:
|
||||
self.machine_sid = self.sid
|
||||
|
||||
self.storage = registry_factory('registry')
|
||||
self.cache = cache_factory('regpol_cache')
|
||||
# Check if we're working for user or for machine
|
||||
self._is_machine_username = util.is_machine_name(self.username)
|
||||
self.gpo_names = cache_factory('gpo_names')
|
||||
|
||||
# Samba objects - LoadParm() and CredentialsOptions()
|
||||
self.loadparm = loadparm
|
||||
@ -48,55 +35,21 @@ class samba_backend(applier_backend):
|
||||
self.cache_dir = self.loadparm.get('cache directory')
|
||||
logging.debug('Cache directory is: {}'.format(self.cache_dir))
|
||||
|
||||
# Regular expressions to split PReg files into user and machine parts
|
||||
self._machine_pol_path_regex = re.compile(self._machine_pol_path_pattern)
|
||||
self._user_pol_path_regex = re.compile(self._user_pol_path_pattern)
|
||||
|
||||
def retrieve_and_store(self):
|
||||
'''
|
||||
Retrieve settings and strore it in a database
|
||||
'''
|
||||
# FIXME: Please note that get_policy_set return value has no
|
||||
# meaning since we're using setting storage, so code must
|
||||
# be simplified
|
||||
|
||||
# Get policies for machine at first.
|
||||
self.get_policy_set(util.get_machine_name(), None, True)
|
||||
machine_gpts = self._get_gpts(util.get_machine_name(), self.machine_sid)
|
||||
for gptobj in machine_gpts:
|
||||
gptobj.merge()
|
||||
|
||||
# Load user GPT values in case user's name specified
|
||||
# This is a buggy implementation and should be tested more
|
||||
if not self._is_machine_username:
|
||||
policy_key = 'Software\\Policies\\Microsoft\\Windows\\System\\UserPolicyMode'
|
||||
merge_mode = self.storage.get_hklm_entry(policy_key)
|
||||
if merge_mode == None or merge_mode == '0' or merge_mode == '1':
|
||||
self.get_policy_set(self.username, self.sid, False)
|
||||
|
||||
def get_policy_set(self, username, sid=None, include_local_policy=False):
|
||||
logging.info('Fetching and merging settings for user {}'.format(username))
|
||||
policy_files = self._get_pol(username)
|
||||
|
||||
if include_local_policy:
|
||||
policy_files['machine_regpols'].insert(0, os.path.join(self.__default_policy_path, 'local.xml'))
|
||||
|
||||
machine_entries = util.preg.merge_polfiles(policy_files['machine_regpols'])
|
||||
user_entries = util.preg.merge_polfiles(policy_files['user_regpols'], sid)
|
||||
|
||||
policy_set = dict({ 'machine': machine_entries, 'user': user_entries })
|
||||
return policy_set
|
||||
|
||||
def _find_regpol_files(self, gpt_path):
|
||||
'''
|
||||
Seek through SINGLE given GPT directory absolute path and return
|
||||
the dictionary of user's and machine's Registry.pol files.
|
||||
'''
|
||||
logging.debug('Finding regpols in: {}'.format(gpt_path))
|
||||
|
||||
polfiles = dict({ 'machine_regpols': [], 'user_regpols': [] })
|
||||
full_traverse = util.traverse_dir(gpt_path)
|
||||
polfiles['machine_regpols'] = [fname for fname in full_traverse if self._machine_pol_path_regex.search(fname)]
|
||||
polfiles['user_regpols'] = [fname for fname in full_traverse if self._user_pol_path_regex.search(fname)]
|
||||
|
||||
return polfiles
|
||||
user_gpts = self._get_gpts(self.username, self.sid)
|
||||
for gptobj in user_gpts:
|
||||
gptobj.merge(self.sid)
|
||||
|
||||
def _check_sysvol_present(self, gpo):
|
||||
'''
|
||||
@ -107,26 +60,8 @@ class samba_backend(applier_backend):
|
||||
return False
|
||||
return True
|
||||
|
||||
def _gpo_get_gpt_polfiles(self, gpo_obj):
|
||||
'''
|
||||
Find absolute path to SINGLE cached GPT directory and return
|
||||
dict of lists with PReg file paths.
|
||||
'''
|
||||
if self._check_sysvol_present(gpo_obj):
|
||||
logging.debug('Found SYSVOL entry {} for GPO {}'.format(gpo_obj.file_sys_path, gpo_obj.name))
|
||||
path = check_safe_path(gpo_obj.file_sys_path).upper()
|
||||
gpt_abspath = os.path.join(self.cache_dir, 'gpo_cache', path)
|
||||
logging.debug('Path: {}'.format(path))
|
||||
policy_files = self._find_regpol_files(gpt_abspath)
|
||||
|
||||
return policy_files
|
||||
return dict({ 'machine_regpols': [], 'user_regpols': [] })
|
||||
|
||||
def _get_pol(self, username):
|
||||
'''
|
||||
Get PReg file paths from GPTs for specified username.
|
||||
'''
|
||||
policy_files = OrderedDict({ 'machine_regpols': [], 'user_regpols': [] })
|
||||
def _get_gpts(self, username, sid):
|
||||
gpts = list()
|
||||
|
||||
try:
|
||||
gpos = util.get_gpo_list(self.dc, self.creds, self.loadparm, username)
|
||||
@ -138,18 +73,26 @@ class samba_backend(applier_backend):
|
||||
logging.error('Unable to replicate GPTs from {} for {}'.format(self.dc, username))
|
||||
|
||||
for gpo in gpos:
|
||||
polfiles = self._gpo_get_gpt_polfiles(gpo)
|
||||
policy_files['machine_regpols'] += polfiles['machine_regpols']
|
||||
policy_files['user_regpols'] += polfiles['user_regpols']
|
||||
# Cache paths to PReg files
|
||||
self.cache.store(self.sid, str(policy_files))
|
||||
except:
|
||||
logging.error('Error fetching GPO list from {} for'.format(self.dc, username))
|
||||
policy_files = eval(self.cache.get_default(self.sid, OrderedDict({'machine_regpols': [], 'user_regpols': []})))
|
||||
logging.debug('Got cached PReg files {}'.format(policy_files))
|
||||
if self._check_sysvol_present(gpo):
|
||||
logging.debug('Found SYSVOL entry {} for GPO {}'.format(gpo.file_sys_path, gpo.name))
|
||||
path = check_safe_path(gpo.file_sys_path).upper()
|
||||
gpt_abspath = os.path.join(self.cache_dir, 'gpo_cache', path)
|
||||
print('Creating GPT object')
|
||||
obj = gpt(gpt_abspath, sid)
|
||||
obj.set_name(gpo.name)
|
||||
print(obj)
|
||||
logging.debug('Path: {}'.format(path))
|
||||
gpts.append(obj)
|
||||
else:
|
||||
if 'Local Policy' == gpo.name:
|
||||
gpts.append(get_local_gpt(sid))
|
||||
except Exception as exc:
|
||||
print(exc)
|
||||
logging.error('Error fetching GPO list from {} for {}'.format(self.dc, username))
|
||||
|
||||
logging.debug('Machine .pol file set: {}'.format(policy_files['machine_regpols']))
|
||||
logging.debug('User .pol file set: {}'.format(policy_files['user_regpols']))
|
||||
|
||||
return policy_files
|
||||
print('GPTs found:')
|
||||
for gptobj in gpts:
|
||||
print(gptobj)
|
||||
print('---')
|
||||
|
||||
return gpts
|
||||
|
||||
@ -5,14 +5,15 @@ from .polkit_applier import polkit_applier
|
||||
from .systemd_applier import systemd_applier
|
||||
from .firefox_applier import firefox_applier
|
||||
from .chromium_applier import chromium_applier
|
||||
import util
|
||||
|
||||
import logging
|
||||
|
||||
class applier:
|
||||
def __init__(self, sid, username):
|
||||
def __init__(self, username, domain):
|
||||
self.storage = registry_factory('registry')
|
||||
self.sid = sid
|
||||
self.username = username
|
||||
self.sid = util.get_sid(domain, self.username)
|
||||
|
||||
self.appliers = dict({
|
||||
'control': control_applier(self.storage),
|
||||
|
||||
@ -51,16 +51,13 @@ class gpoa_controller:
|
||||
username = self.__args.user
|
||||
domain = util.get_domain_name(self.__lp, self.__creds, dc)
|
||||
|
||||
sid = util.get_sid(domain, username)
|
||||
|
||||
back = backend_factory(self.__lp, self.__creds, sid, dc, username)
|
||||
back = backend_factory(self.__lp, self.__creds, dc, username, domain)
|
||||
back.retrieve_and_store()
|
||||
|
||||
appl = frontend.applier(sid, username)
|
||||
appl = frontend.applier(username, domain)
|
||||
appl.apply_parameters()
|
||||
|
||||
def main():
|
||||
logging.info('Working with Samba DC')
|
||||
controller = gpoa_controller()
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user