feat: skip agent install and post step on subsequent runs for GitHub-hosted runners

Release v2.13.3

.github/workflows/code-review.yml

@@ -1,23 +0,0 @@
-name: Code Review
-on:
-  pull_request:
-permissions:
-  contents: read
-jobs:
-  code-review:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
-        with:
-          disable-sudo: true
-          egress-policy: block
-          allowed-endpoints: >
-            api.github.com:443
-            int.api.stepsecurity.io:443
-
-      - name: Code Review
-        uses: step-security/ai-codewise@int

.github/workflows/test.yml

@@ -39,8 +39,37 @@ jobs:
         run: npm test -- --coverage
       - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
       - name: Publish Test Results
-        uses: step-security/publish-unit-test-result-action@cc82caac074385ae176d39d2d143ad05e1130b2d # v2.18.0
+        uses: step-security/publish-unit-test-result-action@e88bfc6c0dffc68a1067d63526c80c81f248da11 # v2.20.0
         if: always()
         with:
           files: |
             reports/*.xml
+
+  build-check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
+        with:
+          disable-sudo: true
+          egress-policy: audit
+          allowed-endpoints: >
+            github.com:443
+            registry.npmjs.org:443
+
+      - name: Checkout
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Install Dependencies
+        run: npm ci
+      - name: Run build
+        run: npm run build
+      - name: Check for changes in dist
+        run: |
+          if [[ `git status --porcelain dist` ]]; then
+            echo "Changes detected in dist directory after build:"
+            git status --porcelain dist
+            git diff dist
+            exit 1
+          else
+            echo "No changes in dist directory - build is clean"
+          fi

README.md

@@ -24,12 +24,14 @@ StepSecurity Harden-Runner addresses this gap by providing security monitoring t
 
 - [Harden-Runner Detected the tj-actions/changed-files compromise](https://www.stepsecurity.io/blog/harden-runner-detection-tj-actions-changed-files-action-is-compromised) ([CVE-2025-30066](https://github.com/advisories/GHSA-mrrh-fwg8-r2c3))
 - [Harden-Runner Detected a CI/CD Supply Chain Attack in Google’s Open-Source Project Flank](https://www.stepsecurity.io/case-studies/flank)
+- [Harden-Runner Detected the NX Build System compromise](https://www.stepsecurity.io/blog/supply-chain-security-alert-popular-nx-build-system-package-compromised-with-data-stealing-malware)
 - [Harden-Runner Detected a CI/CD Supply Chain Attack in Microsoft’s Open-Source Project Azure Karpenter Provider in Real-Time](https://www.stepsecurity.io/case-studies/azure-karpenter-provider)
 - [Harden-Runner Detected Anomalous Traffic to api.ipify.org Across Multiple Customers](https://www.stepsecurity.io/blog/harden-runner-detects-anomalous-traffic-to-api-ipify-org-across-multiple-customers)  
-- [Harden-Runner Flagged an Anomalous Outbound Call, Leading to a Docker Documentation Update](https://www.stepsecurity.io/blog/harden-runner-flags-anomalous-outbound-call-leading-to-docker-documentation-update)  
+- [Harden-Runner Detected an Unexpected Microsoft Defender Installation on GitHub-Hosted Ubuntu Runners](https://www.stepsecurity.io/blog/how-stepsecurity-harden-runner-detected-unexpected-microsoft-defender-installation-on-github-hosted-ubuntu-runners)
+- [Harden-Runner Flagged an Anomalous Outbound Call, Leading to a Docker Documentation Update](https://www.stepsecurity.io/blog/harden-runner-flags-anomalous-outbound-call-leading-to-docker-documentation-update)
 
 ### See It in Action
-Harden-Runner secures over **a million CI/CD workflow runs every week**, protecting thousands of pipelines, including those from popular open-source projects by **Microsoft, Google, and CISA**. See how top projects are using Harden-Runner and explore the insights:  
+Harden-Runner secures over **8 million CI/CD workflow runs every week**, protecting thousands of pipelines, including those from popular open-source projects by **Microsoft, Google, and CISA**. See how top projects are using Harden-Runner and explore the insights:  
 ➡️ [Who's using Harden-Runner?](https://docs.stepsecurity.io/whos-using-harden-runner)
 
 ## Quick Links
@@ -66,7 +68,8 @@ To integrate Harden-Runner, follow these steps:
 - Add the following code as the first step in each job:
    ```yaml
    steps:
-     - uses: step-security/harden-runner@446798f8213ac2e75931c1b0769676d927801858 # v2.10.3
+     - name: Harden Runner
+       uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
        with:
          egress-policy: audit
 
@@ -134,7 +137,7 @@ Explore the full feature set in the [Features Documentation](https://docs.stepse
 
 ## Trusted By and Case Studies
 
-Harden-Runner is trusted by over 5000 leading open-source projects and enterprises, including Microsoft, Google, Kubernetes, and more.
+Harden-Runner is trusted by over 8000 leading open-source projects and enterprises, including Microsoft, Google, Kubernetes, and more.
 
 ### Trusted by
 
@@ -147,6 +150,7 @@ Harden-Runner is trusted by over 5000 leading open-source projects and enterpris
 
 - [How Coveo Strengthened GitHub Actions Security with StepSecurity](https://www.stepsecurity.io/case-studies/coveo)
 - [Hashgraph Achieves Comprehensive CI/CD Security Without Compromising Development Speed](https://www.stepsecurity.io/case-studies/hashgraph)
+- [Chainguard Secures GitHub Actions with StepSecurity](https://www.stepsecurity.io/case-studies/chainguard)
 - [Kapiche secures their GitHub Actions software supply chain with Harden-Runner](https://www.stepsecurity.io/case-studies/kapiche)
 - [Arcjet Enhances CI/CD Security with Harden-Runner](https://www.stepsecurity.io/case-studies/arcjet)
 

action.yml

@@ -17,7 +17,11 @@ inputs:
     required: false
     default: "false"
   disable-sudo:
-    description: "Disable sudo access for the runner account"
+    description: "Disable sudo access for the runner account. Note: This parameter will be deprecated in the future. Please use disable-sudo-and-containers instead."
+    required: false
+    default: "false"
+  disable-sudo-and-containers:
+    description: "Disable sudo and container access for the runner account"
     required: false
     default: "false"
   disable-file-monitoring:

docs/limitations.md

@@ -3,7 +3,7 @@
 ### GitHub-Hosted Runners
 
 * Only Ubuntu VM is supported. Windows and MacOS GitHub-hosted runners are not supported. There is a discussion about that [here](https://github.com/step-security/harden-runner/discussions/121).
-* Harden-Runner is not supported when [job is run in a container](https://docs.github.com/en/actions/using-jobs/running-jobs-in-a-container) as it needs sudo access on the Ubuntu VM to run. It can be used to monitor jobs that use containers to run steps. The limitation is if the entire job is run in a container. That is not common for GitHub Actions workflows, as most of them run directly on `ubuntu-latest`. Note: This is not a limitation for Self-Hosted runners.
+* Harden-Runner is not supported when [job is run in a container](https://docs.github.com/en/actions/using-jobs/running-jobs-in-a-container) with built-in labels such as `ubuntu-latest`, as it needs sudo access on the Ubuntu VM to run. The limitation is if the entire job is run in a container. However, such jobs can be monitored when using custom VM images with GitHub-hosted runners. This is also not a limitation for Self-Hosted runners.
 
 ### Self-Hosted Actions Runner Controller (ARC) Runners
 

package.json

@@ -26,7 +26,7 @@
     "@actions/cache": "^4.0.0",
     "@actions/core": "^1.5.0",
     "@actions/exec": "^1.1.0",
-    "@actions/github": "^5.0.0",
+    "@actions/github": "^6.0.1",
     "@actions/http-client": "^2.0.1",
     "@actions/tool-cache": "^1.7.1",
     "@babel/helpers": "^7.26.10",
@@ -40,7 +40,7 @@
     "@types/node": "^16.9.0",
     "@typescript-eslint/eslint-plugin": "^6.1.0",
     "@typescript-eslint/parser": "^6.1.0",
-    "@vercel/ncc": "^0.30.0",
+    "@vercel/ncc": "^0.38.3",
     "eslint": "^7.32.0",
     "eslint-config-google": "^0.14.0",
     "jest": "^29.3.1",

src/arc-runner.test.ts

@@ -1,9 +1,9 @@
-import { isArcRunner, sendAllowedEndpoints } from "./arc-runner";
+import { isARCRunner } from "./arc-runner";
 
 it("should correctly recognize arc based runner", async () => {
   process.env["GITHUB_ACTIONS_RUNNER_EXTRA_USER_AGENT"] =
     "actions-runner-controller/2.0.1";
 
-  let isArc: boolean = await isArcRunner();
+  let isArc: boolean = await isARCRunner();
   expect(isArc).toBe(true);
 });

src/arc-runner.ts

@@ -2,7 +2,7 @@ import * as cp from "child_process";
 import * as fs from "fs";
 import path from "path";
 
-export function isArcRunner(): boolean {
+export function isARCRunner(): boolean {
   const runnerUserAgent = process.env["GITHUB_ACTIONS_RUNNER_EXTRA_USER_AGENT"];
 
   let isARC = false;
@@ -18,23 +18,33 @@ export function isArcRunner(): boolean {
 
 function isSecondaryPod(): boolean {
   const workDir = "/__w";
-  return fs.existsSync(workDir);
+  let hasKubeEnv = process.env["KUBERNETES_PORT"] !== undefined;
+  return fs.existsSync(workDir) && hasKubeEnv;
 }
 
 export function sendAllowedEndpoints(endpoints: string): void {
+  const startTime = Date.now();
   const allowedEndpoints = endpoints.split(" "); // endpoints are space separated
 
-  for (const endpoint of allowedEndpoints) {
-    if (endpoint) {
+  let sent = 0;
+  for (let endpoint of allowedEndpoints) {
+    endpoint = endpoint.trim();
+    if (endpoint.length > 0) {
       let encodedEndpoint = Buffer.from(endpoint).toString("base64");
       let endpointPolicyStr = `step_policy_endpoint_${encodedEndpoint}`;
       echo(endpointPolicyStr);
+      sent++;
     }
   }
 
-  if (allowedEndpoints.length > 0) {
-    applyPolicy(allowedEndpoints.length);
+  if (sent > 0) {
+    applyPolicy(sent);
   }
+
+  const duration = Date.now() - startTime;
+  console.log(
+    `[harden-runner] sendAllowedEndpoints completed in ${duration}ms (sent ${sent} endpoints)`
+  );
 }
 
 function applyPolicy(count: number): void {

src/checksum.ts

@@ -4,11 +4,11 @@ import * as fs from "fs";
 
 const CHECKSUMS = {
   tls: {
-    amd64: "38e7ed97ced6fe0c1cf0fb5ee3b3d521dfe28d5ddf1cdca72d130c8d1b4a314e", // v1.4.2
-    arm64: "f67c80cc578c996d4f882c14fcdb63df57927d907cd22f1ec65f9fa940c08cf3",
+    amd64: "2a5be06ab620340f6957ddd180450caab414671c8b7da1996d8e2755c1cd49fa", // v1.7.9
+    arm64: "e9d0ccf3e4e62ba15ff208ef6e0afa0ad5e323c3dfc50527342f436a85e65a55",
   },
   non_tls: {
-    amd64: "a9f1842e3d7f3d38c143dbe8ffe1948e6c8173cd04da072d9f9d128bb400844a", // v0.13.7
+    amd64: "336093af8ebe969567b66fd035af3bd4f7e1c723ce680d6b4b5b2a1f79bc329e", // v0.14.2
   },
 };
 

src/cleanup.ts

@@ -2,11 +2,18 @@ import * as fs from "fs";
 import * as cp from "child_process";
 import * as common from "./common";
 import isDocker from "is-docker";
-import { isArcRunner } from "./arc-runner";
+import { isARCRunner } from "./arc-runner";
 import { isGithubHosted } from "./tls-inspect";
+import { context } from "@actions/github";
 (async () => {
   console.log("[harden-runner] post-step");
 
+  const customProperties = context?.payload?.repository?.custom_properties || {};
+  if (customProperties["skip-harden-runner"] === "true") {
+    console.log("Skipping harden-runner: custom property 'skip-harden-runner' is set to 'true'");
+    return;
+  }
+
   if (process.platform !== "linux") {
     console.log(common.UBUNTU_MESSAGE);
     return;
@@ -16,7 +23,7 @@ import { isGithubHosted } from "./tls-inspect";
     return;
   }
 
-  if (isArcRunner()) {
+  if (isARCRunner()) {
     console.log(`[!] ${common.ARC_RUNNER_MESSAGE}`);
     return;
   }
@@ -25,6 +32,10 @@ import { isGithubHosted } from "./tls-inspect";
     return;
   }
 
+  if (process.env.STATE_customVMImage === "true") {
+    return;
+  }
+
   if (process.env.STATE_isTLS === "false" && process.arch === "arm64") {
     return;
   }
@@ -37,6 +48,11 @@ import { isGithubHosted } from "./tls-inspect";
     return;
   }
 
+  if (isGithubHosted() && fs.existsSync("/home/agent/post_event.json")) {
+    console.log("Post step already executed, skipping");
+    return;
+  }
+
   fs.writeFileSync(
     "/home/agent/post_event.json",
     JSON.stringify({ event: "post" })
@@ -81,12 +97,17 @@ import { isGithubHosted } from "./tls-inspect";
   }
 
   var disable_sudo = process.env.STATE_disableSudo;
-  if (disable_sudo !== "true") {
+  var disable_sudo_and_containers = process.env.STATE_disableSudoAndContainers;
+
+  if (disable_sudo !== "true" && disable_sudo_and_containers !== "true") {
     try {
-      var journalLog = cp.execSync("sudo journalctl -u agent.service --lines=1000", {
-        encoding: "utf8",
-        maxBuffer: 1024 * 1024 * 10 // 10MB buffer
-      });
+      var journalLog = cp.execSync(
+        "sudo journalctl -u agent.service --lines=1000",
+        {
+          encoding: "utf8",
+          maxBuffer: 1024 * 1024 * 10, // 10MB buffer
+        }
+      );
       console.log("agent.service log:");
       console.log(journalLog);
     } catch (error) {

src/common.ts

@@ -1,6 +1,6 @@
 import * as core from "@actions/core";
 import * as fs from "fs";
-import { STEPSECURITY_WEB_URL } from "./configs";
+import { STEPSECURITY_API_URL, STEPSECURITY_WEB_URL } from "./configs";
 
 export function printInfo(web_url) {
   console.log(
@@ -59,14 +59,12 @@ export async function addSummary() {
     return;
   }
 
-  const web_url = STEPSECURITY_WEB_URL;
-  const insights_url = `${web_url}/github/${process.env["GITHUB_REPOSITORY"]}/actions/runs/${process.env["GITHUB_RUN_ID"]}`;
-
-  const log = "/home/agent/agent.log";
-  if (!fs.existsSync(log)) {
+  const correlation_id = process.env.STATE_correlation_id;
+  if (!correlation_id) {
     return;
   }
 
+
   let needsSubscription = false;
   try {
     let data = fs.readFileSync("/home/agent/annotation.log", "utf8");
@@ -96,85 +94,45 @@ export async function addSummary() {
     return;
   }
 
-  const content = fs.readFileSync(log, "utf-8");
-  const lines = content.split("\n");
-
-  let tableEntries = [];
-
-  for (const line of lines) {
-    processLogLine(line, tableEntries);
-  }
-
-  if (tableEntries.length === 0) {
+  // Extract owner and repo from GITHUB_REPOSITORY (format: owner/repo)
+  const [owner, repo] = process.env["GITHUB_REPOSITORY"]?.split("/") || [];
+  const run_id = process.env["GITHUB_RUN_ID"];
+  
+  if (!owner || !repo || !run_id || !correlation_id) {
     return;
   }
 
-  const insightsRow = `<p><b><a href="${insights_url}">📄 View Full Report</a></b></p>`;
-
-  await core.summary.addSeparator().addRaw(`<h2>🛡 StepSecurity Report</h2>`);
-
-  tableEntries.sort((a, b) => {
-    if (a.status === "❌ Blocked" && b.status !== "❌ Blocked") {
-      return -1;
-    } else if (a.status !== "❌ Blocked" && b.status === "❌ Blocked") {
-      return 1;
-    } else {
-      return 0;
+  // Fetch job summary from API
+  const apiUrl = `${STEPSECURITY_API_URL}/github/${owner}/${repo}/actions/runs/${run_id}/correlation/${correlation_id}/job-markdown-summary`;
+  
+  try {
+    const response = await fetch(apiUrl);
+    if (!response.ok) {
+      console.error(`Failed to fetch job summary: ${response.status} ${response.statusText}`);
+      return;
     }
-  });
-
-  tableEntries = tableEntries.slice(0, 3);
-
-  await core.summary.addRaw(`
-  <blockquote>
-  <p>Preview of the outbound network calls during this workflow run.</p></blockquote>
-  <h3>Network Calls</h3>
-  <table>
-    <thead>
-      <tr>
-        <th>Process</th>
-        <th>Destination</th>
-        <th>Status</th>
-      </tr>
-    </thead>
-    <tbody>
-      ${tableEntries
-        .map(
-          (entry) => `<tr>
-          <td><code>${entry.process}</code></td>
-          <td>${entry.domain.replace(/\.$/, "")}</td>
-          <td>${entry.status}</td>
-        </tr>`
-        )
-        .join("")}
-      <tr>
-        <td><code>...</code></td>
-        <td><code>...</code></td>
-        <td><code>...</code></td>
-      </tr>
-    </tbody>
-  </table>
-  ${insightsRow}
-`);
-
-  await core.summary
-    .addRaw(
-      `<p><i>Markdown generated by the <a href="https://github.com/step-security/harden-runner">Harden-Runner GitHub Action</a>.</i></p>`
-    )
-    .addSeparator()
-    .write();
+    
+    const markdownSummary = await response.text();
+    
+    // Render the markdown summary using core.summary.addRaw
+    await core.summary.addRaw(markdownSummary).write();
+    return;
+  } catch (error) {
+    console.error(`Error fetching job summary: ${error}`);
+    return;
+  }
 }
 
 export const STATUS_HARDEN_RUNNER_UNAVAILABLE = "409";
 
 export const CONTAINER_MESSAGE =
-  "This job is running in a container. Harden Runner does not run in a container as it needs sudo access to run. This job will not be monitored.";
+  "This job is running in a container. Such jobs can be monitored by installing Harden Runner in a custom VM image for GitHub-hosted runners.";
 
 export const UBUNTU_MESSAGE =
   "This job is not running in a GitHub Actions Hosted Runner Ubuntu VM. Harden Runner is only supported on Ubuntu VM. This job will not be monitored.";
 
-export const SELF_HOSTED_NO_AGENT_MESSAGE =
-  "This job is running on a self-hosted runner, but the runner does not have Harden-Runner installed. This job will not be monitored.";
+export const SELF_HOSTED_RUNNER_MESSAGE =
+  "This job is running on a self-hosted runner.";
 
 export const HARDEN_RUNNER_UNAVAILABLE_MESSAGE =
   "Sorry, we are currently experiencing issues with the Harden Runner installation process. It is currently unavailable.";

src/index.ts

@@ -3,9 +3,16 @@ import * as core from "@actions/core";
 import isDocker from "is-docker";
 import { STEPSECURITY_WEB_URL } from "./configs";
 import { isGithubHosted } from "./tls-inspect";
+import { context } from "@actions/github";
 (async () => {
   console.log("[harden-runner] main-step");
 
+  const customProperties = context?.payload?.repository?.custom_properties || {};
+  if (customProperties["skip-harden-runner"] === "true") {
+    console.log("Skipping harden-runner: custom property 'skip-harden-runner' is set to 'true'");
+    return;
+  }
+
   if (process.platform !== "linux") {
     console.log(common.UBUNTU_MESSAGE);
     return;

src/install-agent.ts

@@ -25,7 +25,9 @@ export async function installAgent(
 
   if (isTLS) {
     downloadPath = await tc.downloadTool(
-      `https://packages.stepsecurity.io/github-hosted/harden-runner_1.4.2_linux_${variant}.tar.gz`
+      `https://github.com/step-security/agent-ebpf/releases/download/v1.7.9/harden-runner_1.7.9_linux_${variant}.tar.gz`,
+      undefined,
+      auth
     );
   } else {
     if (variant === "arm64") {
@@ -33,7 +35,7 @@ export async function installAgent(
       return false;
     }
     downloadPath = await tc.downloadTool(
-      "https://github.com/step-security/agent/releases/download/v0.13.7/agent_0.13.7_linux_amd64.tar.gz",
+      "https://github.com/step-security/agent/releases/download/v0.14.2/agent_0.14.2_linux_amd64.tar.gz",
       undefined,
       auth
     );

src/interfaces.ts

@@ -8,6 +8,7 @@ export interface Configuration {
   egress_policy: string;
   disable_telemetry: boolean;
   disable_sudo: boolean;
+  disable_sudo_and_containers: boolean;
   disable_file_monitoring: boolean;
   is_github_hosted: boolean;
   private: string;
@@ -20,6 +21,7 @@ export interface PolicyResponse {
   policyName?: string;
   allowed_endpoints?: string[];
   disable_sudo?: boolean;
+  disable_sudo_and_containers?: boolean;
   disable_file_monitoring?: boolean;
   disable_telemetry?: boolean;
   egress_policy?: string;

src/policy-utils.test.ts

@@ -36,6 +36,7 @@ test("merge configs", async () => {
     egress_policy: "audit",
     disable_telemetry: false,
     disable_sudo: false,
+    disable_sudo_and_containers: false,
     disable_file_monitoring: false,
     private: "true",
     is_github_hosted: true,
@@ -62,6 +63,7 @@ test("merge configs", async () => {
     egress_policy: "audit",
     disable_telemetry: false,
     disable_sudo: false,
+    disable_sudo_and_containers: false,
     disable_file_monitoring: false,
     private: "true",
     is_github_hosted: true,

src/policy-utils.ts

@@ -39,7 +39,12 @@ export async function fetchPolicy(
   }
 
   if (response === undefined && err !== undefined) {
-    throw new Error(`[Policy Fetch] ${err}`);
+    // Preserve the original error's statusCode if it exists
+    const error = new Error(`[Policy Fetch] ${err}`);
+    if (err.statusCode !== undefined) {
+      (error as any).statusCode = err.statusCode;
+    }
+    throw error;
   } else {
     return response.result;
   }
@@ -56,6 +61,10 @@ export function mergeConfigs(
     localConfig.disable_sudo = remoteConfig.disable_sudo;
   }
 
+  if (remoteConfig.disable_sudo_and_containers !== undefined) {
+    localConfig.disable_sudo_and_containers = remoteConfig.disable_sudo_and_containers;
+  }
+
   if (remoteConfig.disable_file_monitoring !== undefined) {
     localConfig.disable_file_monitoring = remoteConfig.disable_file_monitoring;
   }
@@ -66,7 +75,7 @@ export function mergeConfigs(
   return localConfig;
 }
 
-function sleep(ms) {
+function sleep(ms: number) {
   return new Promise((resolve) => {
     setTimeout(resolve, ms);
   });

src/setup.ts

@@ -24,7 +24,7 @@ import { GetCacheEntryDownloadURLRequest } from "@actions/cache/lib/generated/re
 import { getCacheServiceVersion } from "@actions/cache/lib/internal/config";
 
 import * as utils from "@actions/cache/lib/internal/cacheUtils";
-import { isArcRunner, sendAllowedEndpoints } from "./arc-runner";
+import { isARCRunner, sendAllowedEndpoints } from "./arc-runner";
 import { STEPSECURITY_API_URL, STEPSECURITY_WEB_URL } from "./configs";
 import { isGithubHosted, isTLSEnabled } from "./tls-inspect";
 import { installAgent } from "./install-agent";
@@ -39,6 +39,12 @@ interface MonitorResponse {
   try {
     console.log("[harden-runner] pre-step");
 
+    const customProperties = context?.payload?.repository?.custom_properties || {};
+    if (customProperties["skip-harden-runner"] === "true") {
+      console.log("Skipping harden-runner: custom property 'skip-harden-runner' is set to 'true'");
+      return;
+    }
+
     if (process.platform !== "linux") {
       console.log(common.UBUNTU_MESSAGE);
       return;
@@ -62,9 +68,12 @@ interface MonitorResponse {
       egress_policy: core.getInput("egress-policy"),
       disable_telemetry: core.getBooleanInput("disable-telemetry"),
       disable_sudo: core.getBooleanInput("disable-sudo"),
+      disable_sudo_and_containers: core.getBooleanInput(
+        "disable-sudo-and-containers"
+      ),
       disable_file_monitoring: core.getBooleanInput("disable-file-monitoring"),
       private: context?.payload?.repository?.private || false,
-      is_github_hosted: true,
+      is_github_hosted: isGithubHosted(),
       is_debug: core.isDebug(),
       one_time_key: "",
     };
@@ -82,7 +91,18 @@ interface MonitorResponse {
         confg = mergeConfigs(confg, result);
       } catch (err) {
         core.info(`[!] ${err}`);
-        core.setFailed(err);
+        // Only fail the job if ID token is not available
+        if (err.message && err.message.includes('Unable to get ACTIONS_ID_TOKEN_REQUEST')) {
+          core.setFailed('Policy store requires id-token write permission as it uses OIDC to fetch the policy from StepSecurity API. Please add "id-token: write" to your job permissions.');
+        } else {
+          // Handle different HTTP status codes
+          if (err.statusCode >= 400 && err.statusCode < 500) {
+            core.error('Policy not found');
+          } else {
+            core.error(`Unexpected error occurred: ${err}. Falling back to egress policy audit`);
+            confg.egress_policy = 'audit';
+          }
+        }
       }
     }
     fs.appendFileSync(
@@ -92,6 +112,13 @@ interface MonitorResponse {
         encoding: "utf8",
       }
     );
+    fs.appendFileSync(
+      process.env.GITHUB_STATE,
+      `disableSudoAndContainers=${confg.disable_sudo_and_containers}${EOL}`,
+      {
+        encoding: "utf8",
+      }
+    );
     core.info(`[!] Current Configuration: \n${JSON.stringify(confg)}\n`);
 
     if (confg.egress_policy !== "audit" && confg.egress_policy !== "block") {
@@ -197,7 +224,7 @@ interface MonitorResponse {
       common.printInfo(web_url);
     }
 
-    if (isArcRunner()) {
+    if (isARCRunner()) {
       console.log(`[!] ${common.ARC_RUNNER_MESSAGE}`);
       if (confg.egress_policy === "block") {
         sendAllowedEndpoints(confg.allowed_endpoints);
@@ -208,32 +235,41 @@ interface MonitorResponse {
 
     const runnerName = process.env.RUNNER_NAME || "";
     core.info(`RUNNER_NAME: ${runnerName}`);
-    /*if (!isGithubHosted()) {
+    if (!isGithubHosted()) {
       fs.appendFileSync(process.env.GITHUB_STATE, `selfHosted=true${EOL}`, {
         encoding: "utf8",
       });
-      if (!fs.existsSync("/home/agent/agent")) {
-        core.info(common.SELF_HOSTED_NO_AGENT_MESSAGE);
-        return;
-      }
-      if (confg.egress_policy === "block") {
-        try {
-          if (process.env.USER) {
-            chownForFolder(process.env.USER, "/home/agent");
-          }
 
-          const confgStr = JSON.stringify(confg);
-          fs.writeFileSync("/home/agent/block_event.json", confgStr);
-          await sleep(5000);
-        } catch (error) {
-          core.info(`[!] Unable to write block_event.json: ${error}`);
-        }
+      core.info(common.SELF_HOSTED_RUNNER_MESSAGE);
+
+      if (confg.egress_policy === "block") {
+        sendAllowedEndpoints(confg.allowed_endpoints);
+        await sleep(5000);
       }
       return;
-    }*/
+    }
+
+    if (isGithubHosted() && process.env.STEP_SECURITY_HARDEN_RUNNER === "true") {
+      fs.appendFileSync(process.env.GITHUB_STATE, `customVMImage=true${EOL}`, {
+        encoding: "utf8",
+      });
+
+      core.info("This job is running on a custom VM image with Harden Runner installed.");
+
+      if (confg.egress_policy === "block") {
+        sendAllowedEndpoints(confg.allowed_endpoints);
+        await sleep(5000);
+      }
+      return;
+    }
+
+    if (isGithubHosted() && fs.existsSync("/home/agent/agent.status")) {
+      console.log("Agent already installed, skipping installation");
+      return;
+    }
 
     let _http = new httpm.HttpClient();
-    let statusCode;
+    let statusCode: number | undefined;
     _http.requestOptions = { socketTimeout: 3 * 1000 };
     let addSummary = "false";
     try {
@@ -271,6 +307,13 @@ interface MonitorResponse {
         encoding: "utf8",
       }
     );
+    fs.appendFileSync(
+      process.env.GITHUB_STATE,
+      `correlation_id=${correlation_id}${EOL}`,
+      {
+        encoding: "utf8",
+      }
+    );
 
     console.log(`Step Security Job Correlation ID: ${correlation_id}`);
     if (String(statusCode) === common.STATUS_HARDEN_RUNNER_UNAVAILABLE) {
@@ -319,7 +362,7 @@ interface MonitorResponse {
   process.exit(0);
 })();
 
-export function sleep(ms) {
+export function sleep(ms: number) {
   return new Promise((resolve) => {
     setTimeout(resolve, ms);
   });