Merge branch 'main' into 909-ldap-user-group-confirmation

Author: JamieSlome

package.json

@@ -13,7 +13,7 @@
     "build-lib": "./scripts/build-for-publish.sh",
     "restore-lib": "./scripts/undo-build.sh",
     "check-types": "tsc",
-    "test": "NODE_ENV=test ts-mocha './test/*.js' --exit",
+    "test": "NODE_ENV=test ts-mocha './test/**/*.test.js' --exit",
     "test-coverage": "nyc npm run test",
     "test-coverage-ci": "nyc --reporter=lcovonly --reporter=text npm run test",
     "prepare": "node ./scripts/prepare.js",

src/config/ConfigLoader.ts

@@ -196,10 +196,8 @@ export class ConfigLoader extends EventEmitter {
           try {
             console.log(`Loading configuration from ${source.type} source`);
             return await this.loadFromSource(source);
-          } catch (error: unknown) {
-            if (error instanceof Error) {
-              console.error(`Error loading from ${source.type} source:`, error.message);
-            }
+          } catch (error: any) {
+            console.error(`Error loading from ${source.type} source:`, error.message);
             return null;
           }
         }),
@@ -234,7 +232,7 @@ export class ConfigLoader extends EventEmitter {
       } else {
         console.log('Configuration has not changed, no update needed');
       }
-    } catch (error: unknown) {
+    } catch (error: any) {
       console.error('Error reloading configuration:', error);
       this.emit('configurationError', error);
     } finally {
@@ -330,24 +328,18 @@ export class ConfigLoader extends EventEmitter {
       try {
         await execFileAsync('git', ['clone', source.repository, repoDir], execOptions);
         console.log('Repository cloned successfully');
-      } catch (error: unknown) {
-        if (error instanceof Error) {
-          console.error('Failed to clone repository:', error.message);
-          throw new Error(`Failed to clone repository: ${error.message}`);
-        }
-        throw error;
+      } catch (error: any) {
+        console.error('Failed to clone repository:', error.message);
+        throw new Error(`Failed to clone repository: ${error.message}`);
       }
     } else {
       console.log(`Pulling latest changes from ${source.repository}`);
       try {
         await execFileAsync('git', ['pull'], { cwd: repoDir });
         console.log('Repository pulled successfully');
-      } catch (error: unknown) {
-        if (error instanceof Error) {
-          console.error('Failed to pull repository:', error.message);
-          throw new Error(`Failed to pull repository: ${error.message}`);
-        }
-        throw error;
+      } catch (error: any) {
+        console.error('Failed to pull repository:', error.message);
+        throw new Error(`Failed to pull repository: ${error.message}`);
       }
     }
 
@@ -357,12 +349,9 @@ export class ConfigLoader extends EventEmitter {
       try {
         await execFileAsync('git', ['checkout', source.branch], { cwd: repoDir });
         console.log(`Branch ${source.branch} checked out successfully`);
-      } catch (error: unknown) {
-        if (error instanceof Error) {
-          console.error(`Failed to checkout branch ${source.branch}:`, error.message);
-          throw new Error(`Failed to checkout branch ${source.branch}: ${error.message}`);
-        }
-        throw error;
+      } catch (error: any) {
+        console.error(`Failed to checkout branch ${source.branch}:`, error.message);
+        throw new Error(`Failed to checkout branch ${source.branch}: ${error.message}`);
       }
     }
 
@@ -382,12 +371,9 @@ export class ConfigLoader extends EventEmitter {
       const config = JSON.parse(content);
       console.log('Configuration loaded successfully from Git');
       return config;
-    } catch (error: unknown) {
-      if (error instanceof Error) {
-        console.error('Failed to read or parse configuration file:', error.message);
-        throw new Error(`Failed to read or parse configuration file: ${error.message}`);
-      }
-      throw error;
+    } catch (error: any) {
+      console.error('Failed to read or parse configuration file:', error.message);
+      throw new Error(`Failed to read or parse configuration file: ${error.message}`);
     }
   }
 

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

@@ -5,24 +5,27 @@ import { Commit } from '../../actions/Action';
 const commitConfig = getCommitConfig();
 
 const isEmailAllowed = (email: string): boolean => {
+  if (!email) {
+    return false;
+  }
+
   const [emailLocal, emailDomain] = email.split('@');
-  console.log({ emailLocal, emailDomain });
 
-  // E-mail address is not a permissible domain name
+  if (!emailLocal || !emailDomain) {
+    return false;
+  }
+
   if (
     commitConfig.author.email.domain.allow &&
     !emailDomain.match(new RegExp(commitConfig.author.email.domain.allow, 'g'))
   ) {
-    console.log('Bad e-mail address domain...');
     return false;
   }
 
-  // E-mail username is not a permissible form
   if (
     commitConfig.author.email.local.block &&
     emailLocal.match(new RegExp(commitConfig.author.email.local.block, 'g'))
   ) {
-    console.log('Bad e-mail address username...');
     return false;
   }
 

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

@@ -10,7 +10,7 @@ const exec = async (req: any, action: Action): Promise<Action> => {
     // https://stackoverflow.com/questions/40883798/how-to-get-git-diff-of-the-first-commit
     let commitFrom = `4b825dc642cb6eb9a060e54bf8d69288fbee4904`;
 
-    if (!action.commitData) {
+    if (!action.commitData || action.commitData.length === 0) {
       throw new Error('No commit data found');
     }
 

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

@@ -123,6 +123,12 @@ const exec = async (req: any, action: Action): Promise<Action> => {
     return action;
   }
 
+  if (!config.enabled) {
+    console.log('gitleaks is disabled, skipping');
+    action.addStep(step);
+    return action;
+  }
+
   const { commitFrom, commitTo } = action;
   const workingDir = `${action.proxyGitPath}/${action.repoName}`;
   console.log(`Scanning range with gitleaks: ${commitFrom}:${commitTo}`, workingDir);