mobbdev 0.0.58 → 0.0.60

package/dist/index.mjs

@@ -13,7 +13,7 @@ var __publicField = (obj, key, value) => {
 import { hideBin } from "yargs/helpers";
 
 // src/args/yargs.ts
-import chalk9 from "chalk";
+import chalk8 from "chalk";
 import yargs from "yargs/yargs";
 
 // src/args/commands/analyze.ts
@@ -69,6 +69,7 @@ var mobbAscii = `
                 ...............................             
                        .................                    
 `;
+var PROJECT_DEFAULT_NAME = "My first project";
 var WEB_APP_URL = envVariables.WEB_APP_URL;
 var API_URL = envVariables.API_URL;
 var errorMessages = {
@@ -229,17 +230,11 @@ var DIGEST_VULNERABILITY_REPORT = gql`
     $vulnerabilityReportFileName: String!
     $fixReportId: String!
     $projectId: String!
-    $repoUrl: String!
-    $reference: String!
-    $sha: String
   ) {
     digestVulnerabilityReport(
       fixReportId: $fixReportId
       vulnerabilityReportFileName: $vulnerabilityReportFileName
       projectId: $projectId
-      repoUrl: $repoUrl
-      reference: $reference
-      sha: $sha
     ) {
       __typename
       ... on VulnerabilityReport {
@@ -261,29 +256,22 @@ var DIGEST_VULNERABILITY_REPORT = gql`
     }
   }
 `;
-var INITIALIZE_VULNERABILITY_REPORT = gql`
-  mutation InitializeVulnerabilityReport($fixReportId: String!) {
-    initializeVulnerabilityReport(fixReportId: $fixReportId) {
-      __typename
-    }
-  }
-`;
 var SUBMIT_VULNERABILITY_REPORT = gql`
   mutation SubmitVulnerabilityReport(
-    $vulnerabilityReportFileName: String!
     $fixReportId: String!
     $repoUrl: String!
     $reference: String!
     $projectId: String!
     $sha: String
+    $vulnerabilityReportFileName: String
   ) {
     submitVulnerabilityReport(
       fixReportId: $fixReportId
       repoUrl: $repoUrl
       reference: $reference
       sha: $sha
-      vulnerabilityReportFileName: $vulnerabilityReportFileName
       projectId: $projectId
+      vulnerabilityReportFileName: $vulnerabilityReportFileName
     ) {
       __typename
     }
@@ -333,6 +321,7 @@ var GET_ORG_AND_PROJECT_ID = gql2`
           id
           projects(order_by: { updatedAt: desc }) {
             id
+            name
           }
         }
       }
@@ -406,7 +395,8 @@ var GetOrgAndProjectIdQueryZ = z2.object({
             id: z2.string(),
             projects: z2.array(
               z2.object({
-                id: z2.string()
+                id: z2.string(),
+                name: z2.string()
               })
             ).nonempty()
           })
@@ -483,7 +473,7 @@ var GQLClient = class {
     }
     return true;
   }
-  async getOrgAndProjectId() {
+  async getOrgAndProjectId(projectName) {
     const getOrgAndProjectIdResult = await this._client.request(
       GET_ORG_AND_PROJECT_ID
     );
@@ -491,9 +481,10 @@ var GQLClient = class {
       getOrgAndProjectIdResult
     ).users;
     const org = user.userOrganizationsAndUserOrganizationRoles[0].organization;
+    const project = projectName ? org.projects.find((project2) => project2.name === projectName) ?? org.projects[0] : org.projects[0];
     return {
       organizationId: org.id,
-      projectId: org.projects[0].id
+      projectId: project.id
     };
   }
   async getEncryptedApiToken(variables) {
@@ -522,43 +513,31 @@ var GQLClient = class {
   }
   async digestVulnerabilityReport({
     fixReportId,
-    projectId,
-    repoUrl,
-    reference,
-    sha
+    projectId
   }) {
     const res = await this._client.request(
       DIGEST_VULNERABILITY_REPORT,
       {
         fixReportId,
         vulnerabilityReportFileName: "report.json",
-        projectId,
-        repoUrl,
-        reference,
-        sha
+        projectId
       }
     );
     return DigestVulnerabilityReportZ.parse(res).digestVulnerabilityReport;
   }
-  async initializeVulnerabilityReport({
-    fixReportId
-  }) {
-    await this._client.request(INITIALIZE_VULNERABILITY_REPORT, {
-      fixReportId
-    });
-  }
   async submitVulnerabilityReport({
     fixReportId,
     repoUrl,
     reference,
     projectId,
-    sha
+    sha,
+    vulnerabilityReportFileName
   }) {
     await this._client.request(SUBMIT_VULNERABILITY_REPORT, {
       fixReportId,
       repoUrl,
       reference,
-      vulnerabilityReportFileName: "report.json",
+      vulnerabilityReportFileName,
       projectId,
       sha: sha || ""
     });
@@ -2169,7 +2148,8 @@ async function _scan({
   commitHash,
   ref,
   scanner,
-  cxProjectName
+  cxProjectName,
+  mobbProjectName
 }, { skipPrompts = false } = {}) {
   debug8("start %s %s", dirname, repo);
   const { createSpinner: createSpinner4 } = Spinner2({ ci });
@@ -2178,7 +2158,9 @@ async function _scan({
     apiKey: apiKey || config2.get("apiToken")
   });
   await handleMobbLogin();
-  const { projectId, organizationId } = await gqlClient.getOrgAndProjectId();
+  const { projectId, organizationId } = await gqlClient.getOrgAndProjectId(
+    mobbProjectName
+  );
   const {
     uploadS3BucketInfo: { repoUploadInfo, reportUploadInfo }
   } = await gqlClient.uploadS3BucketInfo();
@@ -2260,7 +2242,9 @@ async function _scan({
       fixReportId: reportUploadInfo.fixReportId,
       repoUrl: repo,
       reference,
-      projectId
+      projectId,
+      vulnerabilityReportFileName: "report.json",
+      sha
     });
   } catch (e) {
     mobbSpinner.error({ text: "\u{1F575}\uFE0F\u200D\u2642\uFE0F Mobb analysis failed" });
@@ -2423,14 +2407,11 @@ async function _scan({
     });
     const digestSpinner = createSpinner4("\u{1F575}\uFE0F\u200D\u2642\uFE0F Digesting report").start();
     let vulnFiles = [];
+    const gitInfo = await getGitInfo(srcPath);
     try {
-      const gitInfo = await getGitInfo(srcPath);
       const { vulnerabilityReportId } = await gqlClient.digestVulnerabilityReport({
         fixReportId: reportUploadInfo.fixReportId,
-        projectId,
-        repoUrl: repo || gitInfo.repoUrl,
-        reference: gitInfo.reference,
-        sha: commitHash || gitInfo.hash
+        projectId
       });
       const finalState = await gqlClient.waitFixReportInit(
         reportUploadInfo.fixReportId,
@@ -2467,8 +2448,12 @@ async function _scan({
     uploadRepoSpinner.success({ text: "\u{1F4C1} Uploading Repo successful!" });
     const mobbSpinner2 = createSpinner4("\u{1F575}\uFE0F\u200D\u2642\uFE0F Initiating Mobb analysis").start();
     try {
-      await gqlClient.initializeVulnerabilityReport({
-        fixReportId: reportUploadInfo.fixReportId
+      await gqlClient.submitVulnerabilityReport({
+        fixReportId: reportUploadInfo.fixReportId,
+        projectId,
+        repoUrl: repo || gitInfo.repoUrl,
+        reference: gitInfo.reference,
+        sha: commitHash || gitInfo.hash
       });
     } catch (e) {
       mobbSpinner2.error({ text: "\u{1F575}\uFE0F\u200D\u2642\uFE0F Mobb analysis failed" });
@@ -2483,7 +2468,16 @@ async function _scan({
 
 // src/commands/index.ts
 import chalkAnimation from "chalk-animation";
-async function analyze({ repo, f: scanFile, ref, apiKey, ci, commitHash, srcPath }, { skipPrompts = false } = {}) {
+async function analyze({
+  repo,
+  f: scanFile,
+  ref,
+  apiKey,
+  ci,
+  commitHash,
+  srcPath,
+  mobbProjectName
+}, { skipPrompts = false } = {}) {
   !ci && await showWelcomeMessage(skipPrompts);
   await runAnalysis(
     {
@@ -2493,6 +2487,7 @@ async function analyze({ repo, f: scanFile, ref, apiKey, ci, commitHash, srcPath
       apiKey,
       ci,
       commitHash,
+      mobbProjectName,
       srcPath
     },
     { skipPrompts }
@@ -2548,6 +2543,16 @@ var refOption = {
   type: "string",
   demandOption: false
 };
+var scannerOptions = {
+  alias: "s",
+  choices: Object.values(SCANNERS),
+  describe: chalk5.bold("Select the scanner to use")
+};
+var mobbProjectNameOption = {
+  type: "string",
+  describe: chalk5.bold("Mobb project name"),
+  default: PROJECT_DEFAULT_NAME
+};
 var ciOption = {
   describe: chalk5.bold(
     "Run in CI mode, prompts and browser will not be opened"
@@ -2640,7 +2645,7 @@ function analyzeBuilder(yargs2) {
     alias: "commit-hash",
     describe: chalk7.bold("Hash of the commit"),
     type: "string"
-  }).option("y", yesOption).option("ci", ciOption).option("api-key", apiKeyOption).option("commit-hash", commitHashOption).example(
+  }).option("mobb-project-name", mobbProjectNameOption).option("y", yesOption).option("ci", ciOption).option("api-key", apiKeyOption).option("commit-hash", commitHashOption).example(
     "$0 analyze -r https://github.com/WebGoat/WebGoat -f <your_vulirabitliy_report_path>",
     "analyze an existing repository"
   ).help();
@@ -2667,13 +2672,8 @@ async function analyzeHandler(args) {
 }
 
 // src/args/commands/scan.ts
-import chalk8 from "chalk";
 function scanBuilder(args) {
-  return args.coerce("scanner", (arg) => arg.toLowerCase()).option("repo", repoOption).option("ref", refOption).option("s", {
-    alias: "scanner",
-    choices: Object.values(SCANNERS),
-    describe: chalk8.bold("Select the scanner to use")
-  }).option("y", yesOption).option("ci", ciOption).option("api-key", apiKeyOption).option("cx-project-name", projectNameOption).example(
+  return args.coerce("scanner", (arg) => arg.toLowerCase()).option("repo", repoOption).option("ref", refOption).option("scanner", scannerOptions).option("mobb-project-name", mobbProjectNameOption).option("y", yesOption).option("ci", ciOption).option("api-key", apiKeyOption).option("cx-project-name", projectNameOption).example(
     "$0 scan -r https://github.com/WebGoat/WebGoat",
     "Scan an existing repository"
   ).help();
@@ -2699,28 +2699,28 @@ async function scanHandler(args) {
 var parseArgs = async (args) => {
   const yargsInstance = yargs(args);
   return yargsInstance.updateStrings({
-    "Commands:": chalk9.yellow.underline.bold("Commands:"),
-    "Options:": chalk9.yellow.underline.bold("Options:"),
-    "Examples:": chalk9.yellow.underline.bold("Examples:"),
-    "Show help": chalk9.bold("Show help")
+    "Commands:": chalk8.yellow.underline.bold("Commands:"),
+    "Options:": chalk8.yellow.underline.bold("Options:"),
+    "Examples:": chalk8.yellow.underline.bold("Examples:"),
+    "Show help": chalk8.bold("Show help")
   }).usage(
-    `${chalk9.bold(
+    `${chalk8.bold(
       "\n Bugsy - Trusted, Automatic Vulnerability Fixer \u{1F575}\uFE0F\u200D\u2642\uFE0F\n\n"
-    )} ${chalk9.yellow.underline.bold("Usage:")} 
-  $0 ${chalk9.green(
+    )} ${chalk8.yellow.underline.bold("Usage:")} 
+  $0 ${chalk8.green(
       "<command>"
-    )} ${chalk9.dim("[options]")}
+    )} ${chalk8.dim("[options]")}
             `
   ).version(false).command(
     "scan",
-    chalk9.bold(
+    chalk8.bold(
       "Scan your code for vulnerabilities, get automated fixes right away."
     ),
     scanBuilder,
     scanHandler
   ).command(
     "analyze",
-    chalk9.bold(
+    chalk8.bold(
       "Provide a vulnerability report and relevant code repository, get automated fixes right away."
     ),
     analyzeBuilder,
@@ -2733,7 +2733,7 @@ var parseArgs = async (args) => {
     handler() {
       yargsInstance.showHelp();
     }
-  }).strictOptions().help("h").alias("h", "help").epilog(chalk9.bgBlue("Made with \u2764\uFE0F  by Mobb")).showHelpOnFail(true).wrap(Math.min(120, yargsInstance.terminalWidth())).parse();
+  }).strictOptions().help("h").alias("h", "help").epilog(chalk8.bgBlue("Made with \u2764\uFE0F  by Mobb")).showHelpOnFail(true).wrap(Math.min(120, yargsInstance.terminalWidth())).parse();
 };
 
 // src/index.ts

package/package.json

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