Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

fix: address CodeQL and package decoupling review findings

HoshinoSuzumiBotee61b2ae5663
diff --git a/app/pages/dashboard/albums.vue b/app/pages/dashboard/albums.vue
index 306fcfeb..669a3bf2 100644
--- a/app/pages/dashboard/albums.vue
+++ b/app/pages/dashboard/albums.vue
@@ -1270,11 +1270,14 @@ const columns = computed<any[]>(() => [
$t('ui.photo.untitled')
}}
</p>
- <p class="truncate text-[9px] text-white/72">
+ <p
+ v-if="photo.dateTaken"
+ class="truncate text-[9px] text-white/72"
+ >
{{
locationLabel(photo)
- ? `${locationLabel(photo)} · ${dayjs(photo.createdAt).format('MM-DD')}`
- : dayjs(photo.createdAt).format('YYYY-MM-DD')
+ ? `${locationLabel(photo)} · ${dayjs(photo.dateTaken).format('MM-DD')}`
+ : dayjs(photo.dateTaken).format('YYYY-MM-DD')
}}
</p>
</div>
diff --git a/packages/geocoding/src/index.ts b/packages/geocoding/src/index.ts
index 372eac0d..6848e975 100644
--- a/packages/geocoding/src/index.ts
+++ b/packages/geocoding/src/index.ts
@@ -45,6 +45,7 @@ export interface GeocodingDependencies {
logger: GeocodingLogger
}
+/** Create reverse-geocoding providers using caller-owned transport, retry, language and rate limits. */
export function createGeocodingServices({
getLanguage,
request,
@@ -222,6 +223,7 @@ export function createGeocodingServices({
}
}
+ /** Parse bounded decimal GPS text or explicit EXIF coordinates, applying hemisphere references. */
function parseGPSCoordinates(exifData: any): {
latitude?: number
longitude?: number
@@ -242,10 +244,15 @@ export function createGeocodingServices({
exifData.GPSCoordinates
) {
const coords = exifData.GPSCoordinates.toString()
- const match = coords.match(/([-+]?\d+\.?\d*)[°,\s]+([-+]?\d+\.?\d*)/)
- if (match) {
- latitude = parseFloat(match[1])
- longitude = parseFloat(match[2])
+ // Bound metadata input and validate whole tokens without overlapping
+ // numeric quantifiers that can cause polynomial regex backtracking.
+ if (coords.length <= 256) {
+ const [lat, lon] = coords.trim().split(/[°,\s]+/)
+ const decimal = /^[-+]?\d+(?:\.\d*)?$/
+ if (lat && lon && decimal.test(lat) && decimal.test(lon)) {
+ latitude = Number(lat)
+ longitude = Number(lon)
+ }
}
}
diff --git a/packages/geocoding/src/normalize.ts b/packages/geocoding/src/normalize.ts
index 96395660..7d5f8b53 100644
--- a/packages/geocoding/src/normalize.ts
+++ b/packages/geocoding/src/normalize.ts
@@ -33,6 +33,7 @@ function put(
result.components[level] = { name: text, sourceField }
}
+/** Normalize Mapbox features into location components while preserving source fields. */
export function normalizeMapbox(
data: ObjectValue,
language: string,
@@ -78,6 +79,7 @@ export function normalizeMapbox(
return Object.keys(result.components).length ? result : null
}
+/** Normalize Nominatim address tags without treating counties as city districts. */
export function normalizeNominatim(
data: ObjectValue,
language: string,
diff --git a/packages/geocoding/src/rate-limit.ts b/packages/geocoding/src/rate-limit.ts
index a5f428bc..a74410c3 100644
--- a/packages/geocoding/src/rate-limit.ts
+++ b/packages/geocoding/src/rate-limit.ts
@@ -1,5 +1,6 @@
import { setTimeout } from 'node:timers/promises'
+/** Create an instance-owned limiter that reserves request slots synchronously per endpoint. */
export function createGeocodingRateLimiter() {
const nextRequestAt = new Map<string, number>()
diff --git a/packages/media/src/exif.ts b/packages/media/src/exif.ts
index 085c3c7a..d09996fa 100644
--- a/packages/media/src/exif.ts
+++ b/packages/media/src/exif.ts
@@ -10,6 +10,7 @@ import type { ExifDateTime, Tags } from 'exiftool-vendored'
import { noop } from 'es-toolkit'
import { withRetry, RetryPresets, RetryConditions } from './retry.ts'
+/** Create EXIF helpers using a caller-owned ExifTool instance and temporary directory. */
export function createExifService({
exiftool,
tempDir,
diff --git a/packages/media/src/processor.ts b/packages/media/src/processor.ts
index bf460003..8326507f 100644
--- a/packages/media/src/processor.ts
+++ b/packages/media/src/processor.ts
@@ -25,6 +25,7 @@ export interface ImageProcessorOptions {
signal?: AbortSignal
}
+/** Create image decoding and conversion helpers with optional resource limits and cancellation. */
export function createImageProcessor(
logger: MediaLogger,
options: ImageProcessorOptions = {},
diff --git a/packages/storage/src/providers/local.ts b/packages/storage/src/providers/local.ts
index 5496378e..d141812b 100644
--- a/packages/storage/src/providers/local.ts
+++ b/packages/storage/src/providers/local.ts
@@ -11,8 +11,17 @@ const ensureDir = async (dirPath: string) => {
const sanitizeKey = (key: string) =>
key.replace(/\\/g, '/').replace(/\/+/g, '/').replace(/^\/+/, '')
+/** Trim edge slashes in one pass, even for untrusted long keys or URLs. */
+const trimSlashes = (value: string, leading = true): string => {
+ let start = 0
+ let end = value.length
+ if (leading) while (start < end && value[start] === '/') start++
+ while (end > start && value[end - 1] === '/') end--
+ return value.slice(start, end)
+}
+
const combinePrefixAndKey = (prefix: string | undefined, key: string) => {
- const cleanPrefix = (prefix || '').replace(/^\/+|\/+$/g, '')
+ const cleanPrefix = trimSlashes(prefix || '')
const cleanKey = key.replace(/^\/+/, '')
if (!cleanPrefix) return cleanKey
return cleanKey.startsWith(cleanPrefix + '/')
@@ -88,7 +97,7 @@ export class LocalStorageProvider implements StorageProvider {
getPublicUrl(key: string): string {
const relKey = sanitizeKey(combinePrefixAndKey(this.config.prefix, key))
- const base = (this.config.baseUrl || '/storage').replace(/\/+$/, '')
+ const base = trimSlashes(this.config.baseUrl || '/storage', false)
return `${base}/${relKey}`
}
diff --git a/packages/storage/src/providers/s3.ts b/packages/storage/src/providers/s3.ts
index 965ec595..2abc14c8 100644
--- a/packages/storage/src/providers/s3.ts
+++ b/packages/storage/src/providers/s3.ts
@@ -192,12 +192,14 @@ export class S3StorageProvider implements StorageProvider {
// Default AWS S3 endpoint
if (!endpoint) {
return `https://${bucket}.s3.${region}.amazonaws.com/${key}`
- } else if (endpoint.includes('amazonaws.com')) {
+ }
+ const hostname = new URL(endpoint).hostname.toLowerCase()
+ if (hostname === 'amazonaws.com' || hostname.endsWith('.amazonaws.com')) {
return `https://${bucket}.s3.${region}.amazonaws.com/${key}`
}
// Alibaba Cloud OSS
- if (endpoint.includes('aliyuncs.com')) {
+ if (hostname === 'aliyuncs.com' || hostname.endsWith('.aliyuncs.com')) {
const baseUrl = endpoint.replace(/\/$/, '')
if (baseUrl.indexOf('//') === -1) {
throw new Error('Invalid endpoint URL')
@@ -376,9 +378,14 @@ export class S3StorageProvider implements StorageProvider {
} while (marker)
if (
remote.size !== count ||
+ parts.length !== count ||
+ new Set(parts.map((part) => part.partNumber)).size !== count ||
parts.some((part) => {
const uploaded = remote.get(part.partNumber)
return (
+ !Number.isInteger(part.partNumber) ||
+ part.partNumber < 1 ||
+ part.partNumber > count ||
uploaded?.etag !== part.etag ||
uploaded?.size !==
Math.min(partSize, size - (part.partNumber - 1) * partSize)
diff --git a/server/utils/dto.ts b/server/utils/dto.ts
index 19d436ca..52e7f960 100644
--- a/server/utils/dto.ts
+++ b/server/utils/dto.ts
@@ -9,6 +9,7 @@ import type {
User as UserRow,
} from './db'
+/** Expose only the declared photo contract fields, excluding internal database columns. */
export function toPhotoDto(photo: PhotoRow): Photo {
return {
id: photo.id,
@@ -39,6 +40,7 @@ export function toPhotoDto(photo: PhotoRow): Photo {
}
}
+/** Serialize album dates and expose password presence without its hash. */
export function toAlbumDto(album: AlbumRow): Album {
return {
id: album.id,
@@ -53,6 +55,7 @@ export function toAlbumDto(album: AlbumRow): Album {
}
}
+/** Build a session-safe user summary without password material. */
export function toUserSummary(user: UserRow): UserSummary {
return {
id: user.id,
@@ -64,6 +67,7 @@ export function toUserSummary(user: UserRow): UserSummary {
}
}
+/** Serialize an administrator-only provider response; configuration may contain secrets. */
export function toStorageProviderDto(
provider: import('../types/settings').StorageProviderRow,
): import('@chronoframe/contracts/settings').SettingStorageProvider {
diff --git a/tests/geocoding-package.test.ts b/tests/geocoding-package.test.ts
index 7e158552..2466edc5 100644
--- a/tests/geocoding-package.test.ts
+++ b/tests/geocoding-package.test.ts
@@ -58,3 +58,28 @@ test('geocoding injects transport, language, retry and rate limiting without app
{},
)
})
+
+test('GPS text parsing accepts decimal pairs and rejects hostile metadata', () => {
+ const { parseGPSCoordinates } = createGeocodingServices({
+ getLanguage: async () => 'en',
+ request: fetch,
+ waitForGeocodingSlot: async () => {},
+ withRetry,
+ retryOptions: RetryPresets.network,
+ logger,
+ })
+ for (const text of ['48.85, 2.35', '48.85° 2.35°', ' +48.85 -2.35 ']) {
+ assert.deepEqual(parseGPSCoordinates({ GPSCoordinates: text }), {
+ latitude: 48.85,
+ longitude: text.includes('-') ? -2.35 : 2.35,
+ })
+ }
+ for (const text of [
+ '9'.repeat(100_000),
+ '9'.repeat(100_000) + ', 2',
+ '1.2.3, 4',
+ '999, 2',
+ ]) {
+ assert.deepEqual(parseGPSCoordinates({ GPSCoordinates: text }), {})
+ }
+})
diff --git a/tests/storage-package.test.ts b/tests/storage-package.test.ts
index 925f71e5..ce500e50 100644
--- a/tests/storage-package.test.ts
+++ b/tests/storage-package.test.ts
@@ -223,9 +223,9 @@ test(
res.statusCode = 404
res.end('<Error><Code>NoSuchKey</Code></Error>')
}
- } catch (error) {
+ } catch {
res.statusCode = 500
- res.end(String(error))
+ res.end('Internal server error')
}
})
server.listen(0, '127.0.0.1')
@@ -282,6 +282,16 @@ test(
/ETag mismatch/,
)
assert.equal(await provider.getFileMeta('large.jpg'), null)
+ for (const invalidParts of [
+ [],
+ uploadedParts.slice(0, 1),
+ [uploadedParts[0]!, uploadedParts[0]!],
+ [...uploadedParts, uploadedParts[0]!],
+ uploadedParts.map((part) => ({ ...part, partNumber: 0 })),
+ ]) {
+ await assert.rejects(plan.complete(invalidParts), /ETag mismatch/)
+ assert.equal(await provider.getFileMeta('large.jpg'), null)
+ }
await plan.complete(uploadedParts)
assert.equal((await provider.getFileMeta('large.jpg'))?.size, size)
await provider.delete('small.jpg')
@@ -292,3 +302,57 @@ test(
}
},
)
+
+test('Local URL slash trimming handles long edge runs', () => {
+ const slashes = '/'.repeat(100_000)
+ const provider = new LocalStorageProvider({
+ provider: 'local',
+ basePath: '/tmp',
+ prefix: `${slashes}photos${slashes}`,
+ baseUrl: `https://media.example.com${slashes}`,
+ })
+ assert.equal(
+ provider.getPublicUrl('pic.jpg'),
+ 'https://media.example.com/photos/pic.jpg',
+ )
+})
+
+test('S3 public URL routing matches endpoint hostnames rather than URL substrings', () => {
+ for (const [endpoint, expected] of [
+ [
+ 'https://s3.us-east-1.amazonaws.com',
+ 'https://photos.s3.us-east-1.amazonaws.com/pic.jpg',
+ ],
+ [
+ 'https://oss-cn-hangzhou.aliyuncs.com',
+ 'https://photos.oss-cn-hangzhou.aliyuncs.com/pic.jpg',
+ ],
+ [
+ 'https://amazonaws.com.attacker.example',
+ 'https://amazonaws.com.attacker.example/photos/pic.jpg',
+ ],
+ [
+ 'https://aliyuncs.com.attacker.example',
+ 'https://aliyuncs.com.attacker.example/photos/pic.jpg',
+ ],
+ ['https://notamazonaws.com', 'https://notamazonaws.com/photos/pic.jpg'],
+ [
+ 'https://storage.example/amazonaws.com',
+ 'https://storage.example/amazonaws.com/photos/pic.jpg',
+ ],
+ [
+ 'https://storage.example/aliyuncs.com',
+ 'https://storage.example/aliyuncs.com/photos/pic.jpg',
+ ],
+ ]) {
+ const provider = new S3StorageProvider({
+ provider: 's3',
+ bucket: 'photos',
+ region: 'us-east-1',
+ endpoint,
+ accessKeyId: 'fixture-key',
+ secretAccessKey: 'fixture-secret',
+ })
+ assert.equal(provider.getPublicUrl('pic.jpg'), expected)
+ }
+})