@@ -2325,6 +2325,14 @@ def test_real_release_arm_route_and_environment_are_pinned(self):
23252325 def test_protected_arm_with_release_environment_is_accepted(self):
23262326 workflow = self.protected_workflow()
23272327 self.assertEqual(ci_preflight.runner_findings({'release.yml': workflow}), [])
2328+ for comment in ('# Ordinary build comment',
2329+ '# secrets.PINEFORGE_APP_PRIVATE_KEY is not used here',
2330+ '# ${{ secrets.GITHUB_TOKEN }}'):
2331+ with self.subTest(comment=comment):
2332+ changed = in_step(workflow, 'prebuilt', 'Configure', ' run: |\n',
2333+ ' run: |\n ' + comment + '\n')
2334+ self.assertNotEqual(changed, workflow)
2335+ self.assertEqual(ci_preflight.runner_findings({'release.yml': changed}), [])
23282336
23292337 def test_hosted_arm_is_refused_on_the_real_release_matrix(self):
23302338 workflow = self.protected_workflow()
@@ -2347,13 +2355,17 @@ def test_protected_arm_without_release_environment_is_refused(self):
23472355
23482356 def test_protected_arm_refuses_oidc_and_other_secret_access(self):
23492357 workflow = self.protected_workflow()
2350- changed = in_job(workflow, 'prebuilt',
2351- ' contents: write # gh release upload\n',
2352- ' contents: write # gh release upload\n'
2353- ' id-token: write\n')
2354- self.assertNotEqual(changed, workflow)
2355- self.assertIn(self.PERMISSIONS_FINDING,
2356- ci_preflight.runner_findings({'release.yml': changed}))
2358+ for permissions in (' contents: write # gh release upload\n'
2359+ ' id-token: write\n',
2360+ ' contents: read # gh release upload\n',
2361+ ' contents: write # gh release upload\n'
2362+ ' packages: write\n'):
2363+ with self.subTest(permissions=permissions):
2364+ changed = in_job(workflow, 'prebuilt',
2365+ ' contents: write # gh release upload\n', permissions)
2366+ self.assertNotEqual(changed, workflow)
2367+ self.assertIn(self.PERMISSIONS_FINDING,
2368+ ci_preflight.runner_findings({'release.yml': changed}))
23572369 for reference in ('secrets.DEPLOY_KEY', "secrets['GITHUB_TOKEN']",
23582370 'secrets.github_token', 'toJSON(secrets)'):
23592371 for job, before, after in (
@@ -2368,6 +2380,47 @@ def test_protected_arm_refuses_oidc_and_other_secret_access(self):
23682380 self.assertIn(self.SECRETS_FINDING,
23692381 ci_preflight.runner_findings({'release.yml': changed}))
23702382
2383+ def test_commented_secret_expressions_are_refused_on_the_real_release(self):
2384+ workflow = self.workflow()
2385+ self.assertIn(' GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}\n',
2386+ _jobs(workflow)['prebuilt'])
2387+ self.assertEqual(ci_preflight.runner_findings({'release.yml': workflow}), [])
2388+ for reference in ('secrets.PINEFORGE_APP_PRIVATE_KEY',
2389+ "secrets['PINEFORGE_APP_PRIVATE_KEY']",
2390+ 'secrets[inputs.key]', 'toJSON(secrets)',
2391+ "format('}} {0}', secrets.PINEFORGE_APP_PRIVATE_KEY)"):
2392+ with self.subTest(reference=reference):
2393+ changed = in_step(workflow, 'prebuilt', 'Configure', ' run: |\n',
2394+ ' run: |\n # ${{ ' + reference + ' }}\n')
2395+ self.assertNotEqual(changed, workflow)
2396+ self.assertEqual(ci_preflight.runner_findings({'release.yml': changed}),
2397+ [self.SECRETS_FINDING])
2398+
2399+ def test_credential_detection_reads_commented_expressions_on_the_real_release(self):
2400+ # Remove the environment so it cannot mask a missed secret reference.
2401+ workflow = in_job(self.workflow(), 'prebuilt', ' environment: release\n', '')
2402+ self.assertFalse(ci_preflight._holds_credentials(workflow, _jobs(workflow)['prebuilt']))
2403+ for comment in ('# secrets.PINEFORGE_APP_PRIVATE_KEY is not used here',
2404+ '# ${{ secrets.GITHUB_TOKEN }}',
2405+ "# ${{ secrets['GITHUB_TOKEN'] }}"):
2406+ with self.subTest(allowed_comment=comment):
2407+ changed = in_step(workflow, 'prebuilt', 'Configure', ' run: |\n',
2408+ ' run: |\n ' + comment + '\n')
2409+ self.assertNotEqual(changed, workflow)
2410+ self.assertFalse(ci_preflight._holds_credentials(
2411+ changed, _jobs(changed)['prebuilt']))
2412+ for reference in ('secrets.PINEFORGE_APP_PRIVATE_KEY',
2413+ "secrets['PINEFORGE_APP_PRIVATE_KEY']", 'secrets[inputs.key]',
2414+ "format('}} {0}', secrets.PINEFORGE_APP_PRIVATE_KEY)"):
2415+ for prefix in ('# ', ': # '):
2416+ with self.subTest(reference=reference, prefix=prefix):
2417+ changed = in_step(workflow, 'prebuilt', 'Configure', ' run: |\n',
2418+ ' run: |\n ' + prefix
2419+ + '${{ ' + reference + ' }}\n')
2420+ self.assertNotEqual(changed, workflow)
2421+ self.assertTrue(ci_preflight._holds_credentials(
2422+ changed, _jobs(changed)['prebuilt']))
2423+
23712424 def test_release_build_requires_runner_core_count(self):
23722425 workflow = self.workflow()
23732426 self.assertIn(f' run: cmake --build build -j {CORES}\n',
@@ -2380,6 +2433,18 @@ def test_release_build_requires_runner_core_count(self):
23802433 self.assertNotEqual(changed, workflow)
23812434 self.assertIn(self.BUILD_FINDING,
23822435 ci_preflight.runner_findings({'release.yml': changed}))
2436+ for guard in (' if: ${{ false }}\n', ' continue-on-error: true\n'):
2437+ with self.subTest(guard=guard):
2438+ changed = in_step(workflow, 'prebuilt', 'Build', ' - name: Build\n',
2439+ ' - name: Build\n' + guard)
2440+ self.assertNotEqual(changed, workflow)
2441+ self.assertIn(self.BUILD_FINDING,
2442+ ci_preflight.runner_findings({'release.yml': changed}))
2443+ build = f' - name: Build\n run: cmake --build build -j {CORES}\n'
2444+ duplicate = in_job(workflow, 'prebuilt', build, build + '\n' + build)
2445+ self.assertEqual(_jobs(duplicate)['prebuilt'].count(' - name: Build\n'), 2)
2446+ self.assertIn(self.BUILD_FINDING,
2447+ ci_preflight.runner_findings({'release.yml': duplicate}))
23832448
23842449 def test_protected_release_label_is_declared_once(self):
23852450 config = (ROOT / '.github/actionlint.yaml').read_text()
0 commit comments