Show diff and ask for confirmation after editing

bin/build

@@ -42,6 +42,7 @@ $p->startBuffering();
 
 // creating our library using whole directory
 $p->buildFromDirectory($input);
+$p->buildFromDirectory($root . '/vendor');
 
 // Create a custom CLI-only stub without webPhar()
 // This avoids signature verification issues when the phar is downloaded/transferred
@@ -51,6 +52,7 @@ $stub = <<<'STUB'
 #!/usr/bin/env php
 <?php
 Phar::mapPhar();
+require 'phar://' . __FILE__ . '/autoload.php';
 require 'phar://' . __FILE__ . '/index.php';
 __HALT_COMPILER();
 STUB;

composer.json

@@ -60,10 +60,11 @@
     },
     "require": {
         "php": ">=7.4",
-        "ext-json": "*",
         "ext-fileinfo": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*",
         "ext-zlib": "*",
-        "ext-mbstring": "*"
+        "sebastian/diff": "^4.0"
     },
     "require-dev": {
         "brainmaestro/composer-git-hooks": "^2.8",

src/Actions.php

@@ -11,6 +11,9 @@
 
 namespace AMWScan;
 
+use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
+
 class Actions
 {
     /**
@@ -161,6 +164,9 @@ public static function openWithVim($file, $lineNumber = null)
             self::makeBackup($file);
         }
 
+        // Store original content for diff
+        $originalContent = file_get_contents($file);
+
         $descriptors = [
             ['file', '/dev/tty', 'r'],
             ['file', '/dev/tty', 'w'],
@@ -178,6 +184,38 @@ public static function openWithVim($file, $lineNumber = null)
                 break;
             }
         }
+
+        // Show diff if file was modified
+        $newContent = file_get_contents($file);
+        if ($newContent !== $originalContent) {
+            self::showDiff($file, $originalContent, $newContent);
+        }
+    }
+
+    /**
+     * Show diff of changes made to a file.
+     */
+    public static function showDiff($file, $originalContent, $newContent)
+    {
+        if ($originalContent === $newContent) {
+            return;
+        }
+
+        $builder = new UnifiedDiffOutputBuilder(
+            "--- Original\n+++ New\n", // header
+            true // show line numbers
+        );
+
+        $differ = new Differ($builder);
+        $diff = $differ->diff($originalContent, $newContent);
+
+        if (!empty($diff)) {
+            echo "\n" . str_repeat('=', 50) . "\n";
+            echo "Changes made to: $file\n";
+            echo str_repeat('=', 50) . "\n";
+            echo $diff;
+            echo "\n" . str_repeat('=', 50) . "\n\n";
+        }
     }
 
     /**
@@ -189,6 +227,9 @@ public static function openWithNano($file, $lineNumber = null)
             self::makeBackup($file);
         }
 
+        // Store original content for diff
+        $originalContent = file_get_contents($file);
+
         $descriptors = [
             ['file', '/dev/tty', 'r'],
             ['file', '/dev/tty', 'w'],
@@ -206,6 +247,12 @@ public static function openWithNano($file, $lineNumber = null)
                 break;
             }
         }
+
+        // Show diff if file was modified
+        $newContent = file_get_contents($file);
+        if ($newContent !== $originalContent) {
+            self::showDiff($file, $originalContent, $newContent);
+        }
     }
 
     /**

src/Scanner.php

@@ -1421,7 +1421,15 @@ private function scan($iterator)
                                 Actions::openWithVim($filePath, $firstLineNumber);
                                 self::$report['edited'][] = $filePath;
                                 CLI::writeLine("File '$filePath' edited with vim!", 2, 'green');
-                                self::$report['removed'][] = $filePath;
+
+                                $markCleaned = 'n';
+                                if (self::$prompt === null) {
+                                    $markCleaned = CLI::read('Mark file as cleaned [y|N]? ', 'purple');
+                                }
+                                if ($markCleaned === 'y') {
+                                    self::$report['removed'][] = $filePath;
+                                    $inLoop = false;
+                                }
                                 break;
                                 // Open with nano
                             case in_array($confirmation, ['6', 'nano']):
@@ -1435,8 +1443,17 @@ private function scan($iterator)
                                 Actions::openWithNano($filePath, $firstLineNumber);
                                 self::$report['edited'][] = $filePath;
                                 CLI::writeLine("File '$filePath' edited with nano!", 2, 'green');
-                                self::$report['removed'][] = $filePath;
+
+                                $markCleaned = 'n';
+                                if (self::$prompt === null) {
+                                    $markCleaned = CLI::read('Mark file as cleaned [y|N]? ', 'purple');
+                                }
+                                if ($markCleaned === 'y') {
+                                    self::$report['removed'][] = $filePath;
+                                    $inLoop = false;
+                                }
                                 break;
+
                                 // Add to whitelist
                             case in_array($confirmation, ['7', 'whitelist']):
                                 if (Actions::addToWhitelist($filePath, $patternFound)) {

src/index.php

@@ -11,6 +11,11 @@
 
 namespace AMWScan;
 
+// Composer autoload
+if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
+    require_once __DIR__ . '/../vendor/autoload.php';
+}
+
 // Autoload
 spl_autoload_register(function ($name) {
     $namespace = __NAMESPACE__ . '\\';