Plan device actions exclusively as approved scripts and provide reboot library revisions
This commit is contained in:
@@ -569,10 +569,12 @@ def run_agent():
|
||||
RMM_RELEASE_LOCK=str(ROOT / 'release.lock'),
|
||||
RMM_INSTALLED_RELEASE_VERSION=read(ROOT / 'current/manifest.json')['version'])
|
||||
folder = active_folder()
|
||||
os.environ.pop('RMM_SCRIPT_HELPER_RELEASE', None)
|
||||
if (folder / 'script-pin.json').is_file() and helper_state() in ('enabled', 'enabled-runtime'):
|
||||
os.environ.update(RMM_FULL_MAINTENANCE_HELPER_SOCKET=str(HELPER_SOCKET),
|
||||
RMM_FULL_MAINTENANCE_POLICY_FILE=str(folder / 'script-pin.json'),
|
||||
RMM_SCRIPT_HELPER_RELEASE=folder.name)
|
||||
pins = {'RMM_FULL_MAINTENANCE_HELPER_SOCKET': str(HELPER_SOCKET),
|
||||
'RMM_FULL_MAINTENANCE_POLICY_FILE': str(folder / 'script-pin.json')}
|
||||
if all(os.environ.get(name, value) == value for name, value in pins.items()):
|
||||
os.environ.update(pins, RMM_SCRIPT_HELPER_RELEASE=folder.name)
|
||||
exe = str(folder / 'agent')
|
||||
os.execv(exe, [exe])
|
||||
|
||||
@@ -681,7 +683,7 @@ def main():
|
||||
elif args.action == 'run-helper':
|
||||
require(os.geteuid() == 0, 'privileged script helper service required')
|
||||
folder = active_folder()
|
||||
os.environ['RMM_HELPER_CONFIG'] = str(folder / 'script-helper.json')
|
||||
os.environ.setdefault('RMM_HELPER_CONFIG', str(folder / 'script-helper.json'))
|
||||
os.execv(folder / 'helper', [str(folder / 'helper')])
|
||||
elif args.action == 'run-agent':
|
||||
run_agent()
|
||||
|
||||
Reference in New Issue
Block a user