mobbdev 0.0.155 → 0.0.159

package/dist/index.mjs

@@ -66,13 +66,10 @@ import { z as z9 } from "zod";
 import { z } from "zod";
 var EnvVariablesZod = z.object({
   GITLAB_API_TOKEN: z.string().optional(),
-  BROKERED_HOSTS: z.string().toLowerCase().transform(
-    (x) => x.split(",").map((url) => url.trim(), []).filter(Boolean)
-  ).default(""),
   GITHUB_API_TOKEN: z.string().optional(),
   GIT_PROXY_HOST: z.string().default("http://tinyproxy:8888")
 });
-var { GITLAB_API_TOKEN, BROKERED_HOSTS, GITHUB_API_TOKEN, GIT_PROXY_HOST } = EnvVariablesZod.parse(process.env);
+var { GITLAB_API_TOKEN, GITHUB_API_TOKEN, GIT_PROXY_HOST } = EnvVariablesZod.parse(process.env);
 
 // src/features/analysis/scm/scm.ts
 import { z as z7 } from "zod";
@@ -880,7 +877,7 @@ function isGithubOnPrem(url) {
   return !url.includes(scmCloudUrl.GitHub);
 }
 function getFetch(url) {
-  if (url && BROKERED_HOSTS.includes(new URL(url).origin)) {
+  if (url && isBrokerUrl(url)) {
     const dispatcher = new ProxyAgent({
       uri: GIT_PROXY_HOST,
       requestTls: {
@@ -1586,9 +1583,7 @@ function initGitlabFetchMock() {
         `this block is used for unit tests only. URL ${input?.url} starts from local directory`
       );
     }
-    if (urlParsed && BROKERED_HOSTS.includes(
-      `${urlParsed.protocol?.toLowerCase()}//${urlParsed.host?.toLowerCase()}`
-    )) {
+    if (urlParsed && isBrokerUrl(urlParsed.href)) {
       const dispatcher = new ProxyAgent2({
         uri: process.env["GIT_PROXY_HOST"] || "http://tinyproxy:8888",
         requestTls: {
@@ -1623,6 +1618,7 @@ var BaseSubmitToScmMessageZ = z5.object({
   ),
   commitHash: z5.string(),
   repoUrl: z5.string(),
+  mobbUserEmail: z5.string(),
   extraHeaders: z5.record(z5.string(), z5.string()).default({})
 });
 var submitToScmMessageType = {
@@ -1653,6 +1649,7 @@ var FixResponseArrayZ = z5.array(
   })
 );
 var SubmitFixesBaseResponseMessageZ = z5.object({
+  mobbUserEmail: z5.string(),
   submitFixRequestId: z5.string().uuid(),
   submitBranches: z5.array(
     z5.object({
@@ -1686,12 +1683,6 @@ var SubmitFixesResponseMessageZ = z5.discriminatedUnion("type", [
 ]);
 
 // src/features/analysis/scm/scmSubmit/index.ts
-var EnvVariablesZod2 = z6.object({
-  BROKERED_HOSTS: z6.string().toLowerCase().transform(
-    (x) => x.split(",").map((url) => url.trim(), []).filter(Boolean)
-  ).default("")
-});
-var { BROKERED_HOSTS: BROKERED_HOSTS2 } = EnvVariablesZod2.parse(process.env);
 var isValidBranchName = async (branchName) => {
   const git = simpleGit();
   try {
@@ -1712,6 +1703,9 @@ var FixesZ = z6.array(
 ).nonempty();
 
 // src/features/analysis/scm/scm.ts
+function isBrokerUrl(url) {
+  return z7.string().uuid().safeParse(new URL(url).host).success;
+}
 var GetRefererenceResultZ = z7.object({
   date: z7.date().optional(),
   sha: z7.string(),
@@ -1762,10 +1756,11 @@ function getScmLibTypeFromScmType(scmType) {
 function getScmConfig({
   url,
   scmConfigs,
+  brokerHosts,
   includeOrgTokens = true
 }) {
+  const urlObject = new URL(url);
   const filteredScmConfigs = scmConfigs.filter((scm) => {
-    const urlObject = new URL(url);
     const configUrl = new URL(scm.scmUrl);
     return (
       //if we the user does an ADO oauth flow then the token is saved for dev.azure.com but
@@ -1774,13 +1769,20 @@ function getScmConfig({
       (urlObject.hostname.toLowerCase() === configUrl.hostname.toLowerCase() || urlObject.hostname.toLowerCase().endsWith(".visualstudio.com") && configUrl.hostname.toLowerCase() === "dev.azure.com") && urlObject.protocol === configUrl.protocol && urlObject.port === configUrl.port
     );
   });
+  const filteredBrokerHosts = brokerHosts.filter((broker) => {
+    const urlObject2 = new URL(url);
+    return urlObject2.hostname.toLowerCase() === broker.realDomain.toLowerCase();
+  });
+  const virtualDomain = filteredBrokerHosts[0]?.virtualDomain;
+  const virtualUrl = virtualDomain ? `https://${virtualDomain}${urlObject.pathname}${urlObject.search}` : void 0;
   const scmOrgConfig = filteredScmConfigs.find((scm) => scm.orgId && scm.token);
   if (scmOrgConfig && includeOrgTokens) {
     return {
       id: scmOrgConfig.id,
       accessToken: scmOrgConfig.token || void 0,
       scmLibType: getScmLibTypeFromScmType(scmOrgConfig.scmType),
-      scmOrg: scmOrgConfig.scmOrg || void 0
+      scmOrg: scmOrgConfig.scmOrg || void 0,
+      virtualUrl
     };
   }
   const scmUserConfig = filteredScmConfigs.find(
@@ -1791,7 +1793,8 @@ function getScmConfig({
       id: scmUserConfig.id,
       accessToken: scmUserConfig.token || void 0,
       scmLibType: getScmLibTypeFromScmType(scmUserConfig.scmType),
-      scmOrg: scmUserConfig.scmOrg || void 0
+      scmOrg: scmUserConfig.scmOrg || void 0,
+      virtualUrl
     };
   }
   const type2 = getCloudScmLibTypeFromUrl(url);
@@ -1800,14 +1803,16 @@ function getScmConfig({
       id: void 0,
       accessToken: void 0,
       scmLibType: type2,
-      scmOrg: void 0
+      scmOrg: void 0,
+      virtualUrl
     };
   }
   return {
     id: void 0,
     accessToken: void 0,
     scmLibType: void 0,
-    scmOrg: void 0
+    scmOrg: void 0,
+    virtualUrl
   };
 }
 var InvalidRepoUrlError = class extends Error {
@@ -1836,7 +1841,7 @@ var RepoNoTokenAccessError = class extends Error {
     this.scmType = scmType;
   }
 };
-function buildAuthrizedRepoUrl(args) {
+function buildAuthorizedRepoUrl(args) {
   const { url, username, password } = args;
   const is_http = url.toLowerCase().startsWith("http://");
   const is_https = url.toLowerCase().startsWith("https://");
@@ -1888,7 +1893,7 @@ var SCMLib = class {
         case "token": {
           const { token } = authData;
           const username2 = await this._getUsernameForAuthUrl();
-          return buildAuthrizedRepoUrl({
+          return buildAuthorizedRepoUrl({
             url,
             username: username2,
             password: token
@@ -1896,13 +1901,14 @@ var SCMLib = class {
         }
         case "basic": {
           const { username: username2, password } = authData;
-          return buildAuthrizedRepoUrl({ url, username: username2, password });
+          return buildAuthorizedRepoUrl({ url, username: username2, password });
         }
       }
     }
+    const finalUrl = scmLibType === "GITLAB" /* GITLAB */ ? `${trimmedUrl}.git` : trimmedUrl;
     const username = await this._getUsernameForAuthUrl();
-    return buildAuthrizedRepoUrl({
-      url: trimmedUrl,
+    return buildAuthorizedRepoUrl({
+      url: finalUrl,
       username,
       password: accessToken
     });
@@ -2867,7 +2873,7 @@ async function getAdoApiClient(params) {
     return connection2;
   }
   const authHandler = api.getPersonalAccessTokenHandler(params.accessToken);
-  const isBroker = BROKERED_HOSTS.includes(new URL(orgUrl).origin);
+  const isBroker = isBrokerUrl(orgUrl);
   const connection = new api.WebApi(
     orgUrl,
     authHandler,
@@ -3363,6 +3369,14 @@ var MeDocument = `
   me {
     id
     email
+    userOrganizationsAndUserOrganizationRoles {
+      organization {
+        brokerHosts {
+          realDomain
+          virtualDomain
+        }
+      }
+    }
     scmConfigs {
       id
       orgId
@@ -5157,6 +5171,20 @@ function _getUrlForScmType({
       };
   }
 }
+function getBrokerHosts(userOrgsAnUserOrgRoles) {
+  const brokerHosts = [];
+  if (!userOrgsAnUserOrgRoles) {
+    return brokerHosts;
+  }
+  userOrgsAnUserOrgRoles.forEach((org) => {
+    org?.organization?.brokerHosts.forEach((brokerHost) => {
+      if (brokerHost) {
+        brokerHosts.push(brokerHost);
+      }
+    });
+  });
+  return brokerHosts;
+}
 async function getScmTokenInfo(params) {
   const { gqlClient, repo } = params;
   const userInfo = await gqlClient.getUserInfo();
@@ -5167,7 +5195,10 @@ async function getScmTokenInfo(params) {
   return getScmConfig({
     url: repo,
     scmConfigs,
-    includeOrgTokens: false
+    includeOrgTokens: false,
+    brokerHosts: getBrokerHosts(
+      userInfo.userOrganizationsAndUserOrganizationRoles
+    )
   });
 }
 async function getReport(params, { skipPrompts }) {
@@ -5468,6 +5499,9 @@ async function _scan(params, { skipPrompts = false } = {}) {
       const tokenInfo2 = getScmConfig({
         url: repoUrl,
         scmConfigs,
+        brokerHosts: getBrokerHosts(
+          userInfo.userOrganizationsAndUserOrganizationRoles
+        ),
         includeOrgTokens: false
       });
       if (tokenInfo2.accessToken && tokenInfo2.accessToken !== oldToken) {

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "mobbdev",
-  "version": "0.0.155",
+  "version": "0.0.159",
   "description": "Automated secure code remediation tool",
   "repository": "https://github.com/mobb-dev/bugsy",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "scripts": {
+    "clean": "rm -rf build",
     "env": "dotenv -e ./.env",
     "postinstall": "node ./src/post_install/cx_install.mjs",
     "build": "tsc && tsup-node --env.NODE_ENV production",
@@ -33,13 +34,13 @@
     "@octokit/request-error": "3.0.3",
     "@types/libsodium-wrappers": "0.7.13",
     "adm-zip": "0.5.15",
-    "axios": "1.7.3",
+    "axios": "1.7.7",
     "azure-devops-node-api": "12.1.0",
     "bitbucket": "2.11.0",
     "chalk": "5.3.0",
     "chalk-animation": "2.0.3",
     "configstore": "6.0.0",
-    "debug": "4.3.6",
+    "debug": "4.3.7",
     "dotenv": "16.4.5",
     "extract-zip": "2.0.1",
     "globby": "13.2.2",
@@ -57,12 +58,12 @@
     "open": "8.4.2",
     "parse-diff": "0.11.1",
     "semver": "7.6.3",
-    "simple-git": "3.25.0",
-    "snyk": "1.1292.4",
+    "simple-git": "3.26.0",
+    "snyk": "1.1293.0",
     "supports-color": "9.4.0",
     "tar": "6.2.1",
     "tmp": "0.2.3",
-    "undici": "6.19.5",
+    "undici": "6.19.8",
     "uuid": "10.0.0",
     "ws": "8.18.0",
     "yargs": "17.7.2",
@@ -85,11 +86,11 @@
     "@types/tmp": "0.2.6",
     "@types/uuid": "10.0.0",
     "@types/ws": "8.5.12",
-    "@types/yargs": "17.0.32",
+    "@types/yargs": "17.0.33",
     "@typescript-eslint/eslint-plugin": "7.17.0",
     "@typescript-eslint/parser": "7.17.0",
     "eslint": "8.57.0",
-    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-import": "2.30.0",
     "eslint-plugin-prettier": "5.2.1",
     "eslint-plugin-simple-import-sort": "10.0.0",
     "prettier": "3.3.3",