Update GHES URL for listing orgs

Author: aegilops

src/cli.ts

@@ -18,6 +18,7 @@ async function main() {
     .option("org", { type: "string", describe: "Single organization login" })
     .option("repo", { type: "string", describe: "Single repository name" })
     .option("base-url", { type: "string", describe: "GitHub Enterprise Server base URL, e.g. https://github.mycompany.com/api/v3" })
+    .option("ghes", { type: "boolean", default: false, describe: "Indicates that the provided base URL is for GitHub Enterprise Server" })
     .option("concurrency", { type: "number", default: 5 })
     .option("sbom-delay", { type: "number", default: 3000, describe: "Delay (ms) between SBOM fetch requests" })
     .option("light-delay", { type: "number", default: 100, describe: "Delay (ms) between lightweight metadata requests (org/repo listing, commit head checks)" })
@@ -122,6 +123,7 @@ async function main() {
     org: argv.org as string | undefined,
     repo: argv.repo as string | undefined,
     baseUrl: argv["base-url"] as string | undefined,
+    ghes: argv.ghes as boolean | undefined,
     concurrency: argv.concurrency as number,
     delayMsBetweenRepos: argv["sbom-delay"] as number,
     lightDelayMs: argv["light-delay"] as number,

src/sbomCollector.ts

@@ -14,7 +14,8 @@ export interface CollectorOptions {
   enterprise?: string; // Enterprise slug to enumerate orgs
   org?: string; // Single org alternative
   repo?: string; // Single repo alternative
-  baseUrl?: string; // For GHES
+  baseUrl?: string; // For GHES, EMU and Data Residency
+  ghes?: boolean; // Is this a GHES instance?
   concurrency?: number; // parallel repo SBOM fetches
   includePrivate?: boolean;
   delayMsBetweenRepos?: number;
@@ -53,6 +54,7 @@ export class SbomCollector {
     this.opts = {
       token: o.token,
       enterprise: o.enterprise,
+      ghes: o.ghes ?? false,
       org: o.org,
       repo: o.repo,
       baseUrl: o.baseUrl,
@@ -149,7 +151,7 @@ export class SbomCollector {
       process.stderr.write(chalk.blue(`Getting list of organizations for enterprise ${this.opts.enterprise}`) + "\n");
     }
 
-    const orgs = this.opts.org ? [this.opts.org] : this.opts.enterprise ? await this.listEnterpriseOrgs(this.opts.enterprise!) : [this.opts.repo.split("/")[0]];
+    const orgs = this.opts.org ? [this.opts.org] : this.opts.enterprise ? await this.listEnterpriseOrgs(this.opts.enterprise, this.opts.ghes) : [this.opts.repo.split("/")[0]];
     this.summary.orgs = orgs;
 
     // Pre-list all repos if showing progress bar so we know the total upfront
@@ -368,7 +370,7 @@ export class SbomCollector {
     return false;
   }
 
-  private async listEnterpriseOrgs(enterprise: string): Promise<string[]> {
+  private async listEnterpriseOrgs(enterprise: string, ghes: boolean): Promise<string[]> {
     if (!this.octokit) throw new Error("No Octokit instance");
     interface Org { login: string }
     try {
@@ -377,7 +379,7 @@ export class SbomCollector {
       let page = 1;
       let done = false;
       while (!done) {
-        const resp = await this.octokit.request("GET /enterprises/{enterprise}/orgs", { enterprise, per_page, page });
+        const resp = await this.octokit.request(ghes ? "GET /orgs" : "GET /enterprises/{enterprise}/orgs", { enterprise, per_page, page });
         const items = resp.data as unknown as Org[];
         for (const o of items) orgs.push(o.login);
         if (items.length < per_page) done = true; else page++;