From 4b430340dbd4df458cf0352369e60270a06e9dc2 Mon Sep 17 00:00:00 2001
From: jarek <jkrochmalski@gmail.com>
Date: Mon, 16 Feb 2026 16:19:55 +0100
Subject: [PATCH] 1.0.18

---
 src/lib/server/scanner.ts | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/lib/server/scanner.ts b/src/lib/server/scanner.ts
index f2901f1..505e9ac 100644
--- a/src/lib/server/scanner.ts
+++ b/src/lib/server/scanner.ts
@@ -238,8 +238,9 @@ function parseCliArgs(argsString: string, imageName: string): string[] {
 async function isScannerImageAvailable(scannerImage: string, envId?: number): Promise<boolean> {
 	try {
 		const images = await listImages(envId);
+		const imageWithTag = scannerImage.includes(':') ? scannerImage : `${scannerImage}:latest`;
 		return images.some((img) =>
-			img.tags?.some((tag: string) => tag === scannerImage)
+			img.tags?.some((tag: string) => tag === imageWithTag)
 		);
 	} catch {
 		return false;
@@ -275,7 +276,7 @@ async function ensureScannerImage(
 
 // Extract JSON object from raw scanner output that may contain non-JSON content
 // (binary Docker stream headers, warning lines, control characters)
-function extractJson(output: string): string {
+export function extractJson(output: string): string {
 	const firstBrace = output.indexOf('{');
 	const lastBrace = output.lastIndexOf('}');
 	if (firstBrace === -1 || lastBrace === -1 || lastBrace <= firstBrace) {
@@ -289,7 +290,7 @@ function extractJson(output: string): string {
  * Some scanners (Grype) may include raw control chars (newlines, tabs, null bytes)
  * in vulnerability descriptions that aren't properly JSON-escaped.
  */
-function sanitizeJsonString(json: string): string {
+export function sanitizeJsonString(json: string): string {
 	// Replace unescaped control characters (0x00-0x1F) inside JSON string values
 	// by walking through the string and tracking whether we're inside a quoted string
 	let result = '';
@@ -301,7 +302,15 @@ function sanitizeJsonString(json: string): string {
 		const ch = json.charCodeAt(i);
 
 		if (escaped) {
-			result += json[i];
+			// Validate JSON escape sequences: only " \ / b f n r t u are valid
+			const ch2 = json[i];
+			if ('"\\\/bfnrtu'.includes(ch2)) {
+				result += ch2;
+			} else {
+				// Invalid escape like \x, \a, \0, \_ — convert backslash to literal \\
+				result += '\\' + ch2;
+				sanitized++;
+			}
 			escaped = false;
 			continue;
 		}