From e86557a9db9a85514d7f02a665e23506dd8105b4 Mon Sep 17 00:00:00 2001
From: Owen Rumney <owen.rumney@aquasec.com>
Date: Wed, 3 Aug 2022 12:11:44 +0100
Subject: [PATCH] feat: Add issues to problems tab

Signed-off-by: Owen Rumney <owen.rumney@aquasec.com>
---
 CHANGELOG.md                    |  3 +++
 README.md                       |  3 +++
 package.json                    |  7 ++++---
 src/explorer/issues_treeview.ts | 26 ++++++++++++++++++++++++--
 src/extension.ts                |  3 ++-
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8fd01b..88cb612 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to the "tfsec" extension will be documented in this file.
 
+### 1.11.0
+- Add findings to the Problems tab
+
 ### 1.10.1
 - Fix Windows filepaths
 
diff --git a/README.md b/README.md
index 14f3c76..6957df3 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,9 @@ To remove ignores, edit the `tfsec.excludedPath` in the `.vscode/settings.json`
 
 ## Release Notes
 
+### 1.11.0
+- Add findings to the Problems tab
+
 ### 1.10.1
 - Fix Windows filepaths
 
diff --git a/package.json b/package.json
index c0a7ef3..ca08f95 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "displayName": "tfsec",
   "publisher": "tfsec",
   "description": "tfsec integration for Visual Studio Code",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "engines": {
     "vscode": "^1.54.0"
   },
@@ -235,6 +235,7 @@
     "@types/uuid": "^8.3.4",
     "semver": "^7.3.5",
     "typescipt": "^1.0.0",
-    "uuid": "^8.3.2"
+    "uuid": "^8.3.2",
+    "vsce": "^2.10.0"
   }
-}
\ No newline at end of file
+}
diff --git a/src/explorer/issues_treeview.ts b/src/explorer/issues_treeview.ts
index c16dea2..f46166e 100644
--- a/src/explorer/issues_treeview.ts
+++ b/src/explorer/issues_treeview.ts
@@ -4,6 +4,7 @@ import * as path from 'path';
 import { sortByCode, sortBySeverity, sortResults, uniqueLocations } from './utils';
 import { CheckResult, CheckSeverity } from './check_result';
 import { TfsecTreeItem, TfsecTreeItemType } from './tfsec_treeitem';
+import { checkServerIdentity } from 'tls';
 
 export class TfsecIssueProvider implements vscode.TreeDataProvider<TfsecTreeItem> {
 
@@ -14,8 +15,9 @@ export class TfsecIssueProvider implements vscode.TreeDataProvider<TfsecTreeItem
 	public rootpath: string = "";
 	private storagePath: string = "";
 	public readonly resultsStoragePath: string = "";
+	private diagCollection: vscode.DiagnosticCollection;
 
-	constructor(context: vscode.ExtensionContext) {
+	constructor(context: vscode.ExtensionContext, diagCollection: vscode.DiagnosticCollection) {
 		if (context.storageUri) {
 			this.storagePath = context.storageUri.fsPath;
 			console.log(`storage path is ${this.storagePath}`);
@@ -27,6 +29,8 @@ export class TfsecIssueProvider implements vscode.TreeDataProvider<TfsecTreeItem
 				fs.mkdirSync(this.resultsStoragePath);
 			}
 		}
+
+		this.diagCollection = diagCollection;
 	}
 
 	refresh(): void {
@@ -45,6 +49,9 @@ export class TfsecIssueProvider implements vscode.TreeDataProvider<TfsecTreeItem
 				const resultFile = path.join(this.resultsStoragePath, file);
 				if (fs.existsSync(resultFile)) {
 					let content = fs.readFileSync(resultFile, 'utf8');
+
+					let diagnostics =  new Map<string, vscode.Diagnostic[]>();
+
 					try {
 						const data = JSON.parse(content);
 						if (data === null || data.results === null) {
@@ -53,12 +60,22 @@ export class TfsecIssueProvider implements vscode.TreeDataProvider<TfsecTreeItem
 						let results = data.results.sort(sortResults);
 						for (let i = 0; i < results.length; i++) {
 							const element = results[i];
-							_self.resultData.push(new CheckResult(element));
+							let result = new CheckResult(element);
+							_self.resultData.push(result);
+							
+							if (diagnostics.get(result.filename) === undefined) {
+								diagnostics.set(result.filename, []);
+							}
+							diagnostics.get(result.filename)?.push(this.processProblem(result));
 						}
 					}
 					catch {
 						console.debug(`Error loading results file ${file}`);
 					}
+					
+					for (let [key, value] of diagnostics) {
+						this.diagCollection.set(vscode.Uri.file(key), value)
+					}
 				}
 			})).then(() => {
 				_self.taintResults = !_self.taintResults;
@@ -165,4 +182,9 @@ export class TfsecIssueProvider implements vscode.TreeDataProvider<TfsecTreeItem
 			]
 		};
 	}
+
+	private processProblem(check: CheckResult): vscode.Diagnostic {
+		let severity = check.severity === "Critical" || check.severity === "High" || check.severity === "Medium" ? vscode.DiagnosticSeverity.Error : vscode.DiagnosticSeverity.Warning
+		return new vscode.Diagnostic(new vscode.Range(new vscode.Position(check.startLine -1, 0), new vscode.Position(check.endLine -1, 0)), check.summary, severity);
+	}
 }
diff --git a/src/extension.ts b/src/extension.ts
index 52f3217..cbe1b83 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -12,9 +12,10 @@ import { TfsecWrapper } from './tfsec_wrapper';
 export function activate(context: vscode.ExtensionContext) {
 	let activeEditor = vscode.window.activeTextEditor;
 	var outputChannel = vscode.window.createOutputChannel("tfsec");
+	let diagCollection = vscode.languages.createDiagnosticCollection();
 
 	const helpProvider = new TfsecHelpProvider();
-	const issueProvider = new TfsecIssueProvider(context);
+	const issueProvider = new TfsecIssueProvider(context, diagCollection);
 	const tfsecWrapper = new TfsecWrapper(outputChannel, issueProvider.resultsStoragePath);
 
 	// creating the issue tree explicitly to allow access to events