ctxman 3.0.0 → 3.1.1

package/lib/integrations/git/DiffAnalyzer.js

@@ -9,7 +9,7 @@
  * - Generate change summaries
  */
 
-import GitClient from './GitClient.js';
+import GitClient, { assertGitRef } from './GitClient.js';
 import { getLogger } from '../../utils/logger.js';
 
 const logger = getLogger('DiffAnalyzer');
@@ -28,16 +28,14 @@ export class DiffAnalyzer {
   analyzeChanges(since = null) {
     logger.info(`Analyzing changes since: ${since || 'uncommitted'}`);
 
-    const changedFiles = since
-      ? this.git.getChangedFiles(since)
-      : this.git.getAllModifiedFiles();
+    const changedFiles = since ? this.git.getChangedFiles(since) : this.git.getAllModifiedFiles();
 
     const analysis = {
       changedFiles: changedFiles,
       totalChangedFiles: changedFiles.length,
       since: since,
       relatedFiles: [],
-      impact: this.calculateImpact(changedFiles)
+      impact: this.calculateImpact(changedFiles),
     };
 
     return analysis;
@@ -49,15 +47,13 @@ export class DiffAnalyzer {
    * @returns {Array<FileChange>}
    */
   getDetailedChanges(since = null) {
-    const changedFiles = since
-      ? this.git.getChangedFiles(since)
-      : this.git.getAllModifiedFiles();
+    const changedFiles = since ? this.git.getChangedFiles(since) : this.git.getAllModifiedFiles();
 
-    return changedFiles.map(filePath => {
+    return changedFiles.map((filePath) => {
       const diff = this.getFileDiff(filePath, since);
       return {
         path: filePath,
-        ...diff
+        ...diff,
       };
     });
   }
@@ -70,18 +66,17 @@ export class DiffAnalyzer {
    */
   getFileDiff(filePath, since = null) {
     try {
-      const command = since
-        ? `diff ${since} -- "${filePath}"`
-        : `diff -- "${filePath}"`;
+      if (since) assertGitRef(since);
+      const args = since ? ['diff', since, '--', filePath] : ['diff', '--', filePath];
 
-      const diffOutput = this.git.exec(command);
+      const diffOutput = this.git.exec(args);
       const stats = this.parseDiffStats(diffOutput);
 
       return {
         added: stats.added,
         deleted: stats.deleted,
         modified: stats.added + stats.deleted,
-        diff: diffOutput
+        diff: diffOutput,
       };
     } catch (error) {
       logger.warn(`Failed to get diff for ${filePath}: ${error.message}`);
@@ -123,24 +118,33 @@ export class DiffAnalyzer {
         coreFiles: 0,
         configFiles: 0,
         testFiles: 0,
-        documentationFiles: 0
-      }
+        documentationFiles: 0,
+      },
     };
 
     for (const file of changedFiles) {
       const fileLower = file.toLowerCase();
 
       // Core files (high impact)
-      if (fileLower.includes('src/') || fileLower.includes('lib/') ||
-          fileLower.includes('index.') || fileLower.includes('main.') ||
-          fileLower.includes('app.') || fileLower.includes('server.')) {
+      if (
+        fileLower.includes('src/') ||
+        fileLower.includes('lib/') ||
+        fileLower.includes('index.') ||
+        fileLower.includes('main.') ||
+        fileLower.includes('app.') ||
+        fileLower.includes('server.')
+      ) {
         impact.details.coreFiles++;
         impact.score += 10;
       }
 
       // Config files (medium-high impact)
-      if (fileLower.endsWith('.json') || fileLower.endsWith('.yml') ||
-          fileLower.endsWith('.yaml') || fileLower.endsWith('.config.js')) {
+      if (
+        fileLower.endsWith('.json') ||
+        fileLower.endsWith('.yml') ||
+        fileLower.endsWith('.yaml') ||
+        fileLower.endsWith('.config.js')
+      ) {
         impact.details.configFiles++;
         impact.score += 7;
       }
@@ -177,7 +181,7 @@ export class DiffAnalyzer {
    * @param {Array<string>} changedFiles
    * @returns {Array<string>}
    */
-  findRelatedFiles(changedFiles) {
+  findRelatedFiles(_changedFiles) {
     // TODO: Implement import graph analysis
     // For now, return empty array
     logger.debug('Related files detection not yet implemented');
@@ -201,14 +205,15 @@ export class DiffAnalyzer {
    */
   compareBranches(base, compare) {
     try {
-      const command = `diff --name-status ${base}...${compare}`;
-      const output = this.git.exec(command);
+      assertGitRef(base);
+      assertGitRef(compare);
+      const output = this.git.exec(['diff', '--name-status', `${base}...${compare}`]);
 
       const changes = {
         added: [],
         modified: [],
         deleted: [],
-        renamed: []
+        renamed: [],
       };
 
       if (!output) return changes;
@@ -238,20 +243,22 @@ export class DiffAnalyzer {
    */
   getRangeStats(range) {
     try {
-      const command = `diff --shortstat ${range}`;
-      const output = this.git.exec(command);
+      assertGitRef(range);
+      const output = this.git.exec(['diff', '--shortstat', range]);
 
       // Parse: "3 files changed, 45 insertions(+), 12 deletions(-)"
-      const match = output.match(/(\d+) file[s]? changed(?:, (\d+) insertion[s]?\(\+\))?(?:, (\d+) deletion[s]?\(-\))?/);
+      const match = output.match(
+        /(\d+) file[s]? changed(?:, (\d+) insertion[s]?\(\+\))?(?:, (\d+) deletion[s]?\(-\))?/
+      );
 
       if (!match) return null;
 
       return {
         filesChanged: parseInt(match[1], 10),
         insertions: parseInt(match[2] || 0, 10),
-        deletions: parseInt(match[3] || 0, 10)
+        deletions: parseInt(match[3] || 0, 10),
       };
-    } catch (error) {
+    } catch (_error) {
       return null;
     }
   }

package/lib/integrations/git/GitClient.js

@@ -9,13 +9,34 @@
  * - Cache git metadata
  */
 
-import { execSync } from 'child_process';
+import { execFileSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 import { getLogger } from '../../utils/logger.js';
 
 const logger = getLogger('GitClient');
 
+/**
+ * Check that a user-supplied revision (branch, tag, commit, HEAD~2, a..b) is safe to
+ * hand to git: allowlisted characters only, and no leading '-' that git would parse
+ * as an option (e.g. --output=<file>)
+ * @param {string} ref
+ * @returns {boolean}
+ */
+export function isValidGitRef(ref) {
+  return typeof ref === 'string' && !ref.startsWith('-') && /^[a-zA-Z0-9/\-_.@^~]+$/.test(ref);
+}
+
+/**
+ * Throw unless isValidGitRef(ref)
+ * @param {string} ref
+ */
+export function assertGitRef(ref) {
+  if (!isValidGitRef(ref)) {
+    throw new Error(`Invalid git reference: ${JSON.stringify(ref)}`);
+  }
+}
+
 export class GitClient {
   constructor(repositoryPath) {
     this.repoPath = repositoryPath;
@@ -30,51 +51,45 @@ export class GitClient {
     try {
       const gitDir = path.join(this.repoPath, '.git');
       return fs.existsSync(gitDir);
-    } catch (error) {
+    } catch (_error) {
       return false;
     }
   }
 
   /**
    * Validate git reference to prevent command injection
-   * @param {string} ref 
+   * @param {string} ref
    * @returns {boolean}
    */
   validateGitRef(ref) {
     if (!ref) return true; // null/undefined is safe (handled logic elsewhere)
-    // Allow alphanumeric, /, -, _, ., @, ^, ~
-    // Disallow ; | & $ > < ` \ !
-    return /^[a-zA-Z0-9/\-_.\@\^\~]+$/.test(ref);
+    return isValidGitRef(ref);
   }
 
   /**
-   * Execute git command
-   * @param {string} command - Git command (without 'git' prefix)
+   * Execute git with an argument list. No shell is involved, so arguments reach git
+   * verbatim; refs from users must still go through isValidGitRef()
+   * @param {string[]} args - Arguments after `git`
    * @returns {string} Command output
    */
-  exec(command) {
+  exec(args) {
     if (!this.isGitRepo) {
       throw new Error('Not a git repository');
     }
-
-    // Basic sanity check against shell injection if the command string was constructed with user input
-    // This is a last line of defense; specific methods should validate their inputs.
-    if (command.includes(';') || command.includes('&')) {
-       logger.warn(`Potential injection detected in command: ${command}`);
-       throw new Error('Invalid characters in git command');
+    if (!Array.isArray(args)) {
+      throw new TypeError('GitClient.exec() expects an array of arguments');
     }
 
     try {
-      const fullCommand = `git ${command}`;
-      const output = execSync(fullCommand, {
+      const output = execFileSync('git', args, {
         cwd: this.repoPath,
         encoding: 'utf-8',
-        stdio: ['pipe', 'pipe', 'pipe']
+        stdio: ['pipe', 'pipe', 'pipe'],
       });
 
       return output.trim();
     } catch (error) {
-      logger.error(`Git command failed: ${command}`);
+      logger.error(`Git command failed: git ${args.join(' ')}`);
       throw new Error(`Git command failed: ${error.message}`);
     }
   }
@@ -84,7 +99,7 @@ export class GitClient {
    * @returns {string}
    */
   getCurrentBranch() {
-    return this.exec('rev-parse --abbrev-ref HEAD');
+    return this.exec(['rev-parse', '--abbrev-ref', 'HEAD']);
   }
 
   /**
@@ -93,8 +108,8 @@ export class GitClient {
    */
   getDefaultBranch() {
     try {
-      return this.exec('symbolic-ref refs/remotes/origin/HEAD --short').split('/').pop();
-    } catch (error) {
+      return this.exec(['symbolic-ref', 'refs/remotes/origin/HEAD', '--short']).split('/').pop();
+    } catch (_error) {
       return 'main'; // Fallback
     }
   }
@@ -105,17 +120,18 @@ export class GitClient {
    * @returns {Array<string>}
    */
   getChangedFiles(since = null) {
-    let command;
+    let args;
 
     if (since) {
       // Files changed between commits/branches
-      command = `diff --name-only ${since}`;
+      assertGitRef(since);
+      args = ['diff', '--name-only', since, '--'];
     } else {
       // Files with uncommitted changes
-      command = 'diff --name-only';
+      args = ['diff', '--name-only'];
     }
 
-    const output = this.exec(command);
+    const output = this.exec(args);
     return output ? output.split('\n').filter(Boolean) : [];
   }
 
@@ -124,7 +140,7 @@ export class GitClient {
    * @returns {Array<string>}
    */
   getStagedFiles() {
-    const output = this.exec('diff --cached --name-only');
+    const output = this.exec(['diff', '--cached', '--name-only']);
     return output ? output.split('\n').filter(Boolean) : [];
   }
 
@@ -133,7 +149,7 @@ export class GitClient {
    * @returns {Array<string>}
    */
   getUnstagedFiles() {
-    const output = this.exec('diff --name-only');
+    const output = this.exec(['diff', '--name-only']);
     return output ? output.split('\n').filter(Boolean) : [];
   }
 
@@ -142,7 +158,7 @@ export class GitClient {
    * @returns {Array<string>}
    */
   getUntrackedFiles() {
-    const output = this.exec('ls-files --others --exclude-standard');
+    const output = this.exec(['ls-files', '--others', '--exclude-standard']);
     return output ? output.split('\n').filter(Boolean) : [];
   }
 
@@ -166,12 +182,19 @@ export class GitClient {
    * @returns {Array<Commit>}
    */
   getFileHistory(filePath, limit = 10) {
-    const command = `log --follow --pretty=format:"%H|%an|%ae|%at|%s" -n ${limit} -- "${filePath}"`;
-    const output = this.exec(command);
+    const output = this.exec([
+      'log',
+      '--follow',
+      '--pretty=format:%H|%an|%ae|%at|%s',
+      '-n',
+      String(limit),
+      '--',
+      filePath,
+    ]);
 
     if (!output) return [];
 
-    return output.split('\n').map(line => {
+    return output.split('\n').map((line) => {
       const [hash, author, email, timestamp, subject] = line.split('|');
       return {
         hash,
@@ -179,7 +202,7 @@ export class GitClient {
         email,
         timestamp: parseInt(timestamp, 10),
         date: new Date(parseInt(timestamp, 10) * 1000),
-        subject
+        subject,
       };
     });
   }
@@ -191,8 +214,7 @@ export class GitClient {
    */
   getBlame(filePath) {
     try {
-      const command = `blame --line-porcelain "${filePath}"`;
-      const output = this.exec(command);
+      const output = this.exec(['blame', '--line-porcelain', '--', filePath]);
 
       return this.parseBlameOutput(output);
     } catch (error) {
@@ -228,7 +250,7 @@ export class GitClient {
           author: currentAuthor,
           timestamp: currentTimestamp,
           date: new Date(currentTimestamp * 1000),
-          code: line.substring(1)
+          code: line.substring(1),
         });
       }
     }
@@ -243,9 +265,9 @@ export class GitClient {
    */
   getCommitCount(filePath) {
     try {
-      const output = this.exec(`log --follow --oneline "${filePath}"`);
+      const output = this.exec(['log', '--follow', '--oneline', '--', filePath]);
       return output ? output.split('\n').length : 0;
-    } catch (error) {
+    } catch (_error) {
       return 0;
     }
   }
@@ -257,14 +279,13 @@ export class GitClient {
    */
   getFileAuthors(filePath) {
     try {
-      const command = `log --follow --pretty=format:"%an|%ae" -- "${filePath}"`;
-      const output = this.exec(command);
+      const output = this.exec(['log', '--follow', '--pretty=format:%an|%ae', '--', filePath]);
 
       if (!output) return [];
 
       const authorsMap = new Map();
 
-      output.split('\n').forEach(line => {
+      output.split('\n').forEach((line) => {
         const [name, email] = line.split('|');
         if (!authorsMap.has(email)) {
           authorsMap.set(email, { name, email, commits: 0 });
@@ -272,10 +293,8 @@ export class GitClient {
         authorsMap.get(email).commits++;
       });
 
-      return Array.from(authorsMap.values())
-        .sort((a, b) => b.commits - a.commits);
-
-    } catch (error) {
+      return Array.from(authorsMap.values()).sort((a, b) => b.commits - a.commits);
+    } catch (_error) {
       return [];
     }
   }
@@ -290,15 +309,15 @@ export class GitClient {
     }
 
     try {
-      const totalCommits = this.exec('rev-list --count HEAD');
-      const totalFiles = this.exec('ls-files').split('\n').length;
-      const contributors = this.exec('shortlog -sn --all').split('\n').length;
+      const totalCommits = this.exec(['rev-list', '--count', 'HEAD']);
+      const totalFiles = this.exec(['ls-files']).split('\n').length;
+      const contributors = this.exec(['shortlog', '-sn', '--all']).split('\n').length;
 
       return {
         totalCommits: parseInt(totalCommits, 10),
         totalFiles,
         contributors,
-        currentBranch: this.getCurrentBranch()
+        currentBranch: this.getCurrentBranch(),
       };
     } catch (error) {
       logger.warn(`Failed to get repo stats: ${error.message}`);
@@ -313,8 +332,7 @@ export class GitClient {
    */
   getLastCommit(filePath) {
     try {
-      const command = `log -1 --pretty=format:"%H|%an|%ae|%at|%s" -- "${filePath}"`;
-      const output = this.exec(command);
+      const output = this.exec(['log', '-1', '--pretty=format:%H|%an|%ae|%at|%s', '--', filePath]);
 
       if (!output) return null;
 
@@ -325,9 +343,9 @@ export class GitClient {
         email,
         timestamp: parseInt(timestamp, 10),
         date: new Date(parseInt(timestamp, 10) * 1000),
-        subject
+        subject,
       };
-    } catch (error) {
+    } catch (_error) {
       return null;
     }
   }