feat: integrate checkEXIFJpeg validation in push action chain

Author: Psingle20

src/proxy/chain.js

@@ -10,7 +10,7 @@ const pushActionChain = [
   proc.push.pullRemote,
   proc.push.writePack,
   proc.push.getDiff,
-  proc.push.checkEXIFJpeg,
+  proc.push.checkExifJpeg,
   proc.push.clearBareClone,
   proc.push.scanDiff,
   proc.push.blockForAuth,

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

@@ -4,7 +4,7 @@ const config = require('../../../config');
 
 const commitConfig = config.getCommitConfig();
 const validExtensions = ['.jpeg', '.png', '.jpg', '.tiff'];
-//Make sure you have modified the proxy.config.json;
+// Make sure you have modified the proxy.config.json;
 // Function to check sensitive EXIF data
 const checkSensitiveExifData = (metadata) => {
     let allSafe = true;
@@ -33,7 +33,7 @@ const getExifData = async (filePath) => {
         const metadata = await exifTool.read(filePath);
         return metadata ? checkSensitiveExifData(metadata) : true;
     } catch (error) {
-        log(`Error reading EXIF data from ${filePath}: ${error.message}`);
+        console.log(`Error reading EXIF data from ${filePath}: ${error.message}`);
         return false;
     } finally {
         await exifTool.end();
@@ -59,12 +59,12 @@ const extractFilePathsFromDiff = (diffContent) => {
 const exec = async (req, action, log = console.log) => {
 
     const diffStep = action.steps.find((s) => s.stepName === 'diff');
-    const step = new Step('checkExifDataFromImage');
-    const allowed_file_type = commitConfig.diff.block.ProxyFileTypes;
+    const step = new Step('checkExifJpeg');
+    const allowedFileType = commitConfig.diff.block.ProxyFileTypes;
 
     if (diffStep && diffStep.content) {
         const filePaths = extractFilePathsFromDiff(diffStep.content);
-        const filteredPaths = filePaths.filter(path => validExtensions.some(ext => path.endsWith(ext) && allowed_file_type.includes(ext)));
+        const filteredPaths = filePaths.filter(path => validExtensions.some(ext => path.endsWith(ext) && allowedFileType.includes(ext)));
 
         if (filteredPaths.length > 0) {
             const exifResults = await Promise.all(filteredPaths.map(filePath => getExifData(filePath)));
@@ -87,5 +87,5 @@ const exec = async (req, action, log = console.log) => {
     return action;
 };
 
-exec.displayName = 'logFileChanges.exec';
+exec.displayName = 'CheckExif.exec';
 module.exports = { exec };

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

@@ -11,4 +11,4 @@ exports.checkCommitMessages = require('./checkCommitMessages').exec;
 exports.checkAuthorEmails = require('./checkAuthorEmails').exec;
 exports.checkUserPushPermission = require('./checkUserPushPermission').exec;
 exports.clearBareClone = require('./clearBareClone').exec;
-exports.checkEXIFJpeg = require('./checkExifJpeg').exec;
+exports.checkExifJpeg = require('./checkExifJpeg').exec;

test/chain.test.js

@@ -2,6 +2,7 @@ const chai = require('chai');
 const sinon = require('sinon');
 const { PluginLoader } = require('../src/plugin');
 
+
 chai.should();
 const expect = chai.expect;
 
@@ -26,6 +27,7 @@ const mockPushProcessors = {
   writePack: sinon.stub(),
   getDiff: sinon.stub(),
   clearBareClone: sinon.stub(),
+  checkExifJpeg : sinon.stub(),
   scanDiff: sinon.stub(),
   blockForAuth: sinon.stub(),
 };
@@ -39,6 +41,7 @@ mockPushProcessors.checkIfWaitingAuth.displayName = 'checkIfWaitingAuth';
 mockPushProcessors.pullRemote.displayName = 'pullRemote';
 mockPushProcessors.writePack.displayName = 'writePack';
 mockPushProcessors.getDiff.displayName = 'getDiff';
+mockPushProcessors.checkEXIFJpeg.displayName = 'checkEXIFJpeg';
 mockPushProcessors.clearBareClone.displayName = 'clearBareClone';
 mockPushProcessors.scanDiff.displayName = 'scanDiff';
 mockPushProcessors.blockForAuth.displayName = 'blockForAuth';
@@ -104,6 +107,7 @@ describe('proxy chain', function () {
     mockPushProcessors.parsePush.resolves(continuingAction);
     mockPushProcessors.checkRepoInAuthorisedList.resolves(continuingAction);
     mockPushProcessors.checkCommitMessages.resolves(continuingAction);
+    mockPushProcessors.checkEXIFJpeg.resolves(continuingAction);
     mockPushProcessors.checkAuthorEmails.resolves(continuingAction);
     mockPushProcessors.checkUserPushPermission.resolves(continuingAction);
 
@@ -120,6 +124,7 @@ describe('proxy chain', function () {
     expect(mockPushProcessors.checkIfWaitingAuth.called).to.be.true;
     expect(mockPushProcessors.pullRemote.called).to.be.false;
     expect(mockPushProcessors.audit.called).to.be.true;
+    expect(mockPushProcessors.checkEXIFJpeg.called).to.be.false;
 
     expect(result.type).to.equal('push');
     expect(result.allowPush).to.be.false;
@@ -135,7 +140,9 @@ describe('proxy chain', function () {
     mockPushProcessors.checkCommitMessages.resolves(continuingAction);
     mockPushProcessors.checkAuthorEmails.resolves(continuingAction);
     mockPushProcessors.checkUserPushPermission.resolves(continuingAction);
+    mockPushProcessors.checkEXIFJpeg.resolves(continuingAction);
     // this stops the chain from further execution
+
     mockPushProcessors.checkIfWaitingAuth.resolves({ type: 'push', continue: () => true, allowPush: true });
     const result = await chain.executeChain(req);
 
@@ -148,6 +155,7 @@ describe('proxy chain', function () {
     expect(mockPushProcessors.checkIfWaitingAuth.called).to.be.true;
     expect(mockPushProcessors.pullRemote.called).to.be.false;
     expect(mockPushProcessors.audit.called).to.be.true;
+    expect(mockPushProcessors.checkEXIFJpeg.called).to.be.false;
 
     expect(result.type).to.equal('push');
     expect(result.allowPush).to.be.true;
@@ -167,9 +175,11 @@ describe('proxy chain', function () {
     mockPushProcessors.pullRemote.resolves(continuingAction);
     mockPushProcessors.writePack.resolves(continuingAction);
     mockPushProcessors.getDiff.resolves(continuingAction);
+    mockPushProcessors.checkEXIFJpeg.resolves(continuingAction);
     mockPushProcessors.clearBareClone.resolves(continuingAction);
     mockPushProcessors.scanDiff.resolves(continuingAction);
     mockPushProcessors.blockForAuth.resolves(continuingAction);
+    
 
     const result = await chain.executeChain(req);
 
@@ -183,6 +193,7 @@ describe('proxy chain', function () {
     expect(mockPushProcessors.pullRemote.called).to.be.true;
     expect(mockPushProcessors.writePack.called).to.be.true;
     expect(mockPushProcessors.getDiff.called).to.be.true;
+    expect(mockPushProcessors.checkEXIFJpeg.called).to.be.true;
     expect(mockPushProcessors.clearBareClone.called).to.be.true;
     expect(mockPushProcessors.scanDiff.called).to.be.true;
     expect(mockPushProcessors.blockForAuth.called).to.be.true;