release: v1.2.3 — 修复简短图片链接在按年/月存储下 404

开启简短链接时纯文件名直链先经 SQLite 索引反查完整 key,不再误解析为扁平 images/文件名路径。
This commit is contained in:
O96u committed 2026-08-30 12:33:33 +08:00
1 parent c9c34515dd
commit 3dc727fc73
7 files changed
+57 -7

No files matched your search

+6
View File
@@ -4,6 +4,12 @@
## [Unreleased] ## [Unreleased]
## [1.2.3] - 2026-08-30
### 修复
- 开启「简短图片链接」且按年/月分组时,纯文件名直链(如 `/xxx.webp`)误解析为 `images/xxx.webp` 导致 404;现先经 SQLite 索引反查完整 key
## [1.2.2] - 2026-08-30 ## [1.2.2] - 2026-08-30
### 修复 ### 修复
+8
View File
@@ -4,6 +4,14 @@ Version history and notable changes. The full log is also in the repo root [CHAN
--- ---
## [1.2.3] — 2026-08-30
### Fix
- **Short links + date-based storage**: bare filename URLs (e.g. `https://host/xxx.webp`) no longer map to flat `images/xxx.webp`; SQLite index resolves the full `images/YYYY/MM/xxx.webp` key so thumbnails and short links work again
---
## [1.2.2] — 2026-08-30 ## [1.2.2] — 2026-08-30
> **Restart the service** after upgrading so middleware and API updates take effect. > **Restart the service** after upgrading so middleware and API updates take effect.
+8
View File
@@ -4,6 +4,14 @@ PicHost 版本历史与重要变更说明。完整记录亦见仓库根目录 [C
--- ---
## [1.2.3] — 2026-08-30
### 修复
- **简短图片链接 + 按年/月分组**:纯文件名直链(如 `https://域名/xxx.webp`)不再误当成 `images/xxx.webp`,改为经 SQLite 索引反查 `images/年/月/xxx.webp`,缩略图与短链恢复正常
---
## [1.2.2] — 2026-08-30 ## [1.2.2] — 2026-08-30
> 升级后请**重启服务**使中间件与 API 生效。 > 升级后请**重启服务**使中间件与 API 生效。
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "pichost", "name": "pichost",
"version": "1.2.2", "version": "1.2.3",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "pichost", "name": "pichost",
"version": "1.2.2", "version": "1.2.3",
"hasInstallScript": true, "hasInstallScript": true,
"license": "GPL-3.0-only", "license": "GPL-3.0-only",
"dependencies": { "dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "pichost", "name": "pichost",
"version": "1.2.2", "version": "1.2.3",
"description": "Self-hosted image hosting for your NAS / home server — Nuxt admin UI, local disk or S3-compatible storage, server-side WebP compression, referer protection, Twikoo/EasyImage compatible.", "description": "Self-hosted image hosting for your NAS / home server — Nuxt admin UI, local disk or S3-compatible storage, server-side WebP compression, referer protection, Twikoo/EasyImage compatible.",
"homepage": "https://github.com/O96u/PicHost#readme", "homepage": "https://github.com/O96u/PicHost#readme",
"repository": { "repository": {
+24 -3
View File
@@ -1,10 +1,31 @@
import { describe, expect, it } from 'vitest' import { describe, expect, it, vi, afterEach } from 'vitest'
import { findImageKeyByDatePath, findImageKeyByFilename } from './image-index'
import { requestPathToImageKey } from './serve-image' import { requestPathToImageKey } from './serve-image'
vi.mock('./image-index', async (importOriginal) => {
const actual = await importOriginal<typeof import('./image-index')>()
return {
...actual,
findImageKeyByFilename: vi.fn(actual.findImageKeyByFilename),
findImageKeyByDatePath: vi.fn(actual.findImageKeyByDatePath)
}
})
describe('requestPathToImageKey hide folder', () => { describe('requestPathToImageKey hide folder', () => {
it('resolves bare filename to default folder flat key', () => { afterEach(() => {
vi.mocked(findImageKeyByFilename).mockReset()
vi.mocked(findImageKeyByDatePath).mockReset()
})
it('resolves bare filename via index when hide folder is enabled', () => {
vi.mocked(findImageKeyByFilename).mockReturnValue('images/2026/08/demo.webp')
expect(requestPathToImageKey('/demo.webp', { hideFolder: true })) expect(requestPathToImageKey('/demo.webp', { hideFolder: true }))
.toBe('images/demo.webp') .toBe('images/2026/08/demo.webp')
})
it('does not guess flat images/name when hide folder is enabled', () => {
vi.mocked(findImageKeyByFilename).mockReturnValue(null)
expect(requestPathToImageKey('/demo.webp', { hideFolder: true })).toBeNull()
}) })
it('resolves hidden date path to default folder key', () => { it('resolves hidden date path to default folder key', () => {
+8 -1
View File
@@ -8,7 +8,7 @@ import {
} from './env' } from './env'
import { findImageKeyByDatePath, findImageKeyByFilename } from './image-index' import { findImageKeyByDatePath, findImageKeyByFilename } from './image-index'
import { validateImageKey } from './image-key' import { validateImageKey } from './image-key'
import { toStorageKeyFromPublicPath } from './image-public-path' import { isBareImageFilename, toStorageKeyFromPublicPath } from './image-public-path'
import { buildPublicImageUrl } from './image-response' import { buildPublicImageUrl } from './image-response'
import { createImageStream, headImage } from './storage' import { createImageStream, headImage } from './storage'
import { getBackendRowForKey } from './storage/resolver' import { getBackendRowForKey } from './storage/resolver'
@@ -85,6 +85,13 @@ export function requestPathToImageKey(
if (validateImageKey(raw)) return raw if (validateImageKey(raw)) return raw
// 简短链接:纯文件名须先走索引反查,不能猜成 images/文件名(与按年/月存储冲突)
if (options?.hideFolder && isBareImageFilename(raw)) {
const byFilename = findImageKeyByFilename(raw)
if (byFilename && validateImageKey(byFilename)) return byFilename
return null
}
const fromPublic = toStorageKeyFromPublicPath(raw) const fromPublic = toStorageKeyFromPublicPath(raw)
if (fromPublic) return fromPublic if (fromPublic) return fromPublic