fix: wrong webapp url in summary link + simplify tests

Author: fallard84

action.yml

@@ -31,19 +31,24 @@ inputs:
     default: true
 
   _agent-download-base-url:
-    description: "(Internal) Base URL for fetching the agent binary. This is useful for testing changes in a fork. The URL should end with a slash."
+    description: "(Internal) Base URL for fetching the agent binary. This is useful for testing changes in a fork."
     type: string
     default: "https://github.com/bullfrogsec/bullfrog/releases/download/"
 
   _agent-version:
     description: "(Internal) Override the agent version to download. Must start with 'v' followed by semver (e.g., 'v0.8.4', 'v0.8.4-beta-feature', 'v1.0.0-rc'). If not specified, uses the version from package.json."
     type: string
 
-  _control-plane-base-url:
-    description: "(Internal) Base URL for the Bullfrog control plane API. This is useful for testing changes in a fork. The URL should end with a slash."
+  _control-plane-api-base-url:
+    description: "(Internal) Base URL for the Bullfrog control plane API. This is useful for testing changes in a fork."
     type: string
     default: "https://api.bullfrogsec.com/"
 
+  _control-plane-webapp-base-url:
+    description: "(Internal) Base URL for the Bullfrog control plane webapp. This is useful for testing changes in a fork."
+    type: string
+    default: "https://app.bullfrogsec.com/"
+
   _log-directory:
     description: "(Internal) Directory to store log files."
     type: string

action/dist/main.js

@@ -19834,6 +19834,12 @@ function validateAgentVersion(version) {
     );
   }
 }
+function formatUrlWithTrailingSlash(url) {
+  if (!url) {
+    return;
+  }
+  return url.endsWith("/") ? url : `${url}/`;
+}
 function parseInputs() {
   const rawAllowedIps = core.getInput("allowed-ips");
   const allowedIps = rawAllowedIps.length !== 0 ? rawAllowedIps.split("\n") : [];
@@ -19855,6 +19861,12 @@ function parseInputs() {
     validateAgentVersion(agentVersion);
   }
   const apiToken = core.getInput("api-token");
+  const agentDownloadBaseURL = formatUrlWithTrailingSlash(
+    core.getInput("_agent-download-base-url")
+  );
+  if (!agentDownloadBaseURL) {
+    throw new Error(`_agent-download-base-url cannot be empty`);
+  }
   return {
     allowedDomains,
     allowedIps,
@@ -19864,9 +19876,14 @@ function parseInputs() {
     egressPolicy,
     localAgent,
     logDirectory: core.getInput("_log-directory", { required: true }),
-    agentDownloadBaseURL: core.getInput("_agent-download-base-url"),
+    agentDownloadBaseURL,
     agentVersion: agentVersion || void 0,
-    controlPlaneBaseUrl: core.getInput("_control-plane-base-url"),
+    controlPlaneApiBaseUrl: formatUrlWithTrailingSlash(
+      core.getInput("_control-plane-api-base-url")
+    ),
+    controlPlaneWebappBaseUrl: formatUrlWithTrailingSlash(
+      core.getInput("_control-plane-webapp-base-url")
+    ),
     apiToken: apiToken || void 0
   };
 }
@@ -20024,14 +20041,14 @@ async function main() {
     logDirectory,
     agentVersion,
     apiToken,
-    controlPlaneBaseUrl
+    controlPlaneApiBaseUrl
   } = parseInputs();
   const actionDirectory = import_node_path.default.join(__dirname, "..");
   const agentDirectory = import_node_path.default.join(actionDirectory, "..", "agent");
   const pkg = require(`${actionDirectory}/../package.json`);
-  if (apiToken) {
+  if (apiToken && controlPlaneApiBaseUrl) {
     try {
-      const url = new URL(controlPlaneBaseUrl);
+      const url = new URL(controlPlaneApiBaseUrl);
       const controlPlaneDomain = url.hostname;
       allowedDomains.push(controlPlaneDomain);
       core3.info(
@@ -20047,12 +20064,11 @@ async function main() {
   const agentLogFilepath = import_node_path.default.join(logDirectory, AGENT_LOG_FILENAME);
   installPackages();
   const version = agentVersion || `v${pkg.version}`;
-  const versionWithoutPrefix = version.startsWith("v") ? version.slice(1) : version;
   await installAgent({
     actionDirectory,
     agentDirectory,
     localAgent,
-    version: versionWithoutPrefix,
+    version,
     agentDownloadBaseURL
   });
   await startAgent({

action/dist/main.js.map

@@ -19846,6 +19846,12 @@ function validateAgentVersion(version) {
     );
   }
 }
+function formatUrlWithTrailingSlash(url) {
+  if (!url) {
+    return;
+  }
+  return url.endsWith("/") ? url : `${url}/`;
+}
 function parseInputs() {
   const rawAllowedIps = core.getInput("allowed-ips");
   const allowedIps = rawAllowedIps.length !== 0 ? rawAllowedIps.split("\n") : [];
@@ -19867,6 +19873,12 @@ function parseInputs() {
     validateAgentVersion(agentVersion);
   }
   const apiToken = core.getInput("api-token");
+  const agentDownloadBaseURL = formatUrlWithTrailingSlash(
+    core.getInput("_agent-download-base-url")
+  );
+  if (!agentDownloadBaseURL) {
+    throw new Error(`_agent-download-base-url cannot be empty`);
+  }
   return {
     allowedDomains,
     allowedIps,
@@ -19876,9 +19888,14 @@ function parseInputs() {
     egressPolicy,
     localAgent,
     logDirectory: core.getInput("_log-directory", { required: true }),
-    agentDownloadBaseURL: core.getInput("_agent-download-base-url"),
+    agentDownloadBaseURL,
     agentVersion: agentVersion || void 0,
-    controlPlaneBaseUrl: core.getInput("_control-plane-base-url"),
+    controlPlaneApiBaseUrl: formatUrlWithTrailingSlash(
+      core.getInput("_control-plane-api-base-url")
+    ),
+    controlPlaneWebappBaseUrl: formatUrlWithTrailingSlash(
+      core.getInput("_control-plane-webapp-base-url")
+    ),
     apiToken: apiToken || void 0
   };
 }
@@ -19924,14 +19941,13 @@ function getGitHubContext() {
 function getHumanFriendlyReason(reasonCode) {
   return REASON_CODE_MAP[reasonCode] || reasonCode;
 }
-async function displaySummary(connections, controlPlaneBaseUrl) {
+async function displaySummary(connections, controlPlaneWebappBaseUrl) {
   const summary2 = core3.summary;
   const workflowRunId = process.env.GITHUB_RUN_ID;
-  if (controlPlaneBaseUrl && workflowRunId) {
-    const baseUrl = controlPlaneBaseUrl.endsWith("/") ? controlPlaneBaseUrl : `${controlPlaneBaseUrl}/`;
+  if (controlPlaneWebappBaseUrl && workflowRunId) {
     summary2.addHeading("Bullfrog Control Plane", 3).addLink(
       "View detailed results",
-      `${baseUrl}workflow-run/${workflowRunId}`
+      `${controlPlaneWebappBaseUrl}workflow-run/${workflowRunId}`
     );
   } else {
     summary2.addHeading("Bullfrog Results", 3);
@@ -20074,7 +20090,7 @@ async function printAgentLogs({
     console.error("Error reading log file", error);
   }
 }
-async function submitResultsToControlPlane(connections, apiToken, controlPlaneBaseUrl) {
+async function submitResultsToControlPlane(connections, apiToken, controlPlaneApiBaseUrl) {
   try {
     const { workflowRunId, runAttempt, jobName, organization, repo } = getGitHubContext();
     const payload = {
@@ -20088,8 +20104,7 @@ async function submitResultsToControlPlane(connections, apiToken, controlPlaneBa
     core3.debug(
       `Submitting results to control plane: ${JSON.stringify(payload)}`
     );
-    const baseUrl = controlPlaneBaseUrl.endsWith("/") ? controlPlaneBaseUrl : `${controlPlaneBaseUrl}/`;
-    const apiUrl = `${baseUrl}v1/events`;
+    const apiUrl = `${controlPlaneApiBaseUrl}v1/events`;
     const response = await fetch(apiUrl, {
       method: "POST",
       headers: {
@@ -20114,14 +20129,23 @@ async function submitResultsToControlPlane(connections, apiToken, controlPlaneBa
   }
 }
 async function main() {
-  const { logDirectory, apiToken, controlPlaneBaseUrl } = parseInputs();
+  const {
+    logDirectory,
+    apiToken,
+    controlPlaneApiBaseUrl,
+    controlPlaneWebappBaseUrl
+  } = parseInputs();
   const agentLogFilepath = import_node_path.default.join(logDirectory, AGENT_LOG_FILENAME);
   await printAgentLogs({ agentLogFilepath });
   try {
     const { filtered, raw } = await getConnections();
-    await displaySummary(filtered, apiToken ? controlPlaneBaseUrl : void 0);
-    if (apiToken) {
-      await submitResultsToControlPlane(raw, apiToken, controlPlaneBaseUrl);
+    const shouldAddControlPlaneResultsUrl = apiToken && controlPlaneWebappBaseUrl;
+    await displaySummary(
+      filtered,
+      shouldAddControlPlaneResultsUrl ? controlPlaneWebappBaseUrl : void 0
+    );
+    if (apiToken && controlPlaneApiBaseUrl) {
+      await submitResultsToControlPlane(raw, apiToken, controlPlaneApiBaseUrl);
     }
   } catch (error) {
     core3.warning(

action/dist/post.js

@@ -14,7 +14,7 @@ FINAL_BIN_DIR="/opt/bullfrog"
 if [ -f "$AGENT_FILE" ]; then
     echo "$AGENT_FILE exists."
 else
-    curl -L ${DOWNLOAD_URL}/${VERSION}/agent.tar.gz -o "$AGENT_FILE"
+    curl -L ${DOWNLOAD_URL}${VERSION}/agent.tar.gz -o "$AGENT_FILE"
 fi
 
 tar -xvf "$AGENT_FILE" -C $TMP_DIR