Migrations/bookorbit
1
0
Fork 0
mirror of https://github.com/bookorbit/bookorbit.git synced 2026-11-03 00:11:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(types): trim trailing dots and spaces from resolved path segments

Browse Source 
Token values are sanitized before modifiers run, so {authors:sort} rewrote
"J.K. Rowling" into a folder named "Rowling, J.K." that Windows and SMB reject,
serving a mangled 8.3 alias instead. Normalize each segment after assembly rather
than reusing sanitizePathSegment, whose reserved-name guard re-fires on a second
pass and would turn "NUL.txt_" into "NUL.txt__".

Closes #1160
This commit is contained in:
neon
2026-08-27 16:54:07 +00:00
parent c403ccb44c
commit 7ae49c093c
3 changed files with 193 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/types/src/pattern-resolver.ts
+18 -2
View File
@@ -177,6 +177,22 @@ function stripTrailingDotsAndSpaces(value: string): string {
return end === value.length ? value : value.slice(0, end);
}
/**
* Token values are sanitized before modifiers and literal pattern text run, so an assembled
* segment can still end in a dot or space: `{authors:sort}` rewrites "J.K. Rowling" to
* "Rowling, J.K.". Windows and SMB reject those names and serve a mangled 8.3 alias instead.
* Only the trailing run is trimmed here; re-running sanitizePathSegment would append a second
* reserved-name guard ("NUL.txt_" -> "NUL.txt__").
*/
function normalizeResolvedSegments(path: string, options: Required<PathResolverOptions>): string {
if (!options.sanitizeForCrossPlatform || !path) return path;
return path
.split("/")
.map((segment) => (segment ? stripTrailingDotsAndSpaces(segment) || options.replacementCharacter : segment))
.join("/");
}
function sanitizeResolutionValues(values: Record<string, string>, options: Required<PathResolverOptions>): Record<string, string> {
if (!options.sanitizeForCrossPlatform) return values;
@@ -277,7 +293,7 @@ function limitPathSegmentBytes(path: string, dotExt: string): string {
export function resolveUploadPath(pattern: string, values: Record<string, string>, ext: string, options?: PathResolverOptions): string | null {
const normalizedOptions = normalizeResolverOptions(options);
const resolvedValues = sanitizeResolutionValues(values, normalizedOptions);
const resolved = replacePlaceholders(pattern, resolvedValues);
const resolved = normalizeResolvedSegments(replacePlaceholders(pattern, resolvedValues), normalizedOptions);
if (!resolved) return null;
const dotExt = normalizeDotExt(ext);
@@ -301,7 +317,7 @@ export function resolveUploadPath(pattern: string, values: Record<string, string
export function resolveDownloadFilename(pattern: string, values: Record<string, string>, ext: string, options?: PathResolverOptions): string | null {
const normalizedOptions = normalizeResolverOptions(options);
const resolvedValues = sanitizeResolutionValues(values, normalizedOptions);
const resolved = replacePlaceholders(pattern, resolvedValues);
const resolved = normalizeResolvedSegments(replacePlaceholders(pattern, resolvedValues), normalizedOptions);
if (!resolved) return null;
const dotExt = normalizeDotExt(ext);