Spell out which Coolify backup vars belong on AIGen vs xAIGen.
A URL in BACKUP_INGEST_TOKEN was treated as a missing token. Errors now say to put the URL on AIGen and the same secret on both apps. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
+5
-3
@@ -24,10 +24,12 @@ NUXT_OIDC_AUTHORIZE_URL=https://auth.carrgarage.com/application/o/authorize/
|
|||||||
NUXT_OIDC_TOKEN_URL=http://192.168.77.2:9000/application/o/token/
|
NUXT_OIDC_TOKEN_URL=http://192.168.77.2:9000/application/o/token/
|
||||||
LIBRARY_DIR=/data/library
|
LIBRARY_DIR=/data/library
|
||||||
|
|
||||||
# AIGen → xAIGen still backup. Set the URL + token on AIGen. Set the same token on xAIGen as BACKUP_INGEST_TOKEN.
|
# AIGen → xAIGen still backup. Same secret on both apps. URL only on AIGen.
|
||||||
|
# AIGen:
|
||||||
# BACKUP_STUDIO_URL=https://xaigen.carrgarage.com
|
# BACKUP_STUDIO_URL=https://xaigen.carrgarage.com
|
||||||
# BACKUP_STUDIO_TOKEN=
|
# BACKUP_STUDIO_TOKEN=pick-a-long-random-secret
|
||||||
# BACKUP_INGEST_TOKEN=
|
# xAIGen:
|
||||||
|
# BACKUP_INGEST_TOKEN=pick-a-long-random-secret
|
||||||
|
|
||||||
# Private clone (xaigen): password login, isolated library, Comfy prefix
|
# Private clone (xaigen): password login, isolated library, Comfy prefix
|
||||||
# AUTH_MODE=password
|
# AUTH_MODE=password
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { backupIngestSecret } from '~/server/utils/backupStudio'
|
||||||
import { passwordAuthEnabled, privateInstanceId } from '~/server/utils/localAuth'
|
import { passwordAuthEnabled, privateInstanceId } from '~/server/utils/localAuth'
|
||||||
import { saveStill } from '~/server/utils/library'
|
import { saveStill } from '~/server/utils/library'
|
||||||
|
|
||||||
@@ -7,9 +8,12 @@ function ingestOwner() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function assertIngestToken(event: Parameters<typeof getHeader>[0]) {
|
function assertIngestToken(event: Parameters<typeof getHeader>[0]) {
|
||||||
const expected = String(useRuntimeConfig().backupIngestToken || process.env.BACKUP_INGEST_TOKEN || '').trim()
|
const expected = backupIngestSecret()
|
||||||
if (!expected) {
|
if (!expected || /^https?:\/\//i.test(expected)) {
|
||||||
throw createError({ statusCode: 503, statusMessage: 'Backup ingest is not configured' })
|
throw createError({
|
||||||
|
statusCode: 503,
|
||||||
|
statusMessage: 'Set BACKUP_INGEST_TOKEN on xAIGen to the same secret as BACKUP_STUDIO_TOKEN on AIGen, not a URL.'
|
||||||
|
})
|
||||||
}
|
}
|
||||||
const header = String(getHeader(event, 'authorization') || '')
|
const header = String(getHeader(event, 'authorization') || '')
|
||||||
if (header !== `Bearer ${expected}`) {
|
if (header !== `Bearer ${expected}`) {
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
import { readFileSync } from 'node:fs'
|
import { readFileSync } from 'node:fs'
|
||||||
import { isXaigenStudio } from '~/utils/videoModels'
|
import { isXaigenStudio } from '~/utils/videoModels'
|
||||||
|
import { backupStudioConfigError, backupStudioTarget } from '~/server/utils/backupStudio'
|
||||||
import { assertLibraryOwner, getStill, stillPath } from '~/server/utils/library'
|
import { assertLibraryOwner, getStill, stillPath } from '~/server/utils/library'
|
||||||
|
|
||||||
export default defineEventHandler(async (event) => {
|
export default defineEventHandler(async (event) => {
|
||||||
if (isXaigenStudio()) {
|
if (isXaigenStudio()) {
|
||||||
throw createError({ statusCode: 404, statusMessage: 'Not found' })
|
throw createError({ statusCode: 404, statusMessage: 'Not found' })
|
||||||
}
|
}
|
||||||
const config = useRuntimeConfig()
|
const missing = backupStudioConfigError()
|
||||||
const url = String(config.backupStudioUrl || process.env.BACKUP_STUDIO_URL || '').replace(/\/$/, '')
|
if (missing) {
|
||||||
const token = String(config.backupStudioToken || process.env.BACKUP_STUDIO_TOKEN || '').trim()
|
throw createError({ statusCode: 503, statusMessage: missing })
|
||||||
if (!url || !token) {
|
|
||||||
throw createError({ statusCode: 503, statusMessage: 'Backup studio is not configured' })
|
|
||||||
}
|
}
|
||||||
|
const { url, token } = backupStudioTarget()
|
||||||
const { owner } = assertLibraryOwner(event)
|
const { owner } = assertLibraryOwner(event)
|
||||||
const id = String(getRouterParam(event, 'id') || '')
|
const id = String(getRouterParam(event, 'id') || '')
|
||||||
const still = getStill(owner, id)
|
const still = getStill(owner, id)
|
||||||
@@ -31,7 +31,7 @@ export default defineEventHandler(async (event) => {
|
|||||||
const message = await res.text().catch(() => '')
|
const message = await res.text().catch(() => '')
|
||||||
throw createError({
|
throw createError({
|
||||||
statusCode: res.status === 401 ? 502 : res.status,
|
statusCode: res.status === 401 ? 502 : res.status,
|
||||||
statusMessage: message || 'Backup studio refused the still'
|
statusMessage: message || 'xAIGen refused the still. Check BACKUP_INGEST_TOKEN matches AIGen BACKUP_STUDIO_TOKEN.'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
return { ok: true }
|
return { ok: true }
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
function env(...keys: string[]) {
|
||||||
|
for (const key of keys) {
|
||||||
|
const value = String(process.env[key] || '').trim()
|
||||||
|
if (value) return value
|
||||||
|
}
|
||||||
|
return ''
|
||||||
|
}
|
||||||
|
|
||||||
|
function looksLikeUrl(value: string) {
|
||||||
|
return /^https?:\/\//i.test(value)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function backupStudioTarget() {
|
||||||
|
const config = useRuntimeConfig()
|
||||||
|
const url = String(
|
||||||
|
config.backupStudioUrl
|
||||||
|
|| env('BACKUP_STUDIO_URL', 'NUXT_BACKUP_STUDIO_URL')
|
||||||
|
).replace(/\/$/, '')
|
||||||
|
const token = String(
|
||||||
|
config.backupStudioToken
|
||||||
|
|| env('BACKUP_STUDIO_TOKEN', 'NUXT_BACKUP_STUDIO_TOKEN')
|
||||||
|
).trim()
|
||||||
|
const misplaced = env('BACKUP_INGEST_TOKEN', 'NUXT_BACKUP_INGEST_TOKEN')
|
||||||
|
return { url, token, misplaced }
|
||||||
|
}
|
||||||
|
|
||||||
|
export function backupIngestSecret() {
|
||||||
|
const config = useRuntimeConfig()
|
||||||
|
return String(
|
||||||
|
config.backupIngestToken
|
||||||
|
|| env('BACKUP_INGEST_TOKEN', 'NUXT_BACKUP_INGEST_TOKEN', 'BACKUP_STUDIO_TOKEN', 'NUXT_BACKUP_STUDIO_TOKEN')
|
||||||
|
).trim()
|
||||||
|
}
|
||||||
|
|
||||||
|
export function backupStudioConfigError() {
|
||||||
|
const { url, token, misplaced } = backupStudioTarget()
|
||||||
|
if (url && token) return ''
|
||||||
|
if (!url && looksLikeUrl(misplaced)) {
|
||||||
|
return 'BACKUP_INGEST_TOKEN on AIGen is a URL. Put https://xaigen.carrgarage.com in BACKUP_STUDIO_URL, and put the same secret in BACKUP_STUDIO_TOKEN here and BACKUP_INGEST_TOKEN on xAIGen.'
|
||||||
|
}
|
||||||
|
if (!url && !token) {
|
||||||
|
return 'Set BACKUP_STUDIO_URL and BACKUP_STUDIO_TOKEN on AIGen. The token must match BACKUP_INGEST_TOKEN on xAIGen.'
|
||||||
|
}
|
||||||
|
if (!url) return 'Set BACKUP_STUDIO_URL on AIGen to https://xaigen.carrgarage.com'
|
||||||
|
return 'Set BACKUP_STUDIO_TOKEN on AIGen to the same secret as BACKUP_INGEST_TOKEN on xAIGen'
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user