Avoid action metadata parser backtracking

This commit is contained in:
copilot-swe-agent[bot] 2026-07-27 02:40:06 +00:00 committed by GitHub
parent 219d4c3cc1
commit d0cafc58c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 87 additions and 11 deletions

View File

@ -198,6 +198,7 @@ describe('main tests', () => {
${'{"devEngines": {"runtime": {"name": "node", "version": "22.0.0"}}}'} | ${'22.0.0'}
${'{"devEngines": {"runtime": [{"name": "bun"}, {"name": "node", "version": "22.0.0"}]}}'} | ${'22.0.0'}
${"name: 'My Action'\nruns:\n using: 'node24'\n main: 'dist/index.js'\n"} | ${'24'}
${'runs:\n using: node24 # action runtime\n'} | ${'24'}
`.it('parses "$contents"', ({contents, expected}: any) => {
const existsSpy = jest.spyOn(fs, 'existsSync');
existsSpy.mockImplementation(() => true);

View File

@ -92709,9 +92709,33 @@ function getNodeVersionFromFile(versionFilePath) {
catch {
core.info('Node version file is not JSON file');
}
const actionRuntime = contents.match(/^runs\s*:\s*$(?:\r?\n(?:[ \t]+[^\r\n]*|[ \t]*))*?\r?\n[ \t]+using:\s*['"]?node(?<version>\d+)['"]?\s*(?:#.*)?$/m);
if (actionRuntime?.groups?.version) {
return actionRuntime.groups.version;
let inRunsSection = false;
for (const line of contents.split(/\r?\n/)) {
const trimmedLine = line.trim();
if (!inRunsSection) {
inRunsSection =
trimmedLine === 'runs:' || trimmedLine.startsWith('runs: #');
continue;
}
if (!trimmedLine || trimmedLine.startsWith('#')) {
continue;
}
if (!line.match(/^\s/)) {
break;
}
const separatorIndex = trimmedLine.indexOf(':');
if (trimmedLine.slice(0, separatorIndex) !== 'using') {
continue;
}
let runtime = trimmedLine.slice(separatorIndex + 1).trim();
runtime = runtime.split('#', 1)[0].trim();
if ((runtime.startsWith("'") && runtime.endsWith("'")) ||
(runtime.startsWith('"') && runtime.endsWith('"'))) {
runtime = runtime.slice(1, -1);
}
if (runtime.startsWith('node') && /^\d+$/.test(runtime.slice(4))) {
return runtime.slice(4);
}
}
const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m);
return found?.groups?.version ?? contents.trim();

30
dist/setup/index.js vendored
View File

@ -98103,9 +98103,33 @@ function getNodeVersionFromFile(versionFilePath) {
catch {
core_info('Node version file is not JSON file');
}
const actionRuntime = contents.match(/^runs\s*:\s*$(?:\r?\n(?:[ \t]+[^\r\n]*|[ \t]*))*?\r?\n[ \t]+using:\s*['"]?node(?<version>\d+)['"]?\s*(?:#.*)?$/m);
if (actionRuntime?.groups?.version) {
return actionRuntime.groups.version;
let inRunsSection = false;
for (const line of contents.split(/\r?\n/)) {
const trimmedLine = line.trim();
if (!inRunsSection) {
inRunsSection =
trimmedLine === 'runs:' || trimmedLine.startsWith('runs: #');
continue;
}
if (!trimmedLine || trimmedLine.startsWith('#')) {
continue;
}
if (!line.match(/^\s/)) {
break;
}
const separatorIndex = trimmedLine.indexOf(':');
if (trimmedLine.slice(0, separatorIndex) !== 'using') {
continue;
}
let runtime = trimmedLine.slice(separatorIndex + 1).trim();
runtime = runtime.split('#', 1)[0].trim();
if ((runtime.startsWith("'") && runtime.endsWith("'")) ||
(runtime.startsWith('"') && runtime.endsWith('"'))) {
runtime = runtime.slice(1, -1);
}
if (runtime.startsWith('node') && /^\d+$/.test(runtime.slice(4))) {
return runtime.slice(4);
}
}
const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m);
return found?.groups?.version ?? contents.trim();

View File

@ -68,11 +68,38 @@ export function getNodeVersionFromFile(versionFilePath: string): string | null {
core.info('Node version file is not JSON file');
}
const actionRuntime = contents.match(
/^runs\s*:\s*$(?:\r?\n(?:[ \t]+[^\r\n]*|[ \t]*))*?\r?\n[ \t]+using:\s*['"]?node(?<version>\d+)['"]?\s*(?:#.*)?$/m
);
if (actionRuntime?.groups?.version) {
return actionRuntime.groups.version;
let inRunsSection = false;
for (const line of contents.split(/\r?\n/)) {
const trimmedLine = line.trim();
if (!inRunsSection) {
inRunsSection =
trimmedLine === 'runs:' || trimmedLine.startsWith('runs: #');
continue;
}
if (!trimmedLine || trimmedLine.startsWith('#')) {
continue;
}
if (!line.match(/^\s/)) {
break;
}
const separatorIndex = trimmedLine.indexOf(':');
if (trimmedLine.slice(0, separatorIndex) !== 'using') {
continue;
}
let runtime = trimmedLine.slice(separatorIndex + 1).trim();
runtime = runtime.split('#', 1)[0].trim();
if (
(runtime.startsWith("'") && runtime.endsWith("'")) ||
(runtime.startsWith('"') && runtime.endsWith('"'))
) {
runtime = runtime.slice(1, -1);
}
if (runtime.startsWith('node') && /^\d+$/.test(runtime.slice(4))) {
return runtime.slice(4);
}
}
const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m);