Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 115 additions & 0 deletions browser_tests/fixtures/assetDownloadRedirectFixture.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
import { readFile } from 'node:fs/promises'
import { createServer } from 'node:http'

import type { ListAssetsResponse } from '@comfyorg/ingest-types'

import { STABLE_OUTPUT } from '@e2e/fixtures/data/assetFixtures'
import { WEB_SESSION_COOKIE } from '@e2e/fixtures/data/webSession'
import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute'
import { assetPath } from '@e2e/fixtures/utils/paths'
import { mockViewFiles } from '@e2e/fixtures/utils/viewFileMocks'
import { webSessionTest } from '@e2e/fixtures/webSessionFixture'

interface AssetRedirect {
bytes: Buffer
requestHeaders: Record<string, string>[]
storageCookies: (string | undefined)[]
}

export const assetDownloadRedirectTest = webSessionTest.extend<{
assetRedirect: AssetRedirect
}>({
assetRedirect: [
async ({ page, networkPolicy, initialLocalStorage }, use) => {
const bytes = await readFile(assetPath('test_upload_image.png'))
const requestHeaders: Record<string, string>[] = []
const storageCookies: (string | undefined)[] = []
const storage = createServer((request, response) => {
response.setHeader(
'Access-Control-Allow-Origin',
request.headers.origin ?? '*'
)
response.setHeader('Access-Control-Allow-Methods', 'GET')
response.setHeader(
'Access-Control-Allow-Headers',
request.headers['access-control-request-headers'] ?? '*'
)
if (request.method === 'OPTIONS') {
response.writeHead(204).end()
return
}
storageCookies.push(request.headers.cookie)
response.writeHead(200, { 'Content-Type': 'image/png' }).end(bytes)
})
await new Promise<void>((resolve) =>
storage.listen(0, '127.0.0.1', resolve)
)
const address = storage.address()
if (!address || typeof address === 'string')
throw new Error('TCP address required')
const storageOrigin = `http://127.0.0.1:${address.port}`
networkPolicy.origins.add(storageOrigin)

try {
await page.context().addCookies([
{
name: 'storage_session',
value: 'storage-only',
url: storageOrigin
}
])
await mockViewFiles(page, { [STABLE_OUTPUT.name]: {} })
await page.route(/\/api\/assets(?:\?.*)?$/, (route) => {
const params = new URL(route.request().url()).searchParams
const assets = params.get('tags_any')?.includes('output')
? [
{
...STABLE_OUTPUT,
preview_url: `/api/view?filename=${STABLE_OUTPUT.name}&type=output`
}
]
: []
return route.fulfill(
jsonRoute({
assets,
total: assets.length,
has_more: false
} satisfies ListAssetsResponse)
)
})
await page.route(
`**/api/assets/${STABLE_OUTPUT.id}/content**`,
async (route) => {
const headers = await route.request().allHeaders()
const cookie = new Headers(headers).get('cookie')
requestHeaders.push(headers)
const workspace =
initialLocalStorage['Comfy.Workspace.LastWorkspaceId'] ??
'ws-personal'
if (
!cookie?.includes(
`${WEB_SESSION_COOKIE.name}=${WEB_SESSION_COOKIE.value}`
)
) {
await route.fulfill({ status: 401 })
return
}
if (headers['x-comfy-workspace-id'] !== workspace) {
await route.fulfill({ status: 404 })
return
}
await route.fulfill({
status: 302,
headers: { Location: `${storageOrigin}/signed.png` }
})
}
)
await use({ bytes, requestHeaders, storageCookies })
} finally {
networkPolicy.origins.delete(storageOrigin)
await new Promise<void>((resolve) => storage.close(() => resolve()))
}
},
{ auto: true }
]
})
47 changes: 47 additions & 0 deletions browser_tests/tests/workspace/assetDownloadRedirect.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { readFile } from 'node:fs/promises'

import { expect } from '@playwright/test'

import { assetDownloadRedirectTest as test } from '@e2e/fixtures/assetDownloadRedirectFixture'
import { STABLE_OUTPUT } from '@e2e/fixtures/data/assetFixtures'
import { WEB_SESSION_COOKIE } from '@e2e/fixtures/data/webSession'

test.use({
firebaseLogin: false,
serverFeatures: { assets: true, unified_cloud_auth: true }
})

for (const workspace of ['ws-personal', 'ws-team']) {
test.describe(`Asset download in ${workspace}`, { tag: '@cloud' }, () => {
test.use({
initialLocalStorage: { 'Comfy.Workspace.LastWorkspaceId': workspace }
})

test('downloads through a storage redirect without credentialed CORS', async ({
comfyPage,
assetRedirect
}, testInfo) => {
const tab = comfyPage.menu.assetsTab
await tab.open()
await tab.waitForAssets(1)
await tab.rightClickAsset('ComfyUI_00001_')
const downloadPromise = comfyPage.page.waitForEvent('download')
await comfyPage.contextMenu.clickMenuItemExact('Download')
const download = await downloadPromise
const file = testInfo.outputPath(STABLE_OUTPUT.name)
await download.saveAs(file)

expect(download.suggestedFilename()).toBe(STABLE_OUTPUT.name)
expect(await readFile(file)).toEqual(assetRedirect.bytes)
expect(assetRedirect.storageCookies).toEqual([undefined])
expect(assetRedirect.requestHeaders).toEqual([
expect.objectContaining({
cookie: expect.stringContaining(
`${WEB_SESSION_COOKIE.name}=${WEB_SESSION_COOKIE.value}`
),
'x-comfy-workspace-id': workspace
})
])
})
})
}
64 changes: 64 additions & 0 deletions src/platform/auth/session/webSessionFetch.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import {
COMFY_CLIENT,
createRequestAuthorizer
} from '@comfyorg/account-core/requestAuth'
import { describe, expect, it, vi } from 'vitest'

import { fetchOnWebSession } from './webSessionFetch'
import type { WebSessionRequestScope } from './webSessionFetch'

describe('web-session request credentials', () => {
it.for([
{
name: 'relative ingest URL',
url: '/api/assets/image/content',
credentials: 'same-origin'
},
{
name: 'absolute same-origin URL',
url: new URL('/api/assets/image/content', location.href).href,
credentials: 'same-origin'
},
{
name: 'remote ingest URL',
url: 'https://testcloud.comfy.org/api/assets/image/content',
credentials: 'include'
}
] as const)(
'keeps cookie authentication for $name',
async ({ url, credentials }) => {
const send = vi.fn(async () => new Response('asset'))
vi.stubGlobal('fetch', send)
const scope: WebSessionRequestScope = {
epoch: 1,
workspaceId: 'team-workspace',
session: {
user: { id: 'user', email: 'user@example.com', emailVerified: true },
csrfToken: 'csrf-token',
expiresAt: Number.MAX_SAFE_INTEGER,
absoluteExpiresAt: Number.MAX_SAFE_INTEGER
}
}

await fetchOnWebSession(url, { method: 'POST', body: 'asset' }, scope, {
authorize: createRequestAuthorizer({
getWorkspaceToken: async () => 'unused'
}),
refresh: async () => undefined,
workspaceDenied: vi.fn(),
ssoRequired: vi.fn()
})

expect(send).toHaveBeenCalledWith(url, {
method: 'POST',
body: 'asset',
credentials,
headers: new Headers({
'X-Comfy-Client': COMFY_CLIENT,
'X-Comfy-Workspace-ID': 'team-workspace',
'X-CSRF-Token': 'csrf-token'
})
})
}
)
})
9 changes: 8 additions & 1 deletion src/platform/auth/session/webSessionFetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,14 @@ export async function fetchOnWebSession(
)
const merged = new Headers(init.headers)
for (const [name, value] of Object.entries(headers)) merged.set(name, value)
return fetch(url, { ...init, headers: merged, credentials })
return fetch(url, {
...init,
headers: merged,
credentials:
new URL(url, location.href).origin === location.origin
? 'same-origin'
: credentials
})
}

const response = await send(scope)
Expand Down
4 changes: 2 additions & 2 deletions src/platform/auth/webSessionFlagOn.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ const sessionRequest = (
method,
path,
headers: { 'x-comfy-client': COMFY_CLIENT, ...headers },
credentials: 'include'
credentials: 'same-origin'
})

const LISTED = {
Expand Down Expand Up @@ -2781,7 +2781,7 @@ describe.for([{ unified: false }, { unified: true }])(
await vi.advanceTimersByTimeAsync(60_000)
await response
expect(queueReads().map(([, init]) => init?.credentials)).toEqual([
'include'
'same-origin'
])
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const sessionRequest = (path: string, workspace: string): IngestRequest => ({
method: 'GET',
path,
headers: { 'x-comfy-client': COMFY_CLIENT, ...workspaceHeader(workspace) },
credentials: 'include'
credentials: 'same-origin'
})

describe('remote widgets on the shared web session', () => {
Expand Down
Loading