public/gpupdate
1
0
Fork 1
mirror of https://github.com/altlinux/gpupdate.git synced 2025-03-28 14:50:14 +03:00
Code Releases Wiki Activity

Update gpoa command logic with user or computer at once

Browse Source
This commit is contained in:
Evgeny Sinelnikov 2020-01-28 21:06:48 +04:00
parent 2b3f40718c
commit 3eacf3848a
7 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gpoa/backend/__init__.py
View File

@ -21,7 +21,7 @@ from util.windows import smbcreds
from .samba_backend import samba_backend
from .nodomain_backend import nodomain_backend
def backend_factory(dc, username):
def backend_factory(dc, username, is_machine):
'''
Return one of backend objects. Please note that backends must
store their configuration in a storage with administrator
@ -34,7 +34,7 @@ def backend_factory(dc, username):
if dc:
try:
back = samba_backend(sc, username, domain)
back = samba_backend(sc, username, domain, is_machine)
except Exception as exc:
logging.error('Unable to initialize Samba backend: {}'.format(exc))
else:

2
gpoa/backend/nodomain_backend.py
View File

@ -37,7 +37,7 @@ class nodomain_backend(applier_backend):
self.storage.set_info('machine_sid', get_sid(domain, self.storage.get_info('machine_name')))
# User SID to work with HKCU hive
self.username = username
self.username = get_machine_name()
self.sid = get_sid(self.storage.get_info('domain'), self.username)
def retrieve_and_store(self):

9
gpoa/backend/samba_backend.py
View File

@ -33,15 +33,16 @@ from util.logging import slogm
class samba_backend(applier_backend):
def __init__(self, sambacreds, username, domain):
def __init__(self, sambacreds, username, domain, is_machine):
self.storage = registry_factory('registry')
self.storage.set_info('domain', domain)
self.storage.set_info('machine_name', get_machine_name())
self.storage.set_info('machine_sid', get_sid(domain, self.storage.get_info('machine_name')))
machine_name = get_machine_name()
self.storage.set_info('machine_name', machine_name)
self.storage.set_info('machine_sid', get_sid(domain, machine_name))
# User SID to work with HKCU hive
self.username = username
self._is_machine_username = is_machine_name(self.username)
self._is_machine_username = is_machine
self.sid = get_sid(self.storage.get_info('domain'), self.username)
self.cache = cache_factory('regpol_cache')

13
gpoa/frontend/frontend_manager.py
View File

@ -70,10 +70,10 @@ class frontend_manager:
for machine and user parts of policies.
'''
def __init__(self, username, target):
def __init__(self, username, is_machine):
self.storage = registry_factory('registry')
self.username = determine_username(username)
self.target = target
self.is_machine = is_machine
self.process_uname = get_process_user()
self.sid = get_sid(self.storage.get_info('domain'), self.username)
@ -135,11 +135,8 @@ class frontend_manager:
'''
Decide which appliers to run.
'''
if 'All' == self.target or 'Computer' == self.target:
if self.is_machine:
self.machine_apply()
# Run user appliers when user's SID is specified
if self.storage.get_info('machine_sid') != self.sid:
if 'All' == self.target or 'User' == self.target:
self.user_apply()
else:
self.user_apply()

21
gpoa/gpoa
View File

@ -31,8 +31,7 @@ from util.users import (
get_process_user
)
from util.arguments import (
set_loglevel,
process_target
set_loglevel
)
from util.logging import slogm
@ -41,7 +40,6 @@ def parse_arguments():
arguments.add_argument('user',
type=str,
nargs='?',
default=get_machine_name(),
help='Domain username ({}) to parse policies for'.format(get_machine_name()))
arguments.add_argument('--dc',
type=str,
@ -49,9 +47,6 @@ def parse_arguments():
arguments.add_argument('--nodomain',
action='store_true',
help='Operate without domain (apply local policy)')
arguments.add_argument('--target',
type=str,
help='Specify if it is needed to update user\'s or computer\'s policies')
arguments.add_argument('--noupdate',
action='store_true',
help='Don\'t try to update storage, only run appliers')
@ -70,6 +65,10 @@ class gpoa_controller:
def __init__(self):
self.__args = parse_arguments()
self.is_machine = False
if not self.__args.user:
user = get_machine_name()
self.is_machine = True
set_loglevel(self.__args.loglevel)
self.__kinit_successful = machine_kinit()
@ -81,7 +80,6 @@ class gpoa_controller:
self.username = uname
else:
self.username = determine_username(self.__args.user)
self.target = process_target(self.__args.target)
def run(self):
'''
@ -101,7 +99,7 @@ class gpoa_controller:
if not self.__args.noupdate:
if is_root():
back = backend_factory(dc, self.username)
back = backend_factory(dc, self.username, self.is_machine)
if back:
back.retrieve_and_store()
@ -109,13 +107,8 @@ class gpoa_controller:
'''
Function to start appliers
'''
target = self.target
if self.__args.nodomain:
target = 'Computer'
try:
appl = frontend_manager(self.username, target)
appl = frontend_manager(self.username, self.is_machine)
appl.apply_parameters()
except Exception as exc:
logging.error(slogm('Error occured while running applier: {}'.format(exc)))

34
gpoa/gpupdate
View File

@ -28,6 +28,9 @@ import pwd
from util.users import (
is_root
)
from util.arguments import (
process_target
)
from util.dbus import (
is_oddjobd_gpupdate_accessible,
dbus_runner
@ -61,10 +64,14 @@ def parse_cli_arguments():
'--user',
default=None,
help='Name of the user for GPO update')
argparser.add_argument('--target',
default=None,
type=str,
help='Specify if it is needed to update user\'s or computer\'s policies')
return argparser.parse_args()
def runner_factory(args):
def runner_factory(args, target):
'''
Return the necessary runner class according to some
factors taken into account.
@ -95,13 +102,25 @@ def runner_factory(args):
if is_oddjobd_gpupdate_accessible():
logging.debug('Starting gpupdate via D-Bus')
return dbus_runner(username)
computer_runner = None
user_runner = None
if target == 'All' or target == 'Computer':
computer_runner = dbus_runner()
if target == 'All' or target == 'User':
user_runner = dbus_runner(username)
return (computer_runner, user_runner)
else:
logging.warning('oddjobd is inaccessible')
if is_root():
logging.debug('Starting gpupdate by command invocation')
return file_runner(username)
computer_runner = None
user_runner = None
if target == 'All' or target == 'Computer':
computer_runner = file_runner()
if target == 'All' or target == 'User':
user_runner = file_runner(username)
return (computer_runner, user_runner)
else:
logging.error('Insufficient permissions to run gpupdate')
@ -109,9 +128,12 @@ def runner_factory(args):
def main():
args = parse_cli_arguments()
gpo_applier = runner_factory(args)
if gpo_applier:
gpo_applier.run()
gpo_appliers = runner_factory(args, process_target(args.target))
if gpo_appliers:
if gpo_appliers[0]:
gpo_appliers[0].run()
if gpo_appliers[1]:
gpo_appliers[1].run()
else:
logging.error('gpupdate will not be started')

1
gpoa/util/dbus.py
View File

@ -43,6 +43,7 @@ class dbus_runner:
result = self.interface.gpupdatefor(dbus.String(self.username))
print_dbus_result(result)
else:
logging.info(slogm('Starting GPO applier for computer via D-Bus'.format(self.username)))
result = self.interface.gpupdate()
print_dbus_result(result)
#self.interface.Quit()