Update CHANGELOG and package version to 1.1.0; enhance UI and fix security issues

Author: dermatz

CHANGELOG.md

@@ -6,8 +6,17 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 ## [Unreleased]
 
+## [1.1.0] - 2024-11-16
+### Added
+- Improved the user interface of the webview panel.
+- Added line number formatting with leading zeros.
+- Removed timestamp and dot from log entries in the summary.
+
+### Fixed
+- Fixed potential security issue with non-literal argument in `fs.existsSync`.
+- Fixed potential object injection issue in `groupLogEntries` method.
 
-## v1.0.2
+## [1.0.2] - 2024-10-10
 ### Changed
 - Repository URL to `https://github.com/OpenForgeProject/vscode-ext-magento-log-viewer`
 

package.json

@@ -2,7 +2,7 @@
   "name": "magento-log-viewer",
   "displayName": "Magento Log Viewer",
   "description": "A Visual Studio Code extension to view and manage Magento log files.",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "publisher": "MathiasElle",
   "icon": "resources/logo.png",
   "repository": {

src/extension.ts

@@ -31,7 +31,7 @@ export function activate(context: vscode.ExtensionContext) {
     });
   } else if (isMagentoProject === 'Yes') {
     const magentoRoot = config.get<string>('magentoLogViewer.magentoRoot', '');
-    if (!magentoRoot || !fs.existsSync(magentoRoot) || !fs.lstatSync(magentoRoot).isDirectory()) {
+    if (!magentoRoot || !isValidPath(magentoRoot)) {
       vscode.window.showErrorMessage('Magento root path is not set or is not a directory.');
       return;
     }
@@ -97,5 +97,13 @@ function activateExtension(context: vscode.ExtensionContext, magentoRoot: string
   context.subscriptions.push(watcher);
 }
 
+function isValidPath(filePath: string): boolean {
+  try {
+    return fs.existsSync(filePath) && fs.lstatSync(filePath).isDirectory();
+  } catch (error) {
+    return false;
+  }
+}
+
 // This method is called when your extension is deactivated
 export function deactivate() {}

src/logViewer.ts

@@ -81,21 +81,27 @@ export class LogViewerProvider implements vscode.TreeDataProvider<LogFile>, vsco
       const match = line.match(/\.(\w+):/);
       if (match) {
         const level = match[1];
-        if (!grouped[level]) {
-          grouped[level] = [];
+        const message = line.replace(/^\[.*?\]\s*\.\w+:\s*/, ''); // Entfernt den Zeitstempel und den Punkt
+        if (this.isValidLogLevel(level)) {
+          if (!grouped[level]) {
+            grouped[level] = [];
+          }
+          grouped[level].push({ line: message, lineNumber: index });
         }
-        grouped[level].push({ line, lineNumber: index });
       }
     });
 
     const summary = Object.keys(grouped).map(level => {
       const count = grouped[level].length;
       const label = `${level} (${count})`;
-      const logFile = new LogFile(label, vscode.TreeItemCollapsibleState.Collapsed, undefined, grouped[level].map(entry => new LogFile(`Line ${entry.lineNumber + 1}: ${entry.line}`, vscode.TreeItemCollapsibleState.None, {
-        command: 'magento-log-viewer.openFileAtLine',
-        title: 'Open Log File at Line',
-        arguments: [filePath, entry.lineNumber]
-      })));
+      const logFile = new LogFile(label, vscode.TreeItemCollapsibleState.Collapsed, undefined, grouped[level].map(entry => {
+        const lineNumber = (entry.lineNumber + 1).toString().padStart(2, '0'); // Zeilennummer mit führenden Nullen
+        return new LogFile(`Line ${lineNumber}:  ${entry.line}`, vscode.TreeItemCollapsibleState.None, { // Fügen Sie hier den Abstand hinzu
+          command: 'magento-log-viewer.openFileAtLine',
+          title: 'Open Log File at Line',
+          arguments: [filePath, entry.lineNumber]
+        });
+      }));
       switch (level.toLowerCase()) {
         case 'error':
           logFile.iconPath = new vscode.ThemeIcon('error');
@@ -118,6 +124,11 @@ export class LogViewerProvider implements vscode.TreeDataProvider<LogFile>, vsco
     return summary;
   }
 
+  private isValidLogLevel(level: string): boolean {
+    const validLevels = ['error', 'warn', 'debug', 'info'];
+    return validLevels.includes(level.toLowerCase());
+  }
+
   getLogFilesWithoutUpdatingBadge(dir: string): LogFile[] {
     if (this.pathExists(dir)) {
       const files = fs.readdirSync(dir);