Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.
TypeScript albumsexif-extractiongeocodinglive-photomotion-photophoto-galleryphoto-sharingwebgl-viewer
fix(queue): require admin privileges to retry location migrations
Timothy Yin2a06f0cabe5a
diff --git a/server/api/queue/task/retry-batch.post.ts b/server/api/queue/task/retry-batch.post.tsindex bc52f065..c68f449a 100644--- a/server/api/queue/task/retry-batch.post.ts+++ b/server/api/queue/task/retry-batch.post.ts@@ -5,7 +5,7 @@ import { eq, inArray } from 'drizzle-orm'* 批量重试失败的任务*/export default defineEventHandler(async (event) => {- await requireUserSession(event)+ const session = await requireUserSession(event)try {const { taskIds, retryAll = false } = await readValidatedBody(@@ -38,6 +38,16 @@ export default defineEventHandler(async (event) => {.from(tables.pipelineQueue).where(whereCondition)+ if (+ !session.user.isAdmin &&+ tasksToRetry.some((task) => task.payload.type === 'location-migration')+ ) {+ throw createError({+ statusCode: 403,+ statusMessage: 'Admin privileges required',+ })+ }+const failedTasks = tasksToRetry.filter((task) => task.status === 'failed')if (failedTasks.length === 0) {diff --git a/server/api/queue/task/retry.post.ts b/server/api/queue/task/retry.post.tsindex 6c859b1e..2952520a 100644--- a/server/api/queue/task/retry.post.ts+++ b/server/api/queue/task/retry.post.ts@@ -5,7 +5,7 @@ import { eq } from 'drizzle-orm'* 重试指定的失败任务*/export default defineEventHandler(async (event) => {- await requireUserSession(event)+ const session = await requireUserSession(event)try {const { taskId } = await readValidatedBody(@@ -31,6 +31,13 @@ export default defineEventHandler(async (event) => {})}+ if (task.payload.type === 'location-migration' && !session.user.isAdmin) {+ throw createError({+ statusCode: 403,+ statusMessage: 'Admin privileges required',+ })+ }+if (task.status !== 'failed') {throw createError({statusCode: 400,diff --git a/server/services/pipeline-queue/manager.ts b/server/services/pipeline-queue/manager.tsindex 0606d375..87ed2459 100644--- a/server/services/pipeline-queue/manager.ts+++ b/server/services/pipeline-queue/manager.ts@@ -479,8 +479,8 @@ export class QueueManager {: null,exif: normalizedExifData,// 地理位置信息- latitude: coordinates?.latitude || null,- longitude: coordinates?.longitude || null,+ latitude: coordinates?.latitude ?? null,+ longitude: coordinates?.longitude ?? null,country: locationInfo?.country || null,city: locationInfo?.city || null,locationName: locationInfo?.locationName || null,@@ -650,7 +650,11 @@ export class QueueManager {eq(tables.photos.latitude, photo.latitude!),eq(tables.photos.longitude, photo.longitude!),)- : eq(tables.photos.id, photoId),+ : and(+ eq(tables.photos.id, photoId),+ eq(tables.photos.latitude, latitude!),+ eq(tables.photos.longitude, longitude!),+ ),)this.logger.success(diff --git a/tests/location-retry.test.ts b/tests/location-retry.test.tsnew file mode 100644index 00000000..3e680383--- /dev/null+++ b/tests/location-retry.test.ts@@ -0,0 +1,101 @@+import assert from 'node:assert/strict'+import test from 'node:test'+import Database from 'better-sqlite3'+import { drizzle } from 'drizzle-orm/better-sqlite3'+import { migrate } from 'drizzle-orm/better-sqlite3/migrator'+import * as tables from '../server/database/schema.ts'++test('retry endpoints authorize migration tasks before updating any tasks', async () => {+ const sqlite = new Database(':memory:')+ const db = drizzle(sqlite)+ migrate(db, { migrationsFolder: 'server/database/migrations' })+ const globals = {+ defineEventHandler: (handler: unknown) => handler,+ requireUserSession: async (event: { admin: boolean }) => ({+ user: { isAdmin: event.admin },+ }),+ readValidatedBody: async (+ event: { body: unknown },+ parse: (body: unknown) => unknown,+ ) => parse(event.body),+ createError: (options: { statusCode: number; statusMessage: string }) =>+ Object.assign(new Error(options.statusMessage), options),+ useDB: () => db,+ tables,+ }+ const previous = Object.getOwnPropertyDescriptors(globalThis)+ Object.assign(globalThis, globals)+ try {+ const { default: single } =+ await import('../server/api/queue/task/retry.post.ts')+ const { default: batch } =+ await import('../server/api/queue/task/retry-batch.post.ts')+ const seed = () => {+ db.delete(tables.pipelineQueue).run()+ db.insert(tables.pipelineQueue)+ .values([+ {+ id: 1,+ payload: { type: 'location-migration' },+ status: 'failed',+ attempts: 3,+ errorMessage: 'failure',+ },+ {+ id: 2,+ payload: { type: 'photo-reverse-geocoding', photoId: 'photo' },+ status: 'failed',+ attempts: 3,+ errorMessage: 'failure',+ },+ ])+ .run()+ }+ const state = () => db.select().from(tables.pipelineQueue).all()+ const callSingle = (taskId: number, admin = false) =>+ single({ body: { taskId }, admin } as never)+ const callBatch = (+ body: { taskIds?: number[]; retryAll?: boolean },+ admin = false,+ ) => batch({ body, admin } as never)+ for (const retry of [+ () => callSingle(1),+ () => callBatch({ taskIds: [2, 1] }),+ () => callBatch({ retryAll: true }),+ ]) {+ seed()+ const before = state()+ await assert.rejects(retry(), { statusCode: 403 })+ assert.deepEqual(+ state(),+ before,+ 'rejected retries must not partially update tasks',+ )+ }+ seed()+ await callSingle(2)+ assert.equal(state().find((task) => task.id === 2)?.status, 'pending')+ seed()+ await callBatch({ taskIds: [2] })+ assert.equal(state().find((task) => task.id === 2)?.status, 'pending')+ seed()+ await callSingle(1, true)+ assert.equal(state().find((task) => task.id === 1)?.status, 'pending')+ seed()+ await callBatch({ retryAll: true }, true)+ assert.ok(+ state().every(+ (task) =>+ task.status === 'pending' &&+ task.attempts === 0 &&+ task.errorMessage === null,+ ),+ )+ } finally {+ sqlite.close()+ for (const key of Object.keys(globals)) {+ if (previous[key]) Object.defineProperty(globalThis, key, previous[key])+ else Reflect.deleteProperty(globalThis, key)+ }+ }+})