refactor: corrected the way filepaths are geting extracted from diff

Author: Psingle20

src/proxy/processors/push-action/checkSensitiveData.js

@@ -108,20 +108,39 @@ const parseFile = async (filePath) => {
     }
 };
 // Async exec function to handle actions
+// Function to parse file paths from git diff content
+const extractFilePathsFromDiff = (diffContent) => {
+    const filePaths = [];
+    const lines = diffContent.split('\n');
+    
+    lines.forEach(line => {
+        const match = line.match(/^diff --git a\/(.+?) b\/(.+?)$/);
+        if (match) {
+            filePaths.push(match[1]); // Extract the file path from "a/" in the diff line
+        }
+    });
+    
+    return filePaths;
+};
+
 const exec = async (req, action) => {
-    // getDiffExec(req, action); // Call to getDiffExec if necessary
     const diffStep = action.steps.find((s) => s.stepName === 'diff');
+
     if (diffStep && diffStep.content) {
         console.log('Diff content:', diffStep.content);
-        const filePaths = diffStep.content.filePaths || [];
+
+        // Use the parsing function to get file paths
+        const filePaths = extractFilePathsFromDiff(diffStep.content);
+
         if (filePaths.length > 0) {
             // Check for sensitive data in all files
             const sensitiveDataFound = await Promise.all(filePaths.map(parseFile));
-            const anySensitiveDataDetected = sensitiveDataFound.some(found => found); // Check if any file reported sensitive data
+            const anySensitiveDataDetected = sensitiveDataFound.some(found => found);
+
             if (anySensitiveDataDetected) {
-                action.pushBlocked = true; // Block the push
-                action.error = true; // Set error flag
-                action.errorMessage = 'Your push has been blocked due to sensitive data detection.'; // Set error message
+                action.pushBlocked = true;
+                action.error = true;
+                action.errorMessage = 'Your push has been blocked due to sensitive data detection.';
                 console.log(action.errorMessage);
             }
         } else {
@@ -130,7 +149,11 @@ const exec = async (req, action) => {
     } else {
         console.log('No diff content available.');
     }
+    
     return action; // Returning action for testing purposes
 };
+
+
+
 exec.displayName = 'logFileChanges.exec';
 exports.exec = exec;

test/CheckSensitive.test.js

@@ -1,4 +1,4 @@
-const path = require('path');
+// const path = require('path');
 const { exec } = require('../src/proxy/processors/push-action/checkSensitiveData.js'); // Adjust path as necessary
 const sinon = require('sinon');
 
@@ -13,13 +13,16 @@ describe('Sensitive Data Detection', () => {
         logStub.restore(); // Restore console.log after each test
     });
 
+    const createDiffContent = (filePaths) => {
+        // Format file paths in diff format
+        return filePaths.map(filePath => `diff --git a/${filePath} b/${filePath}`).join('\n');
+    };
+
     it('should detect sensitive data in CSV file and block execution', async () => {
         const action = {
             steps: [{
                 stepName: 'diff',
-                content: {
-                    filePaths: [path.join(__dirname, 'test_data/sensitive_data.csv')] // Ensure this path is correct
-                }
+                content: createDiffContent(['test/test_data/sensitive_data.csv']) // Ensure this path is correct
             }]
         };
         await exec(null, action);
@@ -30,9 +33,7 @@ describe('Sensitive Data Detection', () => {
         const action = {
             steps: [{
                 stepName: 'diff',
-                content: {
-                    filePaths: [path.join(__dirname, 'test_data/sensitive_data2.xlsx')] // Ensure this path is correct
-                }
+                content: createDiffContent(['test/test_data/sensitive_data2.xlsx']) // Ensure this path is correct
             }]
         };
         await exec(null, action);
@@ -43,9 +44,7 @@ describe('Sensitive Data Detection', () => {
         const action = {
             steps: [{
                 stepName: 'diff',
-                content: {
-                    filePaths: [path.join(__dirname, 'test_data/sensitive_data3.log')] // Ensure this path is correct
-                }
+                content: createDiffContent(['test/test_data/sensitive_data3.log']) // Ensure this path is correct
             }]
         };
         await exec(null, action);
@@ -56,9 +55,7 @@ describe('Sensitive Data Detection', () => {
         const action = {
             steps: [{
                 stepName: 'diff',
-                content: {
-                    filePaths: [path.join(__dirname, 'test_data/sensitive_data4.json')] // Ensure this path is correct
-                }
+                content: createDiffContent(['test/test_data/sensitive_data4.json']) // Ensure this path is correct
             }]
         };
         await exec(null, action);
@@ -69,9 +66,7 @@ describe('Sensitive Data Detection', () => {
         const action = {
             steps: [{
                 stepName: 'diff',
-                content: {
-                    filePaths: [path.join(__dirname, 'test_data/no_sensitive_data.txt')] // Ensure this path is correct
-                }
+                content: createDiffContent(['test_data/no_sensitive_data.txt']) // Ensure this path is correct
             }]
         };
         await exec(null, action);
@@ -82,9 +77,7 @@ describe('Sensitive Data Detection', () => {
         const action = {
             steps: [{
                 stepName: 'diff',
-                content: {
-                    filePaths: [path.join(__dirname, 'test_data/empty_file.txt')] // Ensure this path is correct
-                }
+                content: createDiffContent(['test_data/empty_file.txt']) // Ensure this path is correct
             }]
         };
         await exec(null, action);
@@ -95,9 +88,7 @@ describe('Sensitive Data Detection', () => {
         const action = {
             steps: [{
                 stepName: 'diff',
-                content: {
-                    filePaths: [path.join(__dirname, 'test_data/non_existent_file.txt')] // Ensure this path is correct
-                }
+                content: createDiffContent(['test_data/non_existent_file.txt']) // Ensure this path is correct
             }]
         };
         try {