Use script-only execution on Linux and preserve the enrolled helper through updates
This commit is contained in:
@@ -6,6 +6,8 @@ import json
|
||||
import sqlite3
|
||||
from pathlib import Path
|
||||
import tempfile
|
||||
from types import SimpleNamespace
|
||||
import subprocess
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
|
||||
@@ -33,6 +35,7 @@ class EnrollmentRetry(unittest.TestCase):
|
||||
for field, value in [('ROOT',root),('STATE',self.state)]:
|
||||
self.stack.enter_context(patch.object(lifecycle,field,value))
|
||||
self.enable = self.stack.enter_context(patch.object(lifecycle,'enable'))
|
||||
self.provision = self.stack.enter_context(patch.object(lifecycle,'provision_scripts'))
|
||||
self.service = self.stack.enter_context(patch.object(lifecycle,'service'))
|
||||
self.healthy = self.stack.enter_context(patch.object(lifecycle,'healthy',return_value=True))
|
||||
self.save = self.stack.enter_context(patch.object(lifecycle,'save_token'))
|
||||
@@ -69,6 +72,7 @@ class EnrollmentRetry(unittest.TestCase):
|
||||
remote.assert_not_called()
|
||||
self.save.assert_not_called()
|
||||
self.enable.assert_called_once()
|
||||
self.provision.assert_called_once_with(False)
|
||||
|
||||
def test_expired_initial_token_can_be_replaced_in_same_tenant(self):
|
||||
self.bootstrap_tenant(self.tenant)
|
||||
@@ -83,8 +87,10 @@ class EnrollmentRetry(unittest.TestCase):
|
||||
lifecycle.install(self.base,self.token)
|
||||
self.enable.assert_called_once()
|
||||
self.service.assert_not_called()
|
||||
self.provision.assert_not_called()
|
||||
self.healthy.return_value = True
|
||||
lifecycle.install(self.base,self.token)
|
||||
lifecycle.install(self.base,self.token,enable_admin_scripts=True)
|
||||
self.provision.assert_called_once_with(True)
|
||||
self.service.assert_called_once_with('enable','--now',lifecycle.TIMER)
|
||||
|
||||
def test_token_for_another_tenant_cannot_replace_initial_token(self):
|
||||
@@ -96,5 +102,97 @@ class EnrollmentRetry(unittest.TestCase):
|
||||
self.assertEqual((lifecycle.ROOT / 'lifecycle.py').read_bytes(), b'previous installer')
|
||||
|
||||
|
||||
class ScriptHelperInstallation(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.stack = ExitStack()
|
||||
self.addCleanup(self.stack.close)
|
||||
base = Path(self.stack.enter_context(tempfile.TemporaryDirectory()))
|
||||
self.root = base / 'client'
|
||||
self.units = base / 'units'
|
||||
self.old = base / 'old-config'
|
||||
self.units.mkdir()
|
||||
self.uid = SimpleNamespace(pw_uid=990,pw_gid=990)
|
||||
self.release = '11111111-1111-4111-8111-111111111111'
|
||||
self.previous = '22222222-2222-4222-8222-222222222222'
|
||||
self.folder = self.root / 'releases' / self.release
|
||||
self.folder.mkdir(parents=True)
|
||||
self.manifest = {'release_id': self.release, 'version': 'v2', 'artifacts':[{'role':'helper','sha256':'a'*64}]}
|
||||
self.binding = {'tenant_id':self.previous, 'agent_id':self.release, 'public_key_hex':'f'*64}
|
||||
self.pin = {'helper_binary_sha256':'a'*64,'policy_sha256':'b'*64}
|
||||
lifecycle.save(self.folder / 'manifest.json', self.manifest)
|
||||
(self.root / 'release.lock').touch()
|
||||
for field, value in [('ROOT',self.root),('UNIT_DIR',self.units),('OLD_HELPER_CONFIG',self.old)]:
|
||||
self.stack.enter_context(patch.object(lifecycle,field,value))
|
||||
lifecycle.link(self.root, self.release)
|
||||
self.unit = self.units / lifecycle.HELPER
|
||||
self.service = self.stack.enter_context(patch.object(lifecycle,'service'))
|
||||
self.state = self.stack.enter_context(patch.object(lifecycle,'helper_state',return_value='not-found'))
|
||||
|
||||
def legacy(self, enabled=True):
|
||||
self.old.mkdir()
|
||||
settings = lifecycle.script_settings(self.binding,self.uid,'c'*64)
|
||||
settings['allow_root_scripts'] = enabled
|
||||
lifecycle.save(self.old / 'helper.json',settings)
|
||||
legacy_image = self.root / 'releases' / self.previous / 'helper'
|
||||
self.unit.write_bytes(lifecycle.helper_unit(legacy_image,self.old / 'helper.json'))
|
||||
|
||||
def test_no_unit_or_explicitly_disabled_local_policy_stays_service_only(self):
|
||||
for state, opt_in in [('not-found',False), ('masked',True), ('disabled',True)]:
|
||||
with self.subTest(state=state):
|
||||
self.state.return_value = state
|
||||
lifecycle.provision_scripts(opt_in)
|
||||
self.service.assert_not_called()
|
||||
self.assertFalse((self.folder / 'script-helper.json').exists())
|
||||
|
||||
def test_legacy_predecessor_migrates_only_for_exact_authorized_profile(self):
|
||||
self.legacy(enabled=False)
|
||||
with self.assertRaisesRegex(ValueError,'different binding or profile'):
|
||||
lifecycle.helper_unit_files(self.binding,self.uid)
|
||||
settings = lifecycle.read(self.old / 'helper.json')
|
||||
settings['allow_root_scripts'] = True
|
||||
lifecycle.save(self.old / 'helper.json',settings)
|
||||
with self.assertRaisesRegex(ValueError,'different binding or profile'):
|
||||
lifecycle.helper_unit_files(dict(self.binding, public_key_hex='0'*64),self.uid)
|
||||
files = dict(lifecycle.helper_unit_files(self.binding,self.uid))
|
||||
self.assertIn(b'lifecycle.py run-helper',files[self.unit])
|
||||
self.assertIn(str(self.previous).encode(),self.unit.read_bytes())
|
||||
|
||||
def test_rejected_pair_does_not_run_candidate_and_altered_policy_stays_intact(self):
|
||||
with patch.object(lifecycle.subprocess,'check_output',side_effect=subprocess.CalledProcessError(1,'verify')) as run:
|
||||
with self.assertRaises(subprocess.CalledProcessError):
|
||||
lifecycle.prepare_script_helper(self.folder,self.binding,self.uid)
|
||||
self.assertEqual(run.call_count,1)
|
||||
config = self.folder / 'script-helper.json'
|
||||
self.assertFalse(config.exists())
|
||||
with patch.object(lifecycle.subprocess,'check_output',side_effect=[json.dumps(self.manifest),json.dumps(self.pin).encode()]):
|
||||
self.assertEqual(lifecycle.prepare_script_helper(self.folder,self.binding,self.uid),self.pin)
|
||||
settings = lifecycle.read(config)
|
||||
settings['allow_root_scripts'] = False
|
||||
lifecycle.save(config,settings)
|
||||
with patch.object(lifecycle.subprocess,'check_output',return_value=json.dumps(self.manifest)) as run:
|
||||
with self.assertRaisesRegex(ValueError,'binding changed'):
|
||||
lifecycle.prepare_script_helper(self.folder,self.binding,self.uid)
|
||||
self.assertEqual(run.call_count,1)
|
||||
self.assertEqual(lifecycle.read(config),settings)
|
||||
|
||||
def test_rollback_selects_previous_pair_and_keeps_pending_until_confirmed(self):
|
||||
self.state.return_value = 'enabled'
|
||||
previous = self.root / 'releases' / self.previous
|
||||
previous.mkdir()
|
||||
lifecycle.save(previous / 'manifest.json',dict(self.manifest,release_id=self.previous,version='v1'))
|
||||
lifecycle.save(previous / 'script-pin.json',self.pin)
|
||||
pending = self.root / 'pending.json'
|
||||
intent = {'previous':self.previous,'sequence':2,'script_helper':True}
|
||||
lifecycle.save(pending,intent)
|
||||
with patch.object(lifecycle,'start_pair') as start, patch.object(lifecycle,'healthy',side_effect=[False,True]):
|
||||
with self.assertRaisesRegex(ValueError,'has not yet confirmed'):
|
||||
lifecycle.revert(intent)
|
||||
self.assertEqual(lifecycle.active_folder(),previous)
|
||||
self.assertTrue(pending.exists())
|
||||
lifecycle.revert(intent,report_failure=False)
|
||||
self.assertFalse(pending.exists())
|
||||
self.assertEqual(start.call_count,2)
|
||||
self.assertEqual(lifecycle.read(self.root / 'failed.json')['release_sequence'],2)
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user