From f01f007b7d399715b89f6b38d4b08f7e26d8d041 Mon Sep 17 00:00:00 2001 From: Dylan Roy <249851642+d6g8k5htny-coder@users.noreply.github.com> Date: Wed, 7 Oct 2026 16:32:29 -0700 Subject: [PATCH] Handle non-object registry roots with a structured refusal Add the root-type guard before object field access and preserve valid-object diagnostics. Cover API/CLI behavior, input preservation and positive/malformed boundaries. Scope: issue15 pickup6048848537; scientific effect NONE. --- tests/test_architecture_conformance.py | 80 ++++++++++++++++++++++++++ tools/architecture_conformance.py | 2 + 2 files changed, 82 insertions(+) diff --git a/tests/test_architecture_conformance.py b/tests/test_architecture_conformance.py index 445eb2f..6da720c 100644 --- a/tests/test_architecture_conformance.py +++ b/tests/test_architecture_conformance.py @@ -42,4 +42,84 @@ def test_missing_or_unresolved_authority_map_is_violation(self): p.parent.mkdir(parents=True,exist_ok=True);d=valid_authority();d['required_authority_ids'].append('missing');p.write_text(json.dumps(d));self.assertFalse(self.run_check()['ok']) def test_direct_cli_invocation_works_with_dash_s(self): script=Path(__file__).resolve().parents[1]/'tools/architecture_conformance.py';p=subprocess.run([sys.executable,'-B','-S',str(script),'--workspace',str(self.root)],capture_output=True,text=True,timeout=10);self.assertEqual(p.returncode,0,p.stderr);self.assertTrue(json.loads(p.stdout)['ok']) + + def _input_files(self): + return {str(p.relative_to(self.root)): p.read_bytes() + for p in self.root.rglob('*') if p.is_file()} + + def _registry_cli(self): + script = Path(__file__).resolve().parents[1] / 'tools/architecture_conformance.py' + flags = ['-B', '-S'] + (['-O'] if sys.flags.optimize else []) + return subprocess.run([sys.executable, *flags, str(script), '--workspace', str(self.root)], + capture_output=True, text=True, timeout=10) + + def _assert_registry_cli_report(self, expected): + result = self._registry_cli() + self.assertEqual(result.returncode, 0 if expected['ok'] else 2, result.stderr) + self.assertEqual(result.stderr, '') + self.assertEqual(result.stdout, json.dumps(expected, indent=2, sort_keys=True) + '\n') + + def test_nonobject_registry_api_is_handled(self): + expected = {'ok': False, 'repositories_checked': [], + 'violations': ['registry must be an object'], 'scientific_effect': 'NONE'} + path = self.root / 'meta-framework/registry.json' + for raw in (b'[]\n', b'[{"schema_version":1}]\n', b'null\n', b'false\n', b'true\n', + b'0\n', b'1.5\n', b'""\n', b'"registry"\n'): + with self.subTest(raw=raw): + path.write_bytes(raw) + before = self._input_files() + try: + report = self.run_check() + except Exception as exc: + self.fail('registry refusal escaped as ' + type(exc).__name__ + ': ' + str(exc)) + self.assertEqual(report, expected) + self.assertEqual(self._input_files(), before) + + def test_nonobject_registry_cli_is_handled(self): + expected = {'ok': False, 'repositories_checked': [], + 'violations': ['registry must be an object'], 'scientific_effect': 'NONE'} + path = self.root / 'meta-framework/registry.json' + for raw in (b'[]\n', b'[{"schema_version":1}]\n', b'null\n', b'false\n', b'true\n', + b'0\n', b'1.5\n', b'""\n', b'"registry"\n'): + with self.subTest(raw=raw): + path.write_bytes(raw) + before = self._input_files() + self._assert_registry_cli_report(expected) + self.assertEqual(self._input_files(), before) + + def test_registry_object_and_parse_boundaries_keep_reports(self): + path = self.root / 'meta-framework/registry.json' + valid = path.read_bytes() + missing_fields = ['registry schema_version must equal integer 1', 'repository map required'] + missing_fields += ['missing repository role: ' + name for name in sorted(REPOS)] + missing_fields += ['registry cannot be scientific-status authority', 'registry artifacts must be a list'] + try: + json.loads('{') + except ValueError as exc: + parse_error = 'registry parse error: ' + str(exc) + cases = ( + (valid, {'ok': True, 'repositories_checked': sorted(REPOS), + 'violations': [], 'scientific_effect': 'NONE'}), + (b'{}\n', {'ok': False, 'repositories_checked': [], + 'violations': missing_fields, 'scientific_effect': 'NONE'}), + (b'{', {'ok': False, 'repositories_checked': [], + 'violations': [parse_error] + missing_fields, 'scientific_effect': 'NONE'}), + ) + for raw, expected in cases: + with self.subTest(raw=raw): + path.write_bytes(raw) + before = self._input_files() + self.assertEqual(self.run_check(), expected) + self._assert_registry_cli_report(expected) + self.assertEqual(self._input_files(), before) + + def test_missing_registry_keeps_report(self): + (self.root / 'meta-framework/registry.json').unlink() + before = self._input_files() + expected = {'ok': False, 'repositories_checked': [], + 'violations': ['missing meta-framework/registry.json'], 'scientific_effect': 'NONE'} + self.assertEqual(self.run_check(), expected) + self._assert_registry_cli_report(expected) + self.assertEqual(self._input_files(), before) + if __name__=='__main__':unittest.main() diff --git a/tools/architecture_conformance.py b/tools/architecture_conformance.py index d6cb09b..aa3ac60 100644 --- a/tools/architecture_conformance.py +++ b/tools/architecture_conformance.py @@ -44,6 +44,8 @@ def check_workspace(root:Path)->dict: if not regpath.is_file(): return {'ok':False,'repositories_checked':checked,'violations':['missing meta-framework/registry.json'],'scientific_effect':'NONE'} try:registry=_load_json(regpath) except Exception as exc: violations.append('registry parse error: '+str(exc));registry={} + if not isinstance(registry,dict): + return {'ok':False,'repositories_checked':checked,'violations':['registry must be an object'],'scientific_effect':'NONE'} if type(registry.get('schema_version')) is not int or registry.get('schema_version')!=1: violations.append('registry schema_version must equal integer 1') repos=registry.get('repositories') if isinstance(registry,dict) else None if not isinstance(repos,dict): violations.append('repository map required');repos={}