test jwks with proxy

Signed-off-by: Brian DeHamer <bdehamer@github.com>

.github/workflows/linter.yml

@@ -46,5 +46,4 @@ jobs:
           TYPESCRIPT_DEFAULT_STYLE: prettier
           VALIDATE_ALL_CODEBASE: true
           VALIDATE_JAVASCRIPT_STANDARD: false
-          VALIDATE_TYPESCRIPT_STANDARD: false
           VALIDATE_JSCPD: false

README.md

@@ -77,10 +77,6 @@ See [action.yml](action.yml)
     # the "subject-digest" parameter be specified. Defaults to false.
     push-to-registry:
 
-    # Whether to attach a list of generated attestations to the workflow run
-    # summary page. Defaults to true.
-    show-summary:
-
     # The GitHub token used to make authenticated API requests. Default is
     # ${{ github.token }}
     github-token:

__tests__/__snapshots__/main.test.ts.snap

@@ -1,45 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`main when a non-default OIDC issuer is used successfully run main 1`] = `
-{
-  "buildDefinition": {
-    "buildType": "https://actions.github.io/buildtypes/workflow/v1",
-    "externalParameters": {
-      "workflow": {
-        "path": ".github/workflows/main.yml",
-        "ref": "main",
-        "repository": "https://example-01.ghe.com/owner/repo",
-      },
-    },
-    "internalParameters": {
-      "github": {
-        "event_name": "push",
-        "repository_id": "repo-id",
-        "repository_owner_id": "owner-id",
-        "runner_environment": "github-hosted",
-      },
-    },
-    "resolvedDependencies": [
-      {
-        "digest": {
-          "gitCommit": "babca52ab0c93ae16539e5923cb0d7403b9a093b",
-        },
-        "uri": "git+https://example-01.ghe.com/owner/repo@refs/heads/main",
-      },
-    ],
-  },
-  "runDetails": {
-    "builder": {
-      "id": "https://example-01.ghe.com/owner/shared/.github/workflows/build.yml@main",
-    },
-    "metadata": {
-      "invocationId": "https://example-01.ghe.com/owner/repo/actions/runs/run-id/attempts/run-attempt",
-    },
-  },
-}
-`;
-
-exports[`main when the default OIDC issuer is used successfully run main 1`] = `
+exports[`main successfully run main 1`] = `
 {
   "buildDefinition": {
     "buildType": "https://actions.github.io/buildtypes/workflow/v1",

__tests__/main.test.ts

@@ -13,13 +13,61 @@ setFailedMock.mockImplementation(() => {})
 describe('main', () => {
   let outputs = {} as Record<string, string>
   const originalEnv = process.env
+  const issuer = 'https://token.actions.githubusercontent.com'
+  const audience = 'nobody'
+  const jwksPath = '/.well-known/jwks.json'
+  const tokenPath = '/token'
 
-  beforeEach(() => {
+  const claims = {
+    iss: issuer,
+    aud: 'nobody',
+    repository: 'owner/repo',
+    ref: 'refs/heads/main',
+    sha: 'babca52ab0c93ae16539e5923cb0d7403b9a093b',
+    workflow_ref: 'owner/repo/.github/workflows/main.yml@main',
+    job_workflow_ref: 'owner/shared/.github/workflows/build.yml@main',
+    event_name: 'push',
+    repository_id: 'repo-id',
+    repository_owner_id: 'owner-id',
+    run_id: 'run-id',
+    run_attempt: 'run-attempt',
+    runner_environment: 'github-hosted'
+  }
+
+  beforeEach(async () => {
     jest.resetAllMocks()
 
     setOutputMock.mockImplementation((key, value) => {
       outputs[key] = value
     })
+
+    process.env = {
+      ...originalEnv,
+      ACTIONS_ID_TOKEN_REQUEST_URL: `${issuer}${tokenPath}?`,
+      ACTIONS_ID_TOKEN_REQUEST_TOKEN: 'token',
+      GITHUB_SERVER_URL: 'https://github.com',
+      GITHUB_REPOSITORY: claims.repository
+    }
+
+    // Generate JWT signing key
+    const key = await jose.generateKeyPair('PS256')
+
+    // Create JWK, JWKS, and JWT
+    const kid = '12345'
+    const jwk = await jose.exportJWK(key.publicKey)
+    const jwks = { keys: [{ ...jwk, kid }] }
+    const jwt = await new jose.SignJWT(claims)
+      .setProtectedHeader({ alg: 'PS256', kid })
+      .sign(key.privateKey)
+
+    // Mock OpenID configuration and JWKS endpoints
+    nock(issuer)
+      .get('/.well-known/openid-configuration')
+      .reply(200, { jwks_uri: `${issuer}${jwksPath}` })
+    nock(issuer).get(jwksPath).reply(200, jwks)
+
+    // Mock OIDC token endpoint for populating the provenance
+    nock(issuer).get(tokenPath).query({ audience }).reply(200, { value: jwt })
   })
 
   afterEach(() => {
@@ -27,131 +75,14 @@ describe('main', () => {
     process.env = originalEnv
   })
 
-  describe('when the default OIDC issuer is used', () => {
-    const issuer = 'https://token.actions.githubusercontent.com'
-    const audience = 'nobody'
-    const jwksPath = '/.well-known/jwks.json'
-    const tokenPath = '/token'
+  it('successfully run main', async () => {
+    // Run the main function
+    await main.run()
 
-    const claims = {
-      iss: issuer,
-      aud: 'nobody',
-      repository: 'owner/repo',
-      ref: 'refs/heads/main',
-      sha: 'babca52ab0c93ae16539e5923cb0d7403b9a093b',
-      workflow_ref: 'owner/repo/.github/workflows/main.yml@main',
-      job_workflow_ref: 'owner/shared/.github/workflows/build.yml@main',
-      event_name: 'push',
-      repository_id: 'repo-id',
-      repository_owner_id: 'owner-id',
-      run_id: 'run-id',
-      run_attempt: 'run-attempt',
-      runner_environment: 'github-hosted'
-    }
+    // Verify that outputs were set correctly
+    expect(setOutputMock).toHaveBeenCalledTimes(2)
 
-    beforeEach(async () => {
-      process.env = {
-        ...originalEnv,
-        ACTIONS_ID_TOKEN_REQUEST_URL: `${issuer}${tokenPath}?`,
-        ACTIONS_ID_TOKEN_REQUEST_TOKEN: 'token',
-        GITHUB_SERVER_URL: 'https://github.com',
-        GITHUB_REPOSITORY: claims.repository
-      }
-
-      // Generate JWT signing key
-      const key = await jose.generateKeyPair('PS256')
-
-      // Create JWK, JWKS, and JWT
-      const kid = '12345'
-      const jwk = await jose.exportJWK(key.publicKey)
-      const jwks = { keys: [{ ...jwk, kid }] }
-      const jwt = await new jose.SignJWT(claims)
-        .setProtectedHeader({ alg: 'PS256', kid })
-        .sign(key.privateKey)
-
-      // Mock OpenID configuration and JWKS endpoints
-      nock(issuer)
-        .get('/.well-known/openid-configuration')
-        .reply(200, { jwks_uri: `${issuer}${jwksPath}` })
-      nock(issuer).get(jwksPath).reply(200, jwks)
-
-      // Mock OIDC token endpoint for populating the provenance
-      nock(issuer).get(tokenPath).query({ audience }).reply(200, { value: jwt })
-    })
-
-    it('successfully run main', async () => {
-      // Run the main function
-      await main.run()
-
-      // Verify that outputs were set correctly
-      expect(setOutputMock).toHaveBeenCalledTimes(2)
-
-      expect(outputs['predicate']).toMatchSnapshot()
-      expect(outputs['predicate-type']).toBe('https://slsa.dev/provenance/v1')
-    })
-  })
-
-  describe('when a non-default OIDC issuer is used', () => {
-    const issuer = 'https://token.actions.example-01.ghe.com'
-    const audience = 'nobody'
-    const jwksPath = '/.well-known/jwks.json'
-    const tokenPath = '/token'
-
-    const claims = {
-      iss: issuer,
-      aud: 'nobody',
-      repository: 'owner/repo',
-      ref: 'refs/heads/main',
-      sha: 'babca52ab0c93ae16539e5923cb0d7403b9a093b',
-      workflow_ref: 'owner/repo/.github/workflows/main.yml@main',
-      job_workflow_ref: 'owner/shared/.github/workflows/build.yml@main',
-      event_name: 'push',
-      repository_id: 'repo-id',
-      repository_owner_id: 'owner-id',
-      run_id: 'run-id',
-      run_attempt: 'run-attempt',
-      runner_environment: 'github-hosted'
-    }
-
-    beforeEach(async () => {
-      process.env = {
-        ...originalEnv,
-        ACTIONS_ID_TOKEN_REQUEST_URL: `${issuer}${tokenPath}?`,
-        ACTIONS_ID_TOKEN_REQUEST_TOKEN: 'token',
-        GITHUB_SERVER_URL: 'https://example-01.ghe.com',
-        GITHUB_REPOSITORY: claims.repository
-      }
-
-      // Generate JWT signing key
-      const key = await jose.generateKeyPair('PS256')
-
-      // Create JWK, JWKS, and JWT
-      const kid = '12345'
-      const jwk = await jose.exportJWK(key.publicKey)
-      const jwks = { keys: [{ ...jwk, kid }] }
-      const jwt = await new jose.SignJWT(claims)
-        .setProtectedHeader({ alg: 'PS256', kid })
-        .sign(key.privateKey)
-
-      // Mock OpenID configuration and JWKS endpoints
-      nock(issuer)
-        .get('/.well-known/openid-configuration')
-        .reply(200, { jwks_uri: `${issuer}${jwksPath}` })
-      nock(issuer).get(jwksPath).reply(200, jwks)
-
-      // Mock OIDC token endpoint for populating the provenance
-      nock(issuer).get(tokenPath).query({ audience }).reply(200, { value: jwt })
-    })
-
-    it('successfully run main', async () => {
-      // Run the main function
-      await main.run()
-
-      // Verify that outputs were set correctly
-      expect(setOutputMock).toHaveBeenCalledTimes(2)
-
-      expect(outputs['predicate']).toMatchSnapshot()
-      expect(outputs['predicate-type']).toBe('https://slsa.dev/provenance/v1')
-    })
+    expect(outputs['predicate']).toMatchSnapshot()
+    expect(outputs['predicate-type']).toBe('https://slsa.dev/provenance/v1')
   })
 })

action.yml

@@ -30,12 +30,6 @@ inputs:
       and that the "subject-digest" parameter be specified. Defaults to false.
     default: false
     required: false
-  show-summary:
-    description: >
-      Whether to attach a list of generated attestations to the workflow run
-      summary page. Defaults to true.
-    default: true
-    required: false
   github-token:
     description: >
       The GitHub token used to make authenticated API requests.
@@ -50,9 +44,9 @@ outputs:
 runs:
   using: 'composite'
   steps:
-    - uses: actions/attest-build-provenance/predicate@9ff3713ef183e028b07415e8a740b634c054a663 # predicate@1.1.1
+    - uses: actions/attest-build-provenance/predicate@test
       id: generate-build-provenance-predicate
-    - uses: actions/attest@2da0b136720d14f01f4dbeeafd1d5a4d76cbe21d # v1.4.0
+    - uses: actions/attest@7305951e905fb742188aa16c1d23409b13565e26 # v1.3.3
       id: attest
       with:
         subject-path: ${{ inputs.subject-path }}
@@ -61,5 +55,4 @@ runs:
         predicate-type: ${{ steps.generate-build-provenance-predicate.outputs.predicate-type }}
         predicate: ${{ steps.generate-build-provenance-predicate.outputs.predicate }}
         push-to-registry: ${{ inputs.push-to-registry }}
-        show-summary: ${{ inputs.show-summary }}
         github-token: ${{ inputs.github-token }}

dist/licenses.txt

@@ -2389,7 +2389,7 @@ supports-color
 MIT
 MIT License
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "actions/attest-build-provenance",
   "description": "Generate signed build provenance attestations",
-  "version": "1.1.2",
+  "version": "1.1.0",
   "author": "",
   "private": true,
   "homepage": "https://github.com/actions/attest-build-provenance",
@@ -70,18 +70,18 @@
     ]
   },
   "dependencies": {
-    "@actions/attest": "^1.3.1",
+    "@actions/attest": "file:../toolkit/packages/attest",
     "@actions/core": "^1.10.1"
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
-    "@types/node": "^22.1.0",
+    "@types/node": "^22.0.0",
     "@typescript-eslint/eslint-plugin": "^7.17.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@typescript-eslint/parser": "^7.17.0",
     "@vercel/ncc": "^0.38.1",
     "eslint": "^8.57.0",
     "eslint-plugin-github": "^5.0.1",
-    "eslint-plugin-jest": "^28.7.0",
+    "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-jsonc": "^2.16.0",
     "eslint-plugin-prettier": "^5.2.1",
     "jest": "^29.7.0",
@@ -90,7 +90,7 @@
     "nock": "^13.5.4",
     "prettier": "^3.3.3",
     "prettier-eslint": "^16.3.0",
-    "ts-jest": "^29.2.4",
+    "ts-jest": "^29.2.3",
     "typescript": "^5.5.4"
   }
 }

src/main.ts

@@ -1,21 +1,14 @@
 import { buildSLSAProvenancePredicate } from '@actions/attest'
 import * as core from '@actions/core'
 
-const VALID_SERVER_URLS = [
-  'https://github.com',
-  new RegExp('^https://[a-z0-9-]+\\.ghe\\.com$')
-] as const
-
 /**
  * The main function for the action.
  * @returns {Promise<void>} Resolves when the action is complete.
  */
 export async function run(): Promise<void> {
   try {
-    const issuer = getIssuer()
-
     // Calculate subject from inputs and generate provenance
-    const predicate = await buildSLSAProvenancePredicate(issuer)
+    const predicate = await buildSLSAProvenancePredicate()
 
     core.setOutput('predicate', predicate.params)
     core.setOutput('predicate-type', predicate.type)
@@ -25,21 +18,3 @@ export async function run(): Promise<void> {
     core.setFailed(error.message)
   }
 }
-
-// Derive the current OIDC issuer based on the server URL
-function getIssuer(): string {
-  const serverURL = process.env.GITHUB_SERVER_URL || 'https://github.com'
-
-  // Ensure the server URL is a valid GitHub server URL
-  if (!VALID_SERVER_URLS.some(valid_url => serverURL.match(valid_url))) {
-    throw new Error(`Invalid server URL: ${serverURL}`)
-  }
-
-  let host = new URL(serverURL).hostname
-
-  if (host === 'github.com') {
-    host = 'githubusercontent.com'
-  }
-
-  return `https://token.actions.${host}`
-}