4021c66cec
Show a badge on the gallery thumbnail and a lightbox toggle that plays the photo's clip over the still, matching Immich's own viewer. The clip is a hidden Immich asset, but the existing share key already authorises it - checkSharedLinkAccess whitelists each shared asset's livePhotoVideoId - so no new upstream access is involved. The video route accepts a clip id only when a shared still points at it. Both enumeration paths already carry the field (AssetResponseDto for individual shares, TimeBucketAssetResponseDto for album buckets), so album shares cost no extra upstream requests. Gated by ipp.motionPhotos (default true). The clip is preload="none" and is only fetched when a visitor presses the toggle.
75 lines
3.0 KiB
TypeScript
75 lines
3.0 KiB
TypeScript
import { describe, it, expect } from 'vitest'
|
|
import { h } from 'preact'
|
|
import { Gallery, GalleryProps, GalleryItem } from '../src/view/gallery'
|
|
import { renderPage } from '../src/view/render'
|
|
|
|
/*
|
|
Regression test for the init-JSON XSS: asset strings (originalFileName, EXIF
|
|
description/city/make/model) are attacker-influenced and are serialised into
|
|
the <script type="application/json"> init block. A raw `</script>` inside
|
|
them must not be able to terminate that block and inject markup.
|
|
*/
|
|
|
|
function galleryProps (item: Partial<GalleryItem>): GalleryProps {
|
|
return {
|
|
items: [{
|
|
id: 'a',
|
|
type: 'IMAGE',
|
|
previewUrl: '/share/photo/k/a/preview',
|
|
thumbnailUrl: '/share/photo/k/a/thumbnail',
|
|
downloadFilename: 'photo.jpg',
|
|
...item
|
|
}],
|
|
title: 'Test gallery',
|
|
description: '',
|
|
publicBaseUrl: 'https://example.com',
|
|
path: '/share/k',
|
|
showDownloadZip: false,
|
|
showTitle: false,
|
|
lightboxConfig: { showArrows: true, showDownload: true, mobileArrows: false, autoPlayVideos: false },
|
|
metadataConfig: { descriptionInCaption: false, descriptionInSidebar: false, sidebarHasContent: false, locationWebLink: false },
|
|
groupByDate: false
|
|
}
|
|
}
|
|
|
|
const payload = '</script><script>alert(1)</script>'
|
|
|
|
/** Render a gallery and parse back the `#ipp-init` JSON block the client reads. */
|
|
function initParams (props: GalleryProps) {
|
|
const html = renderPage(h(Gallery, props))
|
|
const match = html.match(/<script type="application\/json" id="ipp-init">(.*?)<\/script>/s)
|
|
if (!match) throw new Error('No init JSON block in the rendered gallery')
|
|
return JSON.parse(match[1])
|
|
}
|
|
|
|
describe('gallery init JSON escaping', () => {
|
|
it('neutralises </script> in a crafted download filename', () => {
|
|
const html = renderPage(h(Gallery, galleryProps({ downloadFilename: payload })))
|
|
expect(html).not.toContain('<script>alert(1)</script>')
|
|
expect(html).toContain('\\u003c/script>')
|
|
})
|
|
|
|
it('neutralises </script> in crafted EXIF metadata', () => {
|
|
const html = renderPage(h(Gallery, galleryProps({
|
|
description: payload,
|
|
exif: { fileName: payload, city: payload, make: payload }
|
|
})))
|
|
expect(html).not.toContain('<script>alert(1)</script>')
|
|
})
|
|
|
|
it('still produces JSON the client can parse back to the same items', () => {
|
|
// initParams throws if the block is missing, so reaching the assertion
|
|
// also proves the block is still there and still parses.
|
|
const params = initParams(galleryProps({ downloadFilename: payload }))
|
|
expect(params.items[0].downloadFilename).toBe(payload)
|
|
})
|
|
|
|
it('serialises motionUrl for a motion photo, and omits the key otherwise', () => {
|
|
const motionUrl = '/share/video/k/dddddddd-dddd-dddd-dddd-dddddddddddd'
|
|
expect(initParams(galleryProps({ motionUrl })).items[0].motionUrl).toBe(motionUrl)
|
|
// Absent (not null / empty string), so the client's `item.motionUrl` check
|
|
// and the tile badge stay off for ordinary photos.
|
|
expect(initParams(galleryProps({})).items[0]).not.toHaveProperty('motionUrl')
|
|
})
|
|
})
|