mobbdev 0.0.60 → 0.0.62

package/dist/index.mjs

@@ -202,6 +202,7 @@ async function getGitInfo(srcDirPath) {
 // src/features/analysis/graphql/gql.ts
 import Debug3 from "debug";
 import { GraphQLClient } from "graphql-request";
+import { v4 as uuidv4 } from "uuid";
 
 // src/features/analysis/graphql/mutations.ts
 import { gql } from "graphql-request";
@@ -443,7 +444,20 @@ var GQLClient = class {
     const { apiKey } = args;
     debug3(`init with apiKey ${apiKey}`);
     this._client = new GraphQLClient(API_URL, {
-      headers: { [API_KEY_HEADER_NAME]: apiKey || "" }
+      headers: { [API_KEY_HEADER_NAME]: apiKey || "" },
+      requestMiddleware: (request) => {
+        const requestId = uuidv4();
+        debug3(
+          `sending API request with id: ${requestId} and with request: ${request.body}`
+        );
+        return {
+          ...request,
+          headers: {
+            ...request.headers,
+            "x-hasura-request-id": requestId
+          }
+        };
+      }
     });
   }
   async getUserInfo() {
@@ -938,6 +952,56 @@ import { z as z5 } from "zod";
 import { RequestError } from "@octokit/request-error";
 import { Octokit } from "octokit";
 import { z as z3 } from "zod";
+
+// src/features/analysis/scm/urlParser.ts
+var pathnameParsingMap = {
+  "gitlab.com": (pathname) => {
+    if (pathname.length < 2)
+      return null;
+    return {
+      organization: pathname[0],
+      repoName: pathname[pathname.length - 1]
+    };
+  },
+  "github.com": (pathname) => {
+    if (pathname.length !== 2)
+      return null;
+    return {
+      organization: pathname[0],
+      repoName: pathname[1]
+    };
+  }
+};
+var NAME_REGEX = /[a-z0-9\-_.+]+/i;
+var parseScmURL = (scmURL) => {
+  try {
+    const url = new URL(scmURL);
+    const hostname = url.hostname.toLowerCase();
+    if (!(hostname in pathnameParsingMap))
+      return null;
+    const projectPath = url.pathname.substring(1).replace(/.git$/i, "");
+    const repo = pathnameParsingMap[hostname](
+      projectPath.split("/")
+    );
+    if (!repo)
+      return null;
+    const { organization, repoName } = repo;
+    if (!organization || !repoName)
+      return null;
+    if (!organization.match(NAME_REGEX) || !repoName.match(NAME_REGEX))
+      return null;
+    return {
+      hostname: url.hostname,
+      organization,
+      projectPath,
+      repoName
+    };
+  } catch (e) {
+    return null;
+  }
+};
+
+// src/features/analysis/scm/github.ts
 function removeTrailingSlash(str) {
   return str.trim().replace(/\/+$/, "");
 }
@@ -980,7 +1044,6 @@ var GetBlameDocument = `
         }
       }
     `;
-var githubUrlRegex = /^http[s]?:\/\/[^/\s]+\/([^/.\s]+\/[^/.\s]+)(\.git)?(\/)?$/i;
 function getOktoKit(options) {
   const token = options?.githubAuthToken ?? GITHUB_API_TOKEN ?? "";
   return new Octokit({ auth: token });
@@ -1207,17 +1270,15 @@ async function getCommit({
 }
 function parseOwnerAndRepo(gitHubUrl) {
   gitHubUrl = removeTrailingSlash(gitHubUrl);
-  if (!githubUrlRegex.test(gitHubUrl)) {
+  const parsingResult = parseScmURL(gitHubUrl);
+  if (!parsingResult || parsingResult.hostname !== "github.com") {
     throw new InvalidUrlPatternError(`invalid github repo Url ${gitHubUrl}`);
   }
-  const groups = gitHubUrl.split(githubUrlRegex).filter((res) => res);
-  const ownerAndRepo = groups[0]?.split("/");
-  const owner = ownerAndRepo?.at(0);
-  const repo = ownerAndRepo?.at(1);
-  if (!owner || !repo) {
+  const { organization, repoName } = parsingResult;
+  if (!organization || !repoName) {
     throw new InvalidUrlPatternError(`invalid github repo Url ${gitHubUrl}`);
   }
-  return { owner, repo };
+  return { owner: organization, repo: repoName };
 }
 async function queryGithubGraphql(query, variables, options) {
   const token = options?.githubAuthToken ?? GITHUB_API_TOKEN ?? "";
@@ -1787,7 +1848,6 @@ var EnvVariablesZod2 = z5.object({
   GITLAB_API_TOKEN: z5.string().optional()
 });
 var { GITLAB_API_TOKEN } = EnvVariablesZod2.parse(process.env);
-var gitlabUrlRegex = /^http[s]?:\/\/[^/\s]+\/(([^/.\s]+[/])+)([^/.\s]+)(\.git)?(\/)?$/i;
 function getGitBeaker(options) {
   const token = options?.gitlabAuthToken ?? GITLAB_API_TOKEN ?? "";
   if (token?.startsWith("glpat-") || token === "") {
@@ -1987,14 +2047,12 @@ async function getGitlabReferenceData({ ref, gitlabUrl }, options) {
 }
 function parseOwnerAndRepo2(gitlabUrl) {
   gitlabUrl = removeTrailingSlash2(gitlabUrl);
-  if (!gitlabUrlRegex.test(gitlabUrl)) {
+  const parsingResult = parseScmURL(gitlabUrl);
+  if (!parsingResult || parsingResult.hostname !== "gitlab.com") {
     throw new InvalidUrlPatternError(`invalid gitlab repo Url ${gitlabUrl}`);
   }
-  const groups = gitlabUrl.split(gitlabUrlRegex).filter((res) => res);
-  const owner = groups[0]?.split("/")[0];
-  const repo = groups[2];
-  const projectPath = `${groups[0]}${repo}`;
-  return { owner, repo, projectPath };
+  const { organization, repoName, projectPath } = parsingResult;
+  return { owner: organization, repo: repoName, projectPath };
 }
 async function getGitlabBlameRanges({ ref, gitlabUrl, path: path8 }, options) {
   const { projectPath } = parseOwnerAndRepo2(gitlabUrl);
@@ -2590,10 +2648,9 @@ Example:
   )}`;
   throw new CliError(formattedErrorMessage);
 }
-var GIT_REPO_URL_PATTERN = /^https:\/\/(gitlab|github)\.com\/(([^/.\s]+[/])+)([^/.\s]+)(\.git)?(\/)?$/i;
 var UrlZ = z6.string({
   invalid_type_error: "is not a valid GitHub / GitLab URL"
-}).regex(GIT_REPO_URL_PATTERN, {
+}).refine((data) => !!parseScmURL(data), {
   message: "is not a valid GitHub / GitLab URL"
 });
 function validateRepoUrl(args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobbdev",
-  "version": "0.0.60",
+  "version": "0.0.62",
   "description": "Automated secure code remediation tool",
   "repository": "https://github.com/mobb-dev/bugsy",
   "main": "dist/index.js",
@@ -49,6 +49,7 @@
     "supports-color": "9.4.0",
     "tar": "6.2.0",
     "tmp": "0.2.1",
+    "uuid": "9.0.0",
     "yargs": "17.7.2",
     "zod": "3.22.3"
   },
@@ -63,6 +64,7 @@
     "@types/semver": "7.5.0",
     "@types/tar": "^6.1.6",
     "@types/tmp": "0.2.3",
+    "@types/uuid": "9.0.1",
     "@types/yargs": "17.0.24",
     "@typescript-eslint/eslint-plugin": "5.44.0",
     "@typescript-eslint/parser": "5.44.0",