actions
/
toolkit
mirror of https://github.com/actions/toolkit
1
0
Fork 0
Code

updating allowed hosts to include ghe.com

pull/1646/head
eggyhead 2024-01-30 22:22:49 +00:00
parent 1a1d5e3792
commit 79886daf63
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/artifact/__tests__/config.test.ts
View File

@ -13,12 +13,12 @@ describe('isGhes', () => {
}) })
it('should return false when the request domain ends with ghe.com', () => { it('should return false when the request domain ends with ghe.com', () => {
process.env.GITHUB_SERVER_URL = 'https://my.domain.ghe.com' process.env.GITHUB_SERVER_URL = 'https://github.ghe.com'
expect(config.isGhes()).toBe(false) expect(config.isGhes()).toBe(false)
}) })
it('should return false when the request domain ends with ghe.localhost', () => { it('should return false when the request domain ends with ghe.localhost', () => {
process.env.GITHUB_SERVER_URL = 'https://my.domain.ghe.localhost' process.env.GITHUB_SERVER_URL = 'https://github.ghe.localhost'
expect(config.isGhes()).toBe(false) expect(config.isGhes()).toBe(false)
}) })

12
packages/artifact/src/internal/shared/config.ts
View File

@ -28,11 +28,15 @@ export function isGhes(): boolean {
process.env['GITHUB_SERVER_URL'] || 'https://github.com' process.env['GITHUB_SERVER_URL'] || 'https://github.com'
) )
const hostname = ghUrl.hostname.trimEnd().toUpperCase() let githubHosts = [
const isGitHubHost = (hostname == 'GITHUB.COM') 'GITHUB.COM',
const isProximaHost = (hostname.endsWith('GHE.COM') || hostname.endsWith('GHE.LOCALHOST')) 'GITHUB.GHE.COM',
'GITHUB.GHE.LOCALHOST'
];
return !isGitHubHost && !isProximaHost const hostname = ghUrl.hostname.trimEnd().toUpperCase()
return !githubHosts.includes(hostname)
} }
export function getGitHubWorkspaceDir(): string { export function getGitHubWorkspaceDir(): string {

4
packages/cache/__tests__/cacheUtils.test.ts vendored
View File

@ -49,7 +49,7 @@ test('isGhes returns false for github.com', async () => {
}) })
test('isGhes returns false for ghe.com', async () => { test('isGhes returns false for ghe.com', async () => {
process.env.GITHUB_SERVER_URL = 'https://somedomain.ghe.com' process.env.GITHUB_SERVER_URL = 'https://github.ghe.com'
expect(cacheUtils.isGhes()).toBe(false) expect(cacheUtils.isGhes()).toBe(false)
}) })
@ -59,6 +59,6 @@ test('isGhes returns true for enterprise URL', async () => {
}) })
test('isGhes returns false for ghe.localhost', () => { test('isGhes returns false for ghe.localhost', () => {
process.env.GITHUB_SERVER_URL = 'https://my.domain.ghe.localhost' process.env.GITHUB_SERVER_URL = 'https://github.ghe.localhost'
expect(cacheUtils.isGhes()).toBe(false) expect(cacheUtils.isGhes()).toBe(false)
}) })

12
packages/cache/src/internal/cacheUtils.ts vendored
View File

@ -136,9 +136,13 @@ export function isGhes(): boolean {
process.env['GITHUB_SERVER_URL'] || 'https://github.com' process.env['GITHUB_SERVER_URL'] || 'https://github.com'
) )
const hostname = ghUrl.hostname.trimEnd().toUpperCase() let githubHosts = [
const isGitHubHost = (hostname == 'GITHUB.COM') 'GITHUB.COM',
const isProximaHost = (hostname.endsWith('GHE.COM') || hostname.endsWith('GHE.LOCALHOST')) 'GITHUB.GHE.COM',
'GITHUB.GHE.LOCALHOST'
];
return !isGitHubHost && !isProximaHost const hostname = ghUrl.hostname.trimEnd().toUpperCase()
return !githubHosts.includes(hostname)
} }