release: v1.2.2 — 双域名配置与 Host 隔离修复
GitHub Release / release (push) Canceled after 0s
Publish Docker image / build (linux/amd64, ubuntu-latest, amd64) (push) Canceled after 0s
Publish Docker image / build (linux/arm64, ubuntu-24.04-arm, arm64) (push) Canceled after 0s
Publish Docker image / merge (push) Canceled after 0s
ci / ci (22, ubuntu-latest) (push) Canceled after 0s

修复设置页误清空管理域、配置与生效 URL 混淆及第三 Host 绕过隔离;加固 Settings API 与中间件,并更新文档站。
This commit is contained in:
O96u committed 2026-08-30 10:57:26 +08:00
1 parent 6c6766221b
commit c9c34515dd
36 files changed
+2578 -180

No files matched your search

+66 -1
View File
@@ -8,6 +8,7 @@ import {
getAutoDeleteDays,
getAutoDeleteDaysSource,
getRefererSource,
getSettingsPayload,
getSiteBaseUrl,
getSiteBaseUrlConfigured,
getSiteBaseUrlSource,
@@ -17,13 +18,15 @@ import {
isAutoDeleteDaysEnvConfigured,
isRefererEnvConfigured,
isWebpQualityEnvConfigured,
validateDomainSeparationPair
validateDomainSeparationPair,
validateSettingsDomainPatch
} from './env'
import {
getSetting,
SETTINGS_ALLOWED_REFERER_HOSTS,
SETTINGS_API_UPLOAD_TOKEN,
SETTINGS_AUTO_DELETE_DAYS,
SETTINGS_IMAGE_BASE_URL,
SETTINGS_SITE_BASE_URL,
SETTINGS_WEBP_QUALITY,
generateApiUploadToken
@@ -255,3 +258,65 @@ describe('validateDomainSeparationPair', () => {
)).toBeNull()
})
})
describe('validateSettingsDomainPatch', () => {
const dualExisting = {
existingSite: 'https://admin.example.com',
existingImage: 'https://pic.example.com'
}
it('requires both URLs when enabling domain separation', () => {
expect(validateSettingsDomainPatch({
...dualExisting,
nextSite: '',
nextImage: 'https://pic.example.com',
wantSeparation: true,
siteBaseUrlProvided: true
})).toContain('同时填写')
})
it('blocks clearing site without explicit disable when dual domain is active', () => {
expect(validateSettingsDomainPatch({
...dualExisting,
nextSite: '',
nextImage: 'https://pic.example.com',
wantSeparation: null,
siteBaseUrlProvided: true
})).toContain('不能单独清空管理域名')
})
it('allows clearing site when explicitly disabling domain separation', () => {
expect(validateSettingsDomainPatch({
...dualExisting,
nextSite: '',
nextImage: 'https://pic.example.com',
wantSeparation: false,
siteBaseUrlProvided: true
})).toBeNull()
})
})
describe('getSettingsPayload configured vs effective', () => {
afterEach(() => {
vi.clearAllMocks()
delete process.env.SITE_BASE_URL
delete process.env.IMAGE_BASE_URL
})
it('returns configured site URL without request fallback', () => {
vi.mocked(getSetting).mockImplementation((key) => {
if (key === SETTINGS_SITE_BASE_URL) return 'https://admin.example.com'
if (key === SETTINGS_IMAGE_BASE_URL) return 'https://pic.example.com'
return null
})
vi.stubGlobal('getRequestURL', () => new URL('https://pages.dev'))
const event = mockEvent()
const payload = getSettingsPayload(event)
expect(payload.siteBaseUrl).toBe('https://admin.example.com')
expect(payload.effectiveSiteBaseUrl).toBe('https://admin.example.com')
expect(payload.runtime.currentHost).toBe('pages.dev')
expect(payload.runtime.hostRole).toBe('unknown')
})
})