Skip to content

Commit 753eba5

Browse files
data-douserdata-douser
committed
Migrate external to extensible predicates w/ dataExtensions
Replace `external string` declarations with `extensible predicate` syntax across all 8 languages, enabling YAML-based data extensions for testing instead of fragile fallback hacks. Architecture: - Add ExternalPredicates.qll per language with shared extensible predicate declarations (sourceFunction, targetFunction, selectedSourceFiles) - Add dataExtensions YAML files in test/*/ext/ directories providing test values for each query's external predicates - Add dataExtensions glob to all test pack codeql-pack.yml files - Remove all "Fallback for unit tests" or clauses from queries This means: - Tests now exercise the actual external predicate logic path - No more path-based hacks (getParentContainer().getBaseName() = "test") - CallGraphFromTo tests produce precise source→target results - New queries only need a .model.yml file, not query modifications
1 parent 5cb3839 commit 753eba5

111 files changed

Lines changed: 756 additions & 770 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ extensions/vscode/test/fixtures/
1717
node_modules
1818
query-results*
1919
server/dist/
20+
server/ql/*/tools/test/*
2021
workshops/
2122

‎server/dist/codeql-development-mcp-server.js‎

Lines changed: 62 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -57238,65 +57238,72 @@ function registerCLITool(server, definition) {
5723857238
} else if (query) {
5723957239
positionalArgs = [...positionalArgs, query];
5724057240
}
57241-
if (queryName === "PrintAST" && sourceFiles) {
57241+
const extensiblePredicates = {};
57242+
if ((queryName === "PrintAST" || queryName === "PrintCFG") && sourceFiles) {
5724257243
const filePaths = sourceFiles.split(",").map((f) => f.trim());
57243-
let tempDir;
57244-
let csvPath;
57245-
try {
57246-
tempDir = createProjectTempDir("codeql-external-");
57247-
tempDirsToCleanup.push(tempDir);
57248-
csvPath = join6(tempDir, "selectedSourceFiles.csv");
57249-
const csvContent = filePaths.join("\n") + "\n";
57250-
writeFileSync2(csvPath, csvContent, "utf8");
57251-
} catch (err) {
57252-
logger.error(`Failed to create external predicate CSV for PrintAST query at path ${csvPath || "[unknown]"}: ${err instanceof Error ? err.message : String(err)}`);
57253-
throw err;
57254-
}
57255-
const currentExternal = options.external || [];
57256-
const externalArray = Array.isArray(currentExternal) ? currentExternal : [currentExternal];
57257-
externalArray.push(`selectedSourceFiles=${csvPath}`);
57258-
options.external = externalArray;
57259-
logger.info(`Created external predicate CSV at ${csvPath} for files: ${filePaths.join(", ")}`);
57244+
extensiblePredicates["selectedSourceFiles"] = filePaths;
5726057245
}
57261-
if (queryName === "CallGraphFrom" && sourceFunction) {
57246+
if (sourceFunction) {
5726257247
const functionNames = sourceFunction.split(",").map((f) => f.trim());
57263-
let tempDir;
57264-
let csvPath;
57265-
try {
57266-
tempDir = createProjectTempDir("codeql-external-");
57267-
tempDirsToCleanup.push(tempDir);
57268-
csvPath = join6(tempDir, "sourceFunction.csv");
57269-
const csvContent = functionNames.join("\n") + "\n";
57270-
writeFileSync2(csvPath, csvContent, "utf8");
57271-
} catch (err) {
57272-
logger.error(`Failed to create external predicate CSV for CallGraphFrom query at path ${csvPath || "[unknown]"}: ${err instanceof Error ? err.message : String(err)}`);
57273-
throw err;
57274-
}
57275-
const currentExternal = options.external || [];
57276-
const externalArray = Array.isArray(currentExternal) ? currentExternal : [currentExternal];
57277-
externalArray.push(`sourceFunction=${csvPath}`);
57278-
options.external = externalArray;
57279-
logger.info(`Created external predicate CSV at ${csvPath} for functions: ${functionNames.join(", ")}`);
57248+
extensiblePredicates["sourceFunction"] = functionNames;
5728057249
}
57281-
if (queryName === "CallGraphTo" && targetFunction) {
57250+
if (targetFunction) {
5728257251
const functionNames = targetFunction.split(",").map((f) => f.trim());
57283-
let tempDir;
57284-
let csvPath;
57285-
try {
57286-
tempDir = createProjectTempDir("codeql-external-");
57287-
tempDirsToCleanup.push(tempDir);
57288-
csvPath = join6(tempDir, "targetFunction.csv");
57289-
const csvContent = functionNames.join("\n") + "\n";
57290-
writeFileSync2(csvPath, csvContent, "utf8");
57291-
} catch (err) {
57292-
logger.error(`Failed to create external predicate CSV for CallGraphTo query at path ${csvPath || "[unknown]"}: ${err instanceof Error ? err.message : String(err)}`);
57293-
throw err;
57252+
extensiblePredicates["targetFunction"] = functionNames;
57253+
}
57254+
if (Object.keys(extensiblePredicates).length > 0) {
57255+
let targetPackName;
57256+
if (_queryLanguage) {
57257+
targetPackName = `advanced-security/ql-mcp-${_queryLanguage}-tools-src`;
57258+
} else if (query && typeof query === "string") {
57259+
const match = query.match(/\/ql\/([^/]+)\/tools\/src\//);
57260+
if (match) {
57261+
targetPackName = `advanced-security/ql-mcp-${match[1]}-tools-src`;
57262+
}
57263+
}
57264+
if (targetPackName) {
57265+
try {
57266+
const extPackDir = createProjectTempDir("codeql-ext-pack-");
57267+
tempDirsToCleanup.push(extPackDir);
57268+
const qlpackContent = [
57269+
"library: true",
57270+
"name: advanced-security/ql-mcp-runtime-extensions",
57271+
"version: 0.0.0",
57272+
"extensionTargets:",
57273+
` ${targetPackName}: "*"`,
57274+
"dataExtensions:",
57275+
' - "ext/*.model.yml"',
57276+
""
57277+
].join("\n");
57278+
writeFileSync2(join6(extPackDir, "qlpack.yml"), qlpackContent, "utf8");
57279+
const extDir = join6(extPackDir, "ext");
57280+
mkdirSync5(extDir, { recursive: true });
57281+
const extensions = ["extensions:"];
57282+
for (const [predName, values] of Object.entries(extensiblePredicates)) {
57283+
extensions.push(" - addsTo:");
57284+
extensions.push(` pack: ${targetPackName}`);
57285+
extensions.push(` extensible: ${predName}`);
57286+
extensions.push(" data:");
57287+
for (const val of values) {
57288+
extensions.push(` - ["${val}"]`);
57289+
}
57290+
}
57291+
extensions.push("");
57292+
writeFileSync2(join6(extDir, "runtime.model.yml"), extensions.join("\n"), "utf8");
57293+
const existingPacks = options["additional-packs"];
57294+
options["additional-packs"] = existingPacks ? `${existingPacks}:${extPackDir}` : extPackDir;
57295+
const modelPacks = options["model-packs"];
57296+
const modelPacksArray = Array.isArray(modelPacks) ? modelPacks : [];
57297+
modelPacksArray.push("advanced-security/ql-mcp-runtime-extensions@*");
57298+
options["model-packs"] = modelPacksArray;
57299+
logger.info(`Created runtime extension pack at ${extPackDir} targeting ${targetPackName} with predicates: ${Object.keys(extensiblePredicates).join(", ")}`);
57300+
} catch (err) {
57301+
logger.error(`Failed to create runtime extension pack: ${err instanceof Error ? err.message : String(err)}`);
57302+
throw err;
57303+
}
57304+
} else {
57305+
logger.warn("Could not determine target pack name for extensible predicates \u2014 queryLanguage not set and query path does not match expected pattern");
5729457306
}
57295-
const currentExternal = options.external || [];
57296-
const externalArray = Array.isArray(currentExternal) ? currentExternal : [currentExternal];
57297-
externalArray.push(`targetFunction=${csvPath}`);
57298-
options.external = externalArray;
57299-
logger.info(`Created external predicate CSV at ${csvPath} for functions: ${functionNames.join(", ")}`);
5730057307
}
5730157308
break;
5730257309
}
@@ -57360,7 +57367,8 @@ function registerCLITool(server, definition) {
5736057367
const defaultExamplesPath = resolve4(packageRootDir, "ql", "javascript", "examples");
5736157368
const additionalPacksPath = process.env.CODEQL_ADDITIONAL_PACKS || (existsSync4(defaultExamplesPath) ? defaultExamplesPath : void 0);
5736257369
if (additionalPacksPath && (name === "codeql_test_run" || name === "codeql_query_run" || name === "codeql_query_compile" || name === "codeql_database_analyze")) {
57363-
options["additional-packs"] = additionalPacksPath;
57370+
const existingAdditionalPacks = options["additional-packs"];
57371+
options["additional-packs"] = existingAdditionalPacks ? `${existingAdditionalPacks}:${additionalPacksPath}` : additionalPacksPath;
5736457372
}
5736557373
if (name === "codeql_test_run") {
5736657374
options["keep-databases"] = true;

‎server/dist/codeql-development-mcp-server.js.map‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/ql/cpp/tools/src/CallGraphFrom/CallGraphFrom.ql‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88
*/
99

1010
import cpp
11-
12-
/**
13-
* Gets the source function name for which to generate the call graph.
14-
* Can be a single function name or comma-separated list of function names.
15-
*/
16-
external string sourceFunction();
11+
import ExternalPredicates
1712

1813
/**
1914
* Gets a single source function name from the comma-separated list.
2015
*/
21-
string getSourceFunctionName() { result = sourceFunction().splitAt(",").trim() }
16+
string getSourceFunctionName() {
17+
exists(string s | sourceFunction(s) | result = s.splitAt(",").trim())
18+
}
2219

2320
/**
2421
* Gets a function by matching against the selected source function names.
@@ -40,12 +37,5 @@ from FunctionCall call, Function source, Function callee
4037
where
4138
call.getTarget() = callee and
4239
call.getEnclosingFunction() = source and
43-
(
44-
// Use external predicate if available
45-
source = getSourceFunction()
46-
or
47-
// Fallback for unit tests: include test files
48-
not exists(getSourceFunction()) and
49-
source.getFile().getParentContainer().getParentContainer().getBaseName() = "test"
50-
)
40+
source = getSourceFunction()
5141
select call, "Call from `" + source.getQualifiedName() + "` to `" + callee.getQualifiedName() + "`"

‎server/ql/cpp/tools/src/CallGraphFromTo/CallGraphFromTo.ql‎

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,21 @@
88
*/
99

1010
import cpp
11-
12-
/**
13-
* Gets the source function name for call graph reachability analysis.
14-
* Can be a single function name or comma-separated list of function names.
15-
*/
16-
external string sourceFunction();
17-
18-
/**
19-
* Gets the target function name for call graph reachability analysis.
20-
* Can be a single function name or comma-separated list of function names.
21-
*/
22-
external string targetFunction();
11+
import ExternalPredicates
2312

2413
/**
2514
* Gets a single source function name from the comma-separated list.
2615
*/
27-
string getSourceFunctionName() { result = sourceFunction().splitAt(",").trim() }
16+
string getSourceFunctionName() {
17+
exists(string s | sourceFunction(s) | result = s.splitAt(",").trim())
18+
}
2819

2920
/**
3021
* Gets a single target function name from the comma-separated list.
3122
*/
32-
string getTargetFunctionName() { result = targetFunction().splitAt(",").trim() }
23+
string getTargetFunctionName() {
24+
exists(string s | targetFunction(s) | result = s.splitAt(",").trim())
25+
}
3326

3427
/**
3528
* Gets a function by matching against the selected source function names.
@@ -74,19 +67,11 @@ from FunctionCall call, Function caller, Function callee
7467
where
7568
call.getTarget() = callee and
7669
call.getEnclosingFunction() = caller and
77-
(
78-
// Use external predicates if available: show calls on paths from source to target
79-
exists(Function source, Function target |
80-
source = getSourceFunction() and
81-
target = getTargetFunction() and
82-
calls*(source, caller) and
83-
calls*(callee, target)
84-
)
85-
or
86-
// Fallback for unit tests: include test files
87-
not exists(getSourceFunctionName()) and
88-
not exists(getTargetFunctionName()) and
89-
caller.getFile().getParentContainer().getParentContainer().getBaseName() = "test"
70+
exists(Function source, Function target |
71+
source = getSourceFunction() and
72+
target = getTargetFunction() and
73+
calls*(source, caller) and
74+
calls*(callee, target)
9075
)
9176
select call,
9277
"Reachable call from `" + caller.getQualifiedName() + "` to `" + callee.getQualifiedName() + "`"

‎server/ql/cpp/tools/src/CallGraphTo/CallGraphTo.ql‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88
*/
99

1010
import cpp
11-
12-
/**
13-
* Gets the target function name for which to generate the call graph.
14-
* Can be a single function name or comma-separated list of function names.
15-
*/
16-
external string targetFunction();
11+
import ExternalPredicates
1712

1813
/**
1914
* Gets a single target function name from the comma-separated list.
2015
*/
21-
string getTargetFunctionName() { result = targetFunction().splitAt(",").trim() }
16+
string getTargetFunctionName() {
17+
exists(string s | targetFunction(s) | result = s.splitAt(",").trim())
18+
}
2219

2320
/**
2421
* Gets a function by matching against the selected target function names.
@@ -40,12 +37,5 @@ from FunctionCall call, Function target, Function caller
4037
where
4138
call.getTarget() = target and
4239
call.getEnclosingFunction() = caller and
43-
(
44-
// Use external predicate if available
45-
target = getTargetFunction()
46-
or
47-
// Fallback for unit tests: include test files
48-
not exists(getTargetFunction()) and
49-
target.getFile().getParentContainer().getParentContainer().getBaseName() = "test"
50-
)
40+
target = getTargetFunction()
5141
select call, "Call to `" + target.getQualifiedName() + "` from `" + caller.getQualifiedName() + "`"

‎server/ql/cpp/tools/src/ExternalPredicates.qll‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/**
2+
* Shared extensible predicate declarations for MCP server tools queries.
3+
* Values are provided via dataExtensions YAML files during testing,
4+
* or via CSV files at runtime from the MCP server.
5+
*/
6+
7+
/** Holds for each source function name for call graph analysis. */
8+
extensible predicate sourceFunction(string name);
9+
10+
/** Holds for each target function name for call graph analysis. */
11+
extensible predicate targetFunction(string name);
12+
13+
/** Holds for each selected source file path for AST/CFG printing. */
14+
extensible predicate selectedSourceFiles(string path);

‎server/ql/cpp/tools/src/PrintAST/PrintAST.ql‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88

99
import cpp
1010
import semmle.code.cpp.PrintAST
11-
12-
/**
13-
* Gets the source files to generate AST from.
14-
* Can be a single file path or comma-separated list of file paths.
15-
*/
16-
external string selectedSourceFiles();
11+
import ExternalPredicates
1712

1813
/**
1914
* Gets a single source file from the comma-separated list.
2015
*/
21-
string getSelectedSourceFile() { result = selectedSourceFiles().splitAt(",").trim() }
16+
string getSelectedSourceFile() {
17+
exists(string s | selectedSourceFiles(s) | result = s.splitAt(",").trim())
18+
}
2219

2320
/**
2421
* Gets a file by matching against the selected source file paths.
@@ -45,12 +42,5 @@ File getSelectedFile() {
4542
* Falls back to test directory structure when external predicates are not available.
4643
*/
4744
class Cfg extends PrintAstConfiguration {
48-
override predicate shouldPrintDeclaration(Declaration decl) {
49-
// Use external predicate if available
50-
decl.getFile() = getSelectedFile()
51-
or
52-
// Fallback for unit tests: include test files
53-
not exists(getSelectedFile()) and
54-
decl.getFile().getParentContainer().getParentContainer().getBaseName() = "test"
55-
}
45+
override predicate shouldPrintDeclaration(Declaration decl) { decl.getFile() = getSelectedFile() }
5646
}

‎server/ql/cpp/tools/test/CallGraphFrom/CallGraphFrom.expected‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
| Example1.cpp:7:5:7:14 | call to unrelated1 | Call from `unrelated2` to `unrelated1` |
21
| Example1.cpp:12:5:12:14 | call to unrelated1 | Call from `sourceFunc` to `unrelated1` |
32
| Example1.cpp:13:5:13:14 | call to unrelated2 | Call from `sourceFunc` to `unrelated2` |

‎server/ql/cpp/tools/test/CallGraphFromTo/CallGraphFromTo.expected‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
| Example1.cpp:6:5:6:13 | call to unrelated | Reachable call from `target` to `unrelated` |
21
| Example1.cpp:10:5:10:10 | call to target | Reachable call from `intermediate` to `target` |
32
| Example1.cpp:14:5:14:16 | call to intermediate | Reachable call from `source` to `intermediate` |

0 commit comments

Comments
 (0)