fix(01-07): validate actual copy-state artifacts at scenario boundary
This commit is contained in:
1 parent
48fca0df52
commit
02d182f35d
3 files changed
+7
-5
No files matched your search
@@ -247,9 +247,9 @@ class CaptureTests(unittest.TestCase):
|
|||||||
receipt = self.api().collect(self.run, probe=self.probe, annotations=note)
|
receipt = self.api().collect(self.run, probe=self.probe, annotations=note)
|
||||||
protocol = receipts.read_json(ROOT / 'docs/evidence/scenarios.json')
|
protocol = receipts.read_json(ROOT / 'docs/evidence/scenarios.json')
|
||||||
cell = next(c for c in protocol['cells'] if c['id'] == receipt['case_id'])
|
cell = next(c for c in protocol['cells'] if c['id'] == receipt['case_id'])
|
||||||
receipts._scenario_observation(protocol, cell, receipt)
|
receipts._scenario_observation(protocol, cell, receipt, self.run)
|
||||||
receipt['continuity']['return_session_id'] = 'other-process'
|
receipt['continuity']['return_session_id'] = 'other-process'
|
||||||
with self.assertRaises(ValueError): receipts._scenario_observation(protocol, cell, receipt)
|
with self.assertRaises(ValueError): receipts._scenario_observation(protocol, cell, receipt, self.run)
|
||||||
self.assertEqual(receipt['acceptance']['state'], 'open')
|
self.assertEqual(receipt['acceptance']['state'], 'open')
|
||||||
|
|
||||||
def test_annotated_prerequisite_cannot_escape_capture_root(self):
|
def test_annotated_prerequisite_cannot_escape_capture_root(self):
|
||||||
|
|||||||
@@ -387,7 +387,7 @@ def matrix(protocol, records=(), previous=None, dependency=None):
|
|||||||
sessions[session_id] = record_id; seen[record_id] = digest
|
sessions[session_id] = record_id; seen[record_id] = digest
|
||||||
reasons = list(validated['missing_evidence'])
|
reasons = list(validated['missing_evidence'])
|
||||||
try:
|
try:
|
||||||
_scenario_observation(protocol, cells[key[0]], receipt)
|
_scenario_observation(protocol, cells[key[0]], receipt, root)
|
||||||
except (ValueError, KeyError, StopIteration) as error:
|
except (ValueError, KeyError, StopIteration) as error:
|
||||||
reasons.append('Scenario continuity: ' + str(error))
|
reasons.append('Scenario continuity: ' + str(error))
|
||||||
if receipt['evidence_kind'] != 'native_port':
|
if receipt['evidence_kind'] != 'native_port':
|
||||||
|
|||||||
@@ -626,7 +626,7 @@ def required_events(protocol, cell, obligation_id):
|
|||||||
return events
|
return events
|
||||||
|
|
||||||
|
|
||||||
def _scenario_observation(protocol, cell, receipt):
|
def _scenario_observation(protocol, cell, receipt, root):
|
||||||
obligation = receipt['obligation_id']
|
obligation = receipt['obligation_id']
|
||||||
if receipt.get('scope') != obligation:
|
if receipt.get('scope') != obligation:
|
||||||
raise ValueError('Receipt scope must match its explicit obligation')
|
raise ValueError('Receipt scope must match its explicit obligation')
|
||||||
@@ -664,10 +664,12 @@ def _scenario_observation(protocol, cell, receipt):
|
|||||||
if continuity.get('prerequisite_artifact') not in {
|
if continuity.get('prerequisite_artifact') not in {
|
||||||
a['path'] for a in receipt['artifacts'] if a.get('role') == 'prerequisite'}:
|
a['path'] for a in receipt['artifacts'] if a.get('role') == 'prerequisite'}:
|
||||||
raise ValueError('Visible identified prerequisite setup required')
|
raise ValueError('Visible identified prerequisite setup required')
|
||||||
|
_checked_artifact(receipt['identity'].get('copy_pre'), root)
|
||||||
if (not re.fullmatch('[0-9a-f]{64}', continuity.get('copy_pre_sha256', '')) or
|
if (not re.fullmatch('[0-9a-f]{64}', continuity.get('copy_pre_sha256', '')) or
|
||||||
continuity['copy_pre_sha256'] != receipt['identity'].get('copy_pre', {}).get('sha256')):
|
continuity['copy_pre_sha256'] != receipt['identity'].get('copy_pre', {}).get('sha256')):
|
||||||
raise ValueError('Copy pre state must bind the actual named copy_pre identity record')
|
raise ValueError('Copy pre state must bind the actual named copy_pre identity record')
|
||||||
if cell['lifetime'] == 'retained':
|
if cell['lifetime'] == 'retained':
|
||||||
|
_checked_artifact(receipt['identity'].get('retained_copy'), root)
|
||||||
if (continuity.get('departure_session_id') != receipt['session_id'] or
|
if (continuity.get('departure_session_id') != receipt['session_id'] or
|
||||||
continuity.get('return_session_id') != receipt['session_id'] or
|
continuity.get('return_session_id') != receipt['session_id'] or
|
||||||
not re.fullmatch('[0-9a-f]{64}', continuity.get('retained_copy_sha256', ''))):
|
not re.fullmatch('[0-9a-f]{64}', continuity.get('retained_copy_sha256', ''))):
|
||||||
@@ -709,7 +711,7 @@ def audit_scenarios(protocol, records):
|
|||||||
if not result['accepted']:
|
if not result['accepted']:
|
||||||
open_receipts.append(label + ': ' + '; '.join(result['missing_evidence']))
|
open_receipts.append(label + ': ' + '; '.join(result['missing_evidence']))
|
||||||
continue
|
continue
|
||||||
_scenario_observation(protocol, cells[case], receipt)
|
_scenario_observation(protocol, cells[case], receipt, root)
|
||||||
if cells[case]['lifetime'] == 'fresh':
|
if cells[case]['lifetime'] == 'fresh':
|
||||||
session_key = (receipt['evidence_kind'], receipt['platform']['os'], receipt['session_id'])
|
session_key = (receipt['evidence_kind'], receipt['platform']['os'], receipt['session_id'])
|
||||||
if session_key in fresh_sessions:
|
if session_key in fresh_sessions:
|
||||||
|
|||||||
Reference in new issue
Block a user