Skip to content

Handle when an alert message contains links to files outside of the repository source #2672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/common/sarif-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as Sarif from "sarif";
import type { HighlightedRegion } from "../variant-analysis/shared/analysis-result";
import { ResolvableLocationValue } from "../common/bqrs-cli-types";

interface SarifLink {
export interface SarifLink {
dest: number;
text: string;
}
Expand Down
57 changes: 41 additions & 16 deletions extensions/ql-vscode/src/variant-analysis/sarif-processing.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as sarif from "sarif";
import {
SarifLink,
parseHighlightedLine,
parseSarifPlainTextMessage,
parseSarifRegion,
Expand All @@ -14,6 +15,7 @@ import {
ThreadFlow,
CodeSnippet,
HighlightedRegion,
AnalysisMessageLocationTokenLocation,
} from "./shared/analysis-result";

// A line of more than 8k characters is probably generated.
Expand Down Expand Up @@ -303,24 +305,47 @@ function getMessage(
if (typeof messagePart === "string") {
tokens.push({ t: "text", text: messagePart });
} else {
const relatedLocation = result.relatedLocations!.find(
(rl) => rl.id === messagePart.dest,
);
tokens.push({
t: "location",
text: messagePart.text,
location: {
fileLink: {
fileLinkPrefix,
filePath: relatedLocation!.physicalLocation!.artifactLocation!.uri!,
},
highlightedRegion: getHighlightedRegion(
relatedLocation!.physicalLocation!.region!,
),
},
});
const location = getRelatedLocation(messagePart, result, fileLinkPrefix);
if (location === undefined) {
tokens.push({ t: "text", text: messagePart.text });
} else {
tokens.push({
t: "location",
text: messagePart.text,
location,
});
}
}
}

return { tokens };
}

function getRelatedLocation(
messagePart: SarifLink,
result: sarif.Result,
fileLinkPrefix: string,
): AnalysisMessageLocationTokenLocation | undefined {
const relatedLocation = result.relatedLocations!.find(
(rl) => rl.id === messagePart.dest,
);
if (
relatedLocation === undefined ||
relatedLocation.physicalLocation?.artifactLocation?.uri === undefined ||
relatedLocation.physicalLocation?.artifactLocation?.uri?.startsWith(
"file:",
) ||
relatedLocation.physicalLocation?.region === undefined
) {
return undefined;
}
return {
fileLink: {
fileLinkPrefix,
filePath: relatedLocation.physicalLocation.artifactLocation.uri,
},
highlightedRegion: getHighlightedRegion(
relatedLocation.physicalLocation.region,
),
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,12 @@ interface AnalysisMessageTextToken {
export interface AnalysisMessageLocationToken {
t: "location";
text: string;
location: {
fileLink: FileLink;
highlightedRegion?: HighlightedRegion;
};
location: AnalysisMessageLocationTokenLocation;
}

export interface AnalysisMessageLocationTokenLocation {
fileLink: FileLink;
highlightedRegion?: HighlightedRegion;
}

export type ResultSeverity = "Recommendation" | "Warning" | "Error";
39 changes: 39 additions & 0 deletions extensions/ql-vscode/test/unit-tests/sarif-processing.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,45 @@ describe("SARIF processing", () => {
expectNoParsingError(result);
expect(actualCodeSnippet).not.toBeUndefined();
});

it("should be able to handle when a location has no uri", () => {
const sarif = buildValidSarifLog();
sarif.runs![0].results![0].message.text = "message [String](1)";
sarif.runs![0].results![0].relatedLocations = [
{
id: 1,
physicalLocation: {
artifactLocation: {
uri: "file:/modules/java.base/java/lang/String.class",
index: 1,
},
},
message: {
text: "String",
},
},
];

const result = extractAnalysisAlerts(sarif, fakefileLinkPrefix);

expect(result).toBeTruthy();
expectNoParsingError(result);
expect(result.alerts[0].codeSnippet).not.toBeUndefined();
expect(result.alerts[0].message.tokens).toStrictEqual([
{
t: "text",
text: "message ",
},
{
t: "text",
text: "String",
},
{
t: "text",
text: "",
},
]);
});
});

function expectResultParsingError(msg: string) {
Expand Down