Skip to content

Commit

Permalink
chore: Update vuln report Vulnreq (#115)
Browse files Browse the repository at this point in the history
  • Loading branch information
kadirkaang authored Aug 29, 2024
1 parent 5321e35 commit 282e65b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions vscode/src/api/indexes/dependi/reports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export interface VulnReq {
CurrentItems: ReportItem[];
Language: Language;
GHSACheck: boolean;
Author?: string;
}

export enum Language {
Expand Down
12 changes: 8 additions & 4 deletions vscode/src/commands/report-generator/reportGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@ async function fetchRepositoryData() {
const { commits } = await getCommitHistory(repo);
const { repoName, repoRootUri } = await getRepoDetails();
const commitId = commits[0]?.hash;
const author = commits[0]?.authorEmail;

if (!commitId) {
throw new Error("No commits found in the repository.");
}

return { repo, commits, repoName, repoRootUri, commitId };
return { repo, commits, repoName, repoRootUri, commitId, author };
}

async function getActiveEditorLanguage() {
Expand Down Expand Up @@ -93,7 +94,7 @@ export async function generateMainReport(progress: any) {

try {
totalPercentage = incrementProgress(progress, "fetchingRepository", totalPercentage);
const { repo, commits, repoName, repoRootUri, commitId } = await fetchRepositoryData();
const { repo, commits, repoName, repoRootUri, commitId, author } = await fetchRepositoryData();

const { fileName } = await getActiveEditorLanguage();

Expand All @@ -114,6 +115,7 @@ export async function generateMainReport(progress: any) {
CurrentItems: currentReportItems,
Language: getLangIdFromName(fileName),
GHSACheck: Settings.vulnerability.ghsa,
Author: author,
};

const reportResp = await getVulnReport(vulnRequest);
Expand All @@ -134,6 +136,7 @@ export async function generateCurrentReport(progress: any) {
let totalPercentage = 0;
try {
const { fileName } = await getActiveEditorLanguage();
const { commits, repoName, author } = await fetchRepositoryData();

totalPercentage = incrementProgress(progress, "parsingFile", totalPercentage);
const parser: Parser = parserInvoker(fileName);
Expand All @@ -142,12 +145,13 @@ export async function generateCurrentReport(progress: any) {
totalPercentage = incrementProgress(progress, "generatingReport", totalPercentage);

const vulnRequest: VulnReq = {
RepoName: "",
Commits: [],
RepoName: repoName || "",
Commits: commits || [],
PreviousItems: [],
CurrentItems: reportItems,
Language: getLangIdFromName(fileName),
GHSACheck: Settings.vulnerability.ghsa,
Author: author,
};

const reportResp = await getCurrentVulnReport(vulnRequest);
Expand Down

0 comments on commit 282e65b

Please sign in to comment.