mirror of https://github.com/actions/toolkit
updating alowed hosts in isGhes check
updating alowed hosts in artifact ghes check using dot prepend ghe hostpull/1648/head
parent
1fe633e27c
commit
3b02a6fdc5
|
@ -0,0 +1,29 @@
|
||||||
|
import * as config from '../src/internal/shared/config'
|
||||||
|
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
jest.resetModules()
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
describe('isGhes', () => {
|
||||||
|
it('should return false when the request domain is github.com', () => {
|
||||||
|
process.env.GITHUB_SERVER_URL = 'https://github.com'
|
||||||
|
expect(config.isGhes()).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should return false when the request domain ends with ghe.com', () => {
|
||||||
|
process.env.GITHUB_SERVER_URL = 'https://my.domain.ghe.com'
|
||||||
|
expect(config.isGhes()).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should return false when the request domain ends with ghe.localhost', () => {
|
||||||
|
process.env.GITHUB_SERVER_URL = 'https://my.domain.ghe.localhost'
|
||||||
|
expect(config.isGhes()).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should return false when the request domain is specific to an enterprise', () => {
|
||||||
|
process.env.GITHUB_SERVER_URL = 'https://my-enterprise.github.com'
|
||||||
|
expect(config.isGhes()).toBe(true)
|
||||||
|
})
|
||||||
|
})
|
|
@ -27,7 +27,12 @@ export function isGhes(): boolean {
|
||||||
const ghUrl = new URL(
|
const ghUrl = new URL(
|
||||||
process.env['GITHUB_SERVER_URL'] || 'https://github.com'
|
process.env['GITHUB_SERVER_URL'] || 'https://github.com'
|
||||||
)
|
)
|
||||||
return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM'
|
|
||||||
|
const hostname = ghUrl.hostname.trimEnd().toUpperCase()
|
||||||
|
const isGitHubHost = (hostname == 'GITHUB.COM')
|
||||||
|
const isGheHost = (hostname.endsWith('.GHE.COM') || hostname.endsWith('.GHE.LOCALHOST'))
|
||||||
|
|
||||||
|
return !isGitHubHost && !isGheHost
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getGitHubWorkspaceDir(): string {
|
export function getGitHubWorkspaceDir(): string {
|
||||||
|
|
|
@ -2,6 +2,10 @@ import {promises as fs} from 'fs'
|
||||||
import * as path from 'path'
|
import * as path from 'path'
|
||||||
import * as cacheUtils from '../src/internal/cacheUtils'
|
import * as cacheUtils from '../src/internal/cacheUtils'
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
jest.resetModules()
|
||||||
|
});
|
||||||
|
|
||||||
test('getArchiveFileSizeInBytes returns file size', () => {
|
test('getArchiveFileSizeInBytes returns file size', () => {
|
||||||
const filePath = path.join(__dirname, '__fixtures__', 'helloWorld.txt')
|
const filePath = path.join(__dirname, '__fixtures__', 'helloWorld.txt')
|
||||||
|
|
||||||
|
@ -38,3 +42,23 @@ test('resolvePaths works on github workspace directory', async () => {
|
||||||
const paths = await cacheUtils.resolvePaths([workspace])
|
const paths = await cacheUtils.resolvePaths([workspace])
|
||||||
expect(paths.length).toBeGreaterThan(0)
|
expect(paths.length).toBeGreaterThan(0)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test('isGhes returns false for github.com', async () => {
|
||||||
|
process.env.GITHUB_SERVER_URL = 'https://github.com'
|
||||||
|
expect(cacheUtils.isGhes()).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('isGhes returns false for ghe.com', async () => {
|
||||||
|
process.env.GITHUB_SERVER_URL = 'https://somedomain.ghe.com'
|
||||||
|
expect(cacheUtils.isGhes()).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('isGhes returns true for enterprise URL', async () => {
|
||||||
|
process.env.GITHUB_SERVER_URL = 'https://my-enterprise.github.com'
|
||||||
|
expect(cacheUtils.isGhes()).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('isGhes returns false for ghe.localhost', () => {
|
||||||
|
process.env.GITHUB_SERVER_URL = 'https://my.domain.ghe.localhost'
|
||||||
|
expect(cacheUtils.isGhes()).toBe(false)
|
||||||
|
})
|
|
@ -135,5 +135,10 @@ export function isGhes(): boolean {
|
||||||
const ghUrl = new URL(
|
const ghUrl = new URL(
|
||||||
process.env['GITHUB_SERVER_URL'] || 'https://github.com'
|
process.env['GITHUB_SERVER_URL'] || 'https://github.com'
|
||||||
)
|
)
|
||||||
return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM'
|
|
||||||
|
const hostname = ghUrl.hostname.trimEnd().toUpperCase()
|
||||||
|
const isGitHubHost = (hostname == 'GITHUB.COM')
|
||||||
|
const isGheHost = (hostname.endsWith('.GHE.COM') || hostname.endsWith('.GHE.LOCALHOST'))
|
||||||
|
|
||||||
|
return !isGitHubHost && !isGheHost
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue