Merge branch 'main' into JWT-UI-integration

Author: jescalada

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/git-proxy",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc.2",
   "description": "Deploy custom push protections and policies on top of Git.",
   "scripts": {
     "cli": "node ./packages/git-proxy-cli/index.js",
@@ -80,6 +80,7 @@
     "react-router-dom": "6.30.1",
     "simple-git": "^3.28.0",
     "uuid": "^11.1.0",
+    "validator": "^13.15.15",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
@@ -96,6 +97,7 @@
     "@types/node": "^22.17.0",
     "@types/react-dom": "^17.0.26",
     "@types/react-html-parser": "^2.0.7",
+    "@types/validator": "^13.15.2",
     "@types/yargs": "^17.0.33",
     "@typescript-eslint/eslint-plugin": "^8.38.0",
     "@typescript-eslint/parser": "^8.38.0",

package.json

@@ -1,30 +1,27 @@
 import { Action, Step } from '../../actions';
 import { getCommitConfig } from '../../../config';
 import { Commit } from '../../actions/Action';
+import { isEmail } from 'validator';
 
 const commitConfig = getCommitConfig();
 
 const isEmailAllowed = (email: string): boolean => {
-  if (!email) {
+  if (!email || !isEmail(email)) {
     return false;
   }
 
   const [emailLocal, emailDomain] = email.split('@');
 
-  if (!emailLocal || !emailDomain) {
-    return false;
-  }
-
   if (
     commitConfig.author.email.domain.allow &&
-    !emailDomain.match(new RegExp(commitConfig.author.email.domain.allow, 'g'))
+    !new RegExp(commitConfig.author.email.domain.allow, 'g').test(emailDomain)
   ) {
     return false;
   }
 
   if (
     commitConfig.author.email.local.block &&
-    emailLocal.match(new RegExp(commitConfig.author.email.local.block, 'g'))
+    new RegExp(commitConfig.author.email.local.block, 'g').test(emailLocal)
   ) {
     return false;
   }

src/proxy/processors/push-action/checkAuthorEmails.ts

@@ -331,7 +331,6 @@ describe('ConfigLoader', () => {
 
       // Verify the loaded config has expected structure
       expect(config).to.be.an('object');
-      expect(config).to.have.property('proxyUrl');
       expect(config).to.have.property('cookieSecret');
     });
 
@@ -381,7 +380,6 @@ describe('ConfigLoader', () => {
 
       // Verify the loaded config has expected structure
       expect(config).to.be.an('object');
-      expect(config).to.have.property('proxyUrl');
       expect(config).to.have.property('cookieSecret');
     });
 

test/ConfigLoader.test.js

@@ -181,7 +181,7 @@ describe('checkAuthorEmails', () => {
           exec({}, action);
         }),
         {
-          numRuns: 100
+          numRuns: 1000
         }
       );
 
@@ -200,7 +200,7 @@ describe('checkAuthorEmails', () => {
           exec({}, action);
         }),
         {
-          numRuns: 100
+          numRuns: 1000
         }
       );
       expect(action.step.error).to.be.undefined;
@@ -215,7 +215,7 @@ describe('checkAuthorEmails', () => {
           exec({}, action);
         }),
         {
-          numRuns: 100
+          numRuns: 1000
         }
       );
 
@@ -232,7 +232,7 @@ describe('checkAuthorEmails', () => {
           exec({}, action);
         }),
         {
-          numRuns: 100
+          numRuns: 1000
         }
       );
       expect(action.step.error).to.be.undefined;

test/processors/checkAuthorEmails.test.js

@@ -164,7 +164,6 @@ describe('checkCommitMessages', () => {
                   fc.integer(),
                   fc.double(),
                   fc.boolean(),
-                  fc.object(),
                 ),
                 author: fc.string()
               }),
@@ -193,7 +192,8 @@ describe('checkCommitMessages', () => {
               [{ message: null, author: 'me' }],
               [{ message: {}, author: 'me' }],
               [{ message: 'SeCrEt', author: 'me' }]
-            ]
+            ],
+            numRuns: 1000
           }
         );
       });