mobbdev 0.0.28 → 0.0.29

package/index.mjs

@@ -1,4 +1,5 @@
-import { analyze, scan, CliError } from './src/commands/index.mjs';
+import { analyze, scan } from './src/commands/index.mjs';
+import { CliError } from './src/utils.mjs';
 import { parseArgs } from './src/yargs.mjs';
 import { hideBin } from 'yargs/helpers';
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mobbdev",
-    "version": "0.0.28",
+    "version": "0.0.29",
     "description": "Automated secure code remediation tool",
     "repository": "https://github.com/mobb-dev/bugsy",
     "main": "index.mjs",

package/src/commands/index.mjs

@@ -5,13 +5,11 @@ import chalkAnimation from 'chalk-animation';
 import { choseScanner } from '../features/analysis/prompts.mjs';
 import { SCANNERS, mobbAscii } from '../constants.mjs';
 import { runAnalysis } from '../features/analysis/index.mjs';
-import { sleep } from '../utils.mjs';
-import path from 'path';
+import { sleep, CliError } from '../utils.mjs';
 
 const GITHUB_REPO_URL_PATTERN = new RegExp(
     'https://github.com/[\\w-]+/[\\w-]+'
 );
-export class CliError extends Error {}
 
 const UrlZ = z
     .string({
@@ -50,10 +48,6 @@ export async function analyze(
         throw new CliError(`\nCan't access ${chalk.bold(scanFile)}`);
     }
 
-    if (path.extname(scanFile) !== '.json') {
-        throw new CliError(`\n${chalk.bold(scanFile)} is not a json file`);
-    }
-
     !ci && (await showWelcomeMessage(skipPrompts));
 
     await runAnalysis(

package/src/features/analysis/index.mjs

@@ -8,7 +8,6 @@ import open from 'open';
 import semver from 'semver';
 import { callbackServer } from './callback-server.mjs';
 import tmp from 'tmp';
-import { CliError } from '../../commands/index.mjs';
 
 import { WEB_APP_URL } from '../../constants.mjs';
 import { canReachRepo, downloadRepo, getDefaultBranch } from './github.mjs';
@@ -16,7 +15,7 @@ import { GQLClient } from './gql.mjs';
 import { githubIntegrationPrompt, mobbAnalysisPrompt } from './prompts.mjs';
 import { getSnykReport } from './snyk.mjs';
 import { uploadFile } from './upload-file.mjs';
-import { keypress, Spinner } from '../../utils.mjs';
+import { keypress, Spinner, CliError } from '../../utils.mjs';
 import { pack } from './pack.mjs';
 import { getGitInfo } from './git.mjs';
 
@@ -126,7 +125,6 @@ export async function _scan(
         reportPath = await getReportFromSnyk();
     }
 
-    const report = JSON.parse(fs.readFileSync(reportPath, 'utf8'));
     await uploadFile(
         reportPath,
         uploadData.url,
@@ -146,20 +144,11 @@ export async function _scan(
         throw e;
     }
 
-    debug('report %o', report);
-
-    const results = ((report.runs || [])[0] || {}).results || [];
-    if (results.length === 0 && !scanFile) {
-        mobbSpinner.success({
-            text: '🕵️‍♂️ Report did not detect any vulnerabilities — nothing to fix.',
-        });
-    } else {
-        mobbSpinner.success({
-            text: '🕵️‍♂️ Generating fixes...',
-        });
+    mobbSpinner.success({
+        text: '🕵️‍♂️ Generating fixes...',
+    });
 
-        await askToOpenAnalysis();
-    }
+    await askToOpenAnalysis();
     async function getReportFromSnyk() {
         const reportPath = path.join(dirname, 'report.json');
 

package/src/utils.mjs

@@ -28,3 +28,5 @@ export function Spinner({ ci = false } = {}) {
             }),
     };
 }
+
+export class CliError extends Error {}

package/src/yargs.mjs

@@ -1,7 +1,11 @@
 import yargs from 'yargs/yargs';
 import chalk from 'chalk';
+import path from 'path';
 
 import { SCANNERS } from './constants.mjs';
+import { CliError } from './utils.mjs';
+
+const supportExtensions = ['.json', '.xml', '.fpr', '.sarif'];
 
 const refOption = {
     describe: chalk.bold('reference of the repository (branch, tag, commit)'),
@@ -73,7 +77,9 @@ export const parseArgs = (args) => {
                     ref: refOption,
                     s: {
                         alias: 'scanner',
-                        choices: Object.values(SCANNERS),
+                        choices: Object.values(SCANNERS).map((scanner) =>
+                            scanner.toLowerCase()
+                        ),
                         describe: chalk.bold('Select the scanner to use'),
                     },
                     y: yesOption,
@@ -93,7 +99,7 @@ export const parseArgs = (args) => {
                             alias: 'scan-file',
                             demandOption: true,
                             describe: chalk.bold(
-                                'Select the vulnerability report to analyze'
+                                'Select the vulnerability report to analyze (Checkmarx, Snyk, Fortify, CodeQL)'
                             ),
                         },
                         r: {
@@ -109,16 +115,29 @@ export const parseArgs = (args) => {
                     })
                     .check((argv) => {
                         if (!argv.srcPath && !argv.repo) {
-                            throw new Error(
+                            throw new CliError(
                                 'You must supply either --src-path or --repo'
                             );
                         }
 
                         if (argv.ci && !argv.apiKey) {
-                            throw new Error(
+                            throw new CliError(
                                 '--ci flag requires --api-key to be provided as well'
                             );
                         }
+                        if (
+                            !supportExtensions.includes(
+                                path.extname(argv.f).toLowerCase()
+                            )
+                        ) {
+                            throw new CliError(
+                                `\n${chalk.bold(
+                                    argv.f
+                                )} is not a supported file extension. Supported extensions are: ${chalk.bold(
+                                    supportExtensions.join(', ')
+                                )}\n`
+                            );
+                        }
 
                         return true;
                     });