fix: checkAuthorEmails validation errors and failing tests

Author: jescalada

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

@@ -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;
   }

test/processors/checkAuthorEmails.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/testPush.test.js

@@ -93,6 +93,8 @@ describe('auth', async () => {
     // set up a repo, user and push to test against
     await db.deleteRepo(TEST_REPO);
     await db.deleteUser(TEST_USERNAME_1);
+    await db.deleteUser(TEST_USERNAME_2);
+
     await db.createRepo({
       project: TEST_ORG,
       name: TEST_REPO,