Skip to content
Draft
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
noCacheMiddleware,
redirectToDevConsoleMiddleware,
getExtensionPointMiddleware,
devConsoleAssetsMiddleware,
} from './middlewares.js'
import * as utilities from './utilities.js'
import {GetExtensionsMiddlewareOptions} from './models.js'
Expand All @@ -15,6 +16,7 @@ import {UIExtensionPayload} from '../payload/models.js'
import {testUIExtension} from '../../../../models/app/app.test-data.js'
import {AppEventWatcher} from '../../app-events/app-event-watcher.js'
import {copyConfigKeyEntry} from '../../../build/steps/include-assets/copy-config-key-entry.js'
import * as fs from '@shopify/cli-kit/node/fs'
import {describe, expect, vi, test} from 'vitest'
import {inTemporaryDirectory, mkdir, touchFile, writeFile} from '@shopify/cli-kit/node/fs'
import * as h3 from 'h3'
Expand Down Expand Up @@ -691,6 +693,31 @@ describe('getExtensionPayloadMiddleware()', () => {
})
})

describe('devConsoleAssetsMiddleware()', () => {
test('returns 404 for path traversal attempts', async () => {
await inTemporaryDirectory(async (tmpDir: string) => {
vi.spyOn(utilities, 'sendError').mockImplementation(() => ({}) as any)
vi.spyOn(fs, 'findPathUp').mockResolvedValue(joinPath(tmpDir, 'assets'))

await fs.mkdir(joinPath(tmpDir, 'assets'))
await writeFile(joinPath(tmpDir, 'secret.txt'), 'secret')

const event = getMockEvent({
params: {
assetPath: '../secret.txt',
},
})

await devConsoleAssetsMiddleware(event)

expect(utilities.sendError).toHaveBeenCalledWith(event, {
statusCode: 404,
statusMessage: 'Not Found',
})
})
})
})

describe('getExtensionPointMiddleware()', () => {
test('returns a 404 if the extension is not found', async () => {
vi.spyOn(utilities, 'sendError').mockImplementation(() => {})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,13 @@ export const devConsoleAssetsMiddleware = defineEventHandler(async (event) => {
})
}

const candidate = resolvePath(joinPath(rootDirectory, assetPath))
if (!isSubpath(rootDirectory, candidate)) {
return sendError(event, {statusCode: 404, statusMessage: 'Not Found'})
}

return fileServerMiddleware(event, {
filePath: joinPath(rootDirectory, assetPath),
filePath: candidate,
})
})

Expand Down
Loading