fix test

.github/workflows/audit.yml

@@ -32,7 +32,7 @@ jobs:
       run: npm run bootstrap
 
     - name: audit tools (without allow-list)
-      run: npm audit --audit-level=moderate --omit dev
+      run: npm audit --audit-level=moderate
 
     - name: audit packages
       run: npm run audit-all

.github/workflows/releases.yml

@@ -1,7 +1,5 @@
 name: Publish NPM
 
-run-name: Publish NPM - ${{ github.event.inputs.package }}
-
 on:
   workflow_dispatch:
     inputs:

packages/attest/README.md

@@ -63,8 +63,6 @@ export type AttestOptions = {
   // Sigstore instance to use for signing. Must be one of "public-good" or
   // "github".
   sigstore?: 'public-good' | 'github'
-  // HTTP headers to include in request to attestations API.
-  headers?: {[header: string]: string | number | undefined}
   // Whether to skip writing the attestation to the GH attestations API.
   skipWrite?: boolean
 }
@@ -115,8 +113,6 @@ export type AttestProvenanceOptions = {
   // Sigstore instance to use for signing. Must be one of "public-good" or
   // "github".
   sigstore?: 'public-good' | 'github'
-  // HTTP headers to include in request to attestations API.
-  headers?: {[header: string]: string | number | undefined}
   // Whether to skip writing the attestation to the GH attestations API.
   skipWrite?: boolean
   // Issuer URL responsible for minting the OIDC token from which the

packages/attest/RELEASES.md

@@ -1,36 +1,31 @@
 # @actions/attest Releases
 
-### 1.4.0
-
-- Add new `headers` parameter to the `attest` and `attestProvenance` functions [#1790](https://github.com/actions/toolkit/pull/1790)
-- Update `buildSLSAProvenancePredicate`/`attestProvenance` to automatically derive default OIDC issuer URL from current execution context [#1796](https://github.com/actions/toolkit/pull/1796)
-
 ### 1.3.1
 
-- Fix bug with proxy support when retrieving JWKS for OIDC issuer [#1776](https://github.com/actions/toolkit/pull/1776)
+- Fix bug with proxy support when retrieving JWKS for OIDC issuer
 
 ### 1.3.0
 
-- Dynamic construction of Sigstore API URLs [#1735](https://github.com/actions/toolkit/pull/1735)
+- Dynamic construction of Sigstore API URLs
-- Switch to new GH provenance build type [#1745](https://github.com/actions/toolkit/pull/1745)
+- Switch to new GH provenance build type
-- Fetch existing Rekor entry on 409 conflict error [#1759](https://github.com/actions/toolkit/pull/1759)
+- Fetch existing Rekor entry on 409 conflict error
-- Bump @sigstore/bundle from 2.3.0 to 2.3.2 [#1738](https://github.com/actions/toolkit/pull/1738)
+- Bump @sigstore/bundle from 2.3.0 to 2.3.2
-- Bump @sigstore/sign from 2.3.0 to 2.3.2 [#1738](https://github.com/actions/toolkit/pull/1738)
+- Bump @sigstore/sign from 2.3.0 to 2.3.2
 
 ### 1.2.1
 
-- Retry request on attestation persistence failure [#1725](https://github.com/actions/toolkit/pull/1725)
+- Retry request on attestation persistence failure
 
 ### 1.2.0
 
-- Generate attestations using the v0.3 Sigstore bundle format [#1701](https://github.com/actions/toolkit/pull/1701)
+- Generate attestations using the v0.3 Sigstore bundle format.
-- Bump @sigstore/bundle from 2.2.0 to 2.3.0 [#1701](https://github.com/actions/toolkit/pull/1701)
+- Bump @sigstore/bundle from 2.2.0 to 2.3.0.
-- Bump @sigstore/sign from 2.2.3 to 2.3.0 [#1701](https://github.com/actions/toolkit/pull/1701)
+- Bump @sigstore/sign from 2.2.3 to 2.3.0.
-- Remove dependency on make-fetch-happen [#1714](https://github.com/actions/toolkit/pull/1714)
+- Remove dependency on make-fetch-happen
 
 ### 1.1.0
 
-- Updates the `attestProvenance` function to retrieve a token from the GitHub OIDC provider and use the token claims to populate the provenance statement [#1693](https://github.com/actions/toolkit/pull/1693)
+- Updates the `attestProvenance` function to retrieve a token from the GitHub OIDC provider and use the token claims to populate the provenance statement.
 
 ### 1.0.0
 

packages/attest/__tests__/__snapshots__/provenance.test.ts.snap

@@ -9,7 +9,7 @@ exports[`provenance functions buildSLSAProvenancePredicate returns a provenance
         "workflow": {
           "path": ".github/workflows/main.yml",
           "ref": "main",
-          "repository": "https://foo.ghe.com/owner/repo",
+          "repository": "https://github.com/owner/repo",
         },
       },
       "internalParameters": {
@@ -25,16 +25,16 @@ exports[`provenance functions buildSLSAProvenancePredicate returns a provenance
           "digest": {
             "gitCommit": "babca52ab0c93ae16539e5923cb0d7403b9a093b",
           },
-          "uri": "git+https://foo.ghe.com/owner/repo@refs/heads/main",
+          "uri": "git+https://github.com/owner/repo@refs/heads/main",
         },
       ],
     },
     "runDetails": {
       "builder": {
-        "id": "https://foo.ghe.com/owner/workflows/.github/workflows/publish.yml@main",
+        "id": "https://github.com/owner/workflows/.github/workflows/publish.yml@main",
       },
       "metadata": {
-        "invocationId": "https://foo.ghe.com/owner/repo/actions/runs/run-id/attempts/run-attempt",
+        "invocationId": "https://github.com/owner/repo/actions/runs/run-id/attempts/run-attempt",
       },
     },
   },

packages/attest/__tests__/provenance.test.ts

@@ -8,7 +8,7 @@ import {attestProvenance, buildSLSAProvenancePredicate} from '../src/provenance'
 
 describe('provenance functions', () => {
   const originalEnv = process.env
-  const issuer = 'https://token.actions.foo.ghe.com'
+  const issuer = 'https://example.com'
   const audience = 'nobody'
   const jwksPath = '/.well-known/jwks.json'
   const tokenPath = '/token'
@@ -38,7 +38,7 @@ describe('provenance functions', () => {
       ...originalEnv,
       ACTIONS_ID_TOKEN_REQUEST_URL: `${issuer}${tokenPath}?`,
       ACTIONS_ID_TOKEN_REQUEST_TOKEN: 'token',
-      GITHUB_SERVER_URL: 'https://foo.ghe.com',
+      GITHUB_SERVER_URL: 'https://github.com',
       GITHUB_REPOSITORY: claims.repository
     }
 
@@ -68,7 +68,7 @@ describe('provenance functions', () => {
 
   describe('buildSLSAProvenancePredicate', () => {
     it('returns a provenance hydrated from an OIDC token', async () => {
-      const predicate = await buildSLSAProvenancePredicate()
+      const predicate = await buildSLSAProvenancePredicate(issuer)
       expect(predicate).toMatchSnapshot()
     })
   })
@@ -96,9 +96,9 @@ describe('provenance functions', () => {
     })
 
     describe('when using the github Sigstore instance', () => {
-      beforeEach(async () => {
+      const {fulcioURL, tsaServerURL} = signingEndpoints('github')
-        const {fulcioURL, tsaServerURL} = signingEndpoints('github')
 
+      beforeEach(async () => {
         // Mock Sigstore
         await mockFulcio({baseURL: fulcioURL, strict: false})
         await mockTSA({baseURL: tsaServerURL})
@@ -118,7 +118,8 @@ describe('provenance functions', () => {
             subjectName,
             subjectDigest,
             token: 'token',
-            sigstore: 'github'
+            sigstore: 'github',
+            issuer
           })
 
           expect(attestation).toBeDefined()
@@ -145,7 +146,8 @@ describe('provenance functions', () => {
           const attestation = await attestProvenance({
             subjectName,
             subjectDigest,
-            token: 'token'
+            token: 'token',
+            issuer
           })
 
           expect(attestation).toBeDefined()
@@ -181,7 +183,8 @@ describe('provenance functions', () => {
             subjectName,
             subjectDigest,
             token: 'token',
-            sigstore: 'public-good'
+            sigstore: 'public-good',
+            issuer
           })
 
           expect(attestation).toBeDefined()
@@ -208,7 +211,8 @@ describe('provenance functions', () => {
           const attestation = await attestProvenance({
             subjectName,
             subjectDigest,
-            token: 'token'
+            token: 'token',
+            issuer
           })
 
           expect(attestation).toBeDefined()
@@ -234,7 +238,8 @@ describe('provenance functions', () => {
           subjectDigest,
           token: 'token',
           sigstore: 'public-good',
-          skipWrite: true
+          skipWrite: true,
+          issuer
         })
 
         expect(attestation).toBeDefined()

packages/attest/__tests__/store.test.ts

@@ -5,7 +5,6 @@ describe('writeAttestation', () => {
   const originalEnv = process.env
   const attestation = {foo: 'bar '}
   const token = 'token'
-  const headers = {'X-GitHub-Foo': 'true'}
 
   const mockAgent = new MockAgent()
   setGlobalDispatcher(mockAgent)
@@ -28,16 +27,14 @@ describe('writeAttestation', () => {
         .intercept({
           path: '/repos/foo/bar/attestations',
           method: 'POST',
-          headers: {authorization: `token ${token}`, ...headers},
+          headers: {authorization: `token ${token}`},
           body: JSON.stringify({bundle: attestation})
         })
         .reply(201, {id: '123'})
     })
 
     it('persists the attestation', async () => {
-      await expect(
+      await expect(writeAttestation(attestation, token)).resolves.toEqual('123')
-        writeAttestation(attestation, token, {headers})
-      ).resolves.toEqual('123')
     })
   })
 

packages/attest/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@actions/attest",
-  "version": "1.4.0",
+  "version": "1.3.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@actions/attest",
-      "version": "1.4.0",
+      "version": "1.3.1",
       "license": "MIT",
       "dependencies": {
         "@actions/core": "^1.10.1",

packages/attest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/attest",
-  "version": "1.4.0",
+  "version": "1.3.1",
   "description": "Actions attestation lib",
   "keywords": [
     "github",

packages/attest/src/attest.ts

@@ -28,8 +28,6 @@ export type AttestOptions = {
   // Sigstore instance to use for signing. Must be one of "public-good" or
   // "github".
   sigstore?: SigstoreInstance
-  // HTTP headers to include in request to attestations API.
-  headers?: {[header: string]: string | number | undefined}
   // Whether to skip writing the attestation to the GH attestations API.
   skipWrite?: boolean
 }
@@ -63,11 +61,7 @@ export async function attest(options: AttestOptions): Promise<Attestation> {
   // Store the attestation
   let attestationID: string | undefined
   if (options.skipWrite !== true) {
-    attestationID = await writeAttestation(
+    attestationID = await writeAttestation(bundleToJSON(bundle), options.token)
-      bundleToJSON(bundle),
-      options.token,
-      {headers: options.headers}
-    )
   }
 
   return toAttestation(bundle, attestationID)

packages/attest/src/oidc.ts

@@ -4,11 +4,6 @@ import * as jose from 'jose'
 
 const OIDC_AUDIENCE = 'nobody'
 
-const VALID_SERVER_URLS = [
-  'https://github.com',
-  new RegExp('^https://[a-z0-9-]+\\.ghe\\.com$')
-] as const
-
 const REQUIRED_CLAIMS = [
   'iss',
   'ref',
@@ -30,8 +25,7 @@ type OIDCConfig = {
   jwks_uri: string
 }
 
-export const getIDTokenClaims = async (issuer?: string): Promise<ClaimSet> => {
+export const getIDTokenClaims = async (issuer: string): Promise<ClaimSet> => {
-  issuer = issuer || getIssuer()
   try {
     const token = await getIDToken(OIDC_AUDIENCE)
     const claims = await decodeOIDCToken(token, issuer)
@@ -88,21 +82,3 @@ function assertClaimSet(claims: jose.JWTPayload): asserts claims is ClaimSet {
     throw new Error(`Missing claims: ${missingClaims.join(', ')}`)
   }
 }
-
-// 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}`
-}

packages/attest/src/provenance.ts

@@ -5,6 +5,8 @@ import type {Attestation, Predicate} from './shared.types'
 const SLSA_PREDICATE_V1_TYPE = 'https://slsa.dev/provenance/v1'
 const GITHUB_BUILD_TYPE = 'https://actions.github.io/buildtypes/workflow/v1'
 
+const DEFAULT_ISSUER = 'https://token.actions.githubusercontent.com'
+
 export type AttestProvenanceOptions = Omit<
   AttestOptions,
   'predicate' | 'predicateType'
@@ -22,7 +24,7 @@ export type AttestProvenanceOptions = Omit<
  * @returns The SLSA provenance predicate.
  */
 export const buildSLSAProvenancePredicate = async (
-  issuer?: string
+  issuer: string = DEFAULT_ISSUER
 ): Promise<Predicate> => {
   const serverURL = process.env.GITHUB_SERVER_URL
   const claims = await getIDTokenClaims(issuer)

packages/attest/src/store.ts

@@ -1,13 +1,11 @@
 import * as github from '@actions/github'
 import {retry} from '@octokit/plugin-retry'
-import {RequestHeaders} from '@octokit/types'
 
 const CREATE_ATTESTATION_REQUEST = 'POST /repos/{owner}/{repo}/attestations'
 const DEFAULT_RETRY_COUNT = 5
 
 export type WriteOptions = {
   retry?: number
-  headers?: RequestHeaders
 }
 /**
  * Writes an attestation to the repository's attestations endpoint.
@@ -28,7 +26,6 @@ export const writeAttestation = async (
     const response = await octokit.request(CREATE_ATTESTATION_REQUEST, {
       owner: github.context.repo.owner,
       repo: github.context.repo.repo,
-      headers: options.headers,
       data: {bundle: attestation}
     })
 

packages/glob/RELEASES.md

@@ -1,8 +1,5 @@
 # @actions/glob Releases
 
-### 0.5.0
-- Added `excludeHiddenFiles` option, which is disabled by default to preserve existing behavior [#1791: Add glob option to ignore hidden files](https://github.com/actions/toolkit/pull/1791)
-
 ### 0.4.0
 - Pass in the current workspace as a parameter to HashFiles [#1318](https://github.com/actions/toolkit/pull/1318)
 

packages/glob/__tests__/internal-globber.test.ts

@@ -708,7 +708,7 @@ describe('globber', () => {
     expect(itemPaths).toEqual([])
   })
 
-  it('returns hidden files by default', async () => {
+  it('returns hidden files', async () => {
     // Create the following layout:
     //   <root>
     //   <root>/.emptyFolder
@@ -734,26 +734,6 @@ describe('globber', () => {
     ])
   })
 
-  it('ignores hidden files when excludeHiddenFiles is set', async () => {
-    // Create the following layout:
-    //   <root>
-    //   <root>/.emptyFolder
-    //   <root>/.file
-    //   <root>/.folder
-    //   <root>/.folder/file
-    const root = path.join(getTestTemp(), 'ignores-hidden-files')
-    await createHiddenDirectory(path.join(root, '.emptyFolder'))
-    await createHiddenDirectory(path.join(root, '.folder'))
-    await createHiddenFile(path.join(root, '.file'), 'test .file content')
-    await fs.writeFile(
-      path.join(root, '.folder', 'file'),
-      'test .folder/file content'
-    )
-
-    const itemPaths = await glob(root, {excludeHiddenFiles: true})
-    expect(itemPaths).toEqual([root])
-  })
-
   it('returns normalized paths', async () => {
     // Create the following layout:
     //   <root>/hello/world.txt

packages/glob/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/glob",
-  "version": "0.5.0",
+  "version": "0.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "description": "Actions glob lib",

packages/glob/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/glob",
-  "version": "0.5.0",
+  "version": "0.4.0",
   "preview": true,
   "description": "Actions glob lib",
   "keywords": [

packages/glob/src/internal-glob-options-helper.ts

@@ -9,8 +9,7 @@ export function getOptions(copy?: GlobOptions): GlobOptions {
     followSymbolicLinks: true,
     implicitDescendants: true,
     matchDirectories: true,
-    omitBrokenSymbolicLinks: true,
+    omitBrokenSymbolicLinks: true
-    excludeHiddenFiles: false
   }
 
   if (copy) {
@@ -33,11 +32,6 @@ export function getOptions(copy?: GlobOptions): GlobOptions {
       result.omitBrokenSymbolicLinks = copy.omitBrokenSymbolicLinks
       core.debug(`omitBrokenSymbolicLinks '${result.omitBrokenSymbolicLinks}'`)
     }
-
-    if (typeof copy.excludeHiddenFiles === 'boolean') {
-      result.excludeHiddenFiles = copy.excludeHiddenFiles
-      core.debug(`excludeHiddenFiles '${result.excludeHiddenFiles}'`)
-    }
   }
 
   return result

packages/glob/src/internal-glob-options.ts

@@ -36,13 +36,4 @@ export interface GlobOptions {
    * @default true
    */
   omitBrokenSymbolicLinks?: boolean
-
-  /**
-   * Indicates whether to exclude hidden files (files and directories starting with a `.`).
-   * This does not apply to Windows files and directories with the hidden attribute unless
-   * they are also prefixed with a `.`.
-   *
-   * @default false
-   */
-  excludeHiddenFiles?: boolean
 }

packages/glob/src/internal-globber.ts

@@ -128,11 +128,6 @@ export class DefaultGlobber implements Globber {
         continue
       }
 
-      // Hidden file or directory?
-      if (options.excludeHiddenFiles && path.basename(item.path).match(/^\./)) {
-        continue
-      }
-
       // Directory
       if (stats.isDirectory()) {
         // Matched

packages/http-client/RELEASES.md

@@ -1,14 +1,5 @@
 ## Releases
 
-## 2.2.3
-- Fixed an issue where proxy username and password were not handled correctly [#1799](https://github.com/actions/toolkit/pull/1799)
-
-## 2.2.2
-- Better handling of url encoded usernames and passwords in proxy config [#1782](https://github.com/actions/toolkit/pull/1782)
-
-## 2.2.1
-- Make sure RequestOptions.keepAlive is applied properly on node20 runtime [#1572](https://github.com/actions/toolkit/pull/1572)
-
 ## 2.2.0
 - Add function to return proxy agent dispatcher for compatibility with latest octokit packages [#1547](https://github.com/actions/toolkit/pull/1547)
 

packages/http-client/__tests__/proxy.test.ts

@@ -307,18 +307,6 @@ describe('proxy', () => {
     console.log(agent)
     expect(agent instanceof ProxyAgent).toBe(true)
   })
-
-  it('proxyAuth is set in tunnel agent when authentication is provided with URIencoding', async () => {
-    process.env['https_proxy'] =
-      'http://user%40github.com:p%[email protected]:8080'
-    const httpClient = new httpm.HttpClient()
-    const agent: any = httpClient.getAgent('https://some-url')
-    // eslint-disable-next-line no-console
-    console.log(agent)
-    expect(agent.proxyOptions.host).toBe('127.0.0.1')
-    expect(agent.proxyOptions.port).toBe('8080')
-    expect(agent.proxyOptions.proxyAuth).toBe('[email protected]:p@ssword')
-  })
 })
 
 function _clearVars(): void {

packages/http-client/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/http-client",
-  "version": "2.2.3",
+  "version": "2.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

packages/http-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/http-client",
-  "version": "2.2.3",
+  "version": "2.2.1",
   "description": "Actions Http Client",
   "keywords": [
     "github",

packages/http-client/src/index.ts

@@ -726,9 +726,7 @@ export class HttpClient {
       uri: proxyUrl.href,
       pipelining: !this._keepAlive ? 0 : 1,
       ...((proxyUrl.username || proxyUrl.password) && {
-        token: `Basic ${Buffer.from(
+        token: `${proxyUrl.username}:${proxyUrl.password}`
-          `${proxyUrl.username}:${proxyUrl.password}`
-        ).toString('base64')}`
       })
     })
     this._proxyAgentDispatcher = proxyAgent

packages/http-client/src/proxy.ts

@@ -15,10 +15,10 @@ export function getProxyUrl(reqUrl: URL): URL | undefined {
 
   if (proxyVar) {
     try {
-      return new DecodedURL(proxyVar)
+      return new URL(proxyVar)
     } catch {
       if (!proxyVar.startsWith('http://') && !proxyVar.startsWith('https://'))
-        return new DecodedURL(`http://${proxyVar}`)
+        return new URL(`http://${proxyVar}`)
     }
   } else {
     return undefined
@@ -87,22 +87,3 @@ function isLoopbackAddress(host: string): boolean {
     hostLower.startsWith('[0:0:0:0:0:0:0:1]')
   )
 }
-
-class DecodedURL extends URL {
-  private _decodedUsername: string
-  private _decodedPassword: string
-
-  constructor(url: string | URL, base?: string | URL) {
-    super(url, base)
-    this._decodedUsername = decodeURIComponent(super.username)
-    this._decodedPassword = decodeURIComponent(super.password)
-  }
-
-  get username(): string {
-    return this._decodedUsername
-  }
-
-  get password(): string {
-    return this._decodedPassword
-  }
-}