Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
refactor(backend:files): clarify file reference ID validation
johaven12f64395aa99
diff --git a/backend/src/applications/files/services/files-queries.service.ts b/backend/src/applications/files/services/files-queries.service.tsindex d8df677b..4fc28857 100644--- a/backend/src/applications/files/services/files-queries.service.ts+++ b/backend/src/applications/files/services/files-queries.service.ts@@ -18,7 +18,7 @@ import { File } from '../schemas/file.interface'import { filesFavorites } from '../schemas/files-favorites.schema'import { filesRecents } from '../schemas/files-recents.schema'import { childFilesMatch, childFilesReplacePath, childPathMatch, filePathSQL, files } from '../schemas/files.schema'-import { assertValidFileId, dirName, fileName, isPathInside } from '../utils/files'+import { assertValidFileReferenceId, dirName, fileName, isPathInside } from '../utils/files'@Injectable()export class FilesQueries {@@ -94,7 +94,7 @@ export class FilesQueries {}async getOrCreateUserFile(userId: number, file: FileProps): Promise<number> {- assertValidFileId(file.id)+ assertValidFileReferenceId(file.id)if (file.id > 0) {const [searchFileInDB] = await this.db.select({ id: files.id })@@ -111,7 +111,7 @@ export class FilesQueries {}async getOrCreateSpaceFile(fileId: number, file: FileProps, dbFile: FileDBProps, options: GetOrCreateSpaceFileOptions = {}): Promise<number> {- assertValidFileId(fileId)+ assertValidFileReferenceId(fileId)// `isDir` is intentionally excluded here: this flow reconciles an existing path before insert,// even if the caller has a stale file/dir kind for the same location.const fileInDB = {diff --git a/backend/src/applications/files/utils/files.ts b/backend/src/applications/files/utils/files.tsindex 8b81f695..ee1c8b41 100644--- a/backend/src/applications/files/utils/files.ts+++ b/backend/src/applications/files/utils/files.ts@@ -50,8 +50,11 @@ export function sanitizeName(name: string): string {.replace(/^\s+|[. ]+$/g, '') // trimStart + trimEnd + strip trailing dots}-export function assertValidFileId(fileId: number): void {- if (!Number.isInteger(fileId) || fileId === 0 || (fileId > 0 && !Number.isSafeInteger(fileId))) {+export function assertValidFileReferenceId(fileId: number): void {+ const isTemporaryInode = Number.isInteger(fileId) && fileId < 0+ const isDatabaseId = Number.isSafeInteger(fileId) && fileId > 0++ if (!isTemporaryInode && !isDatabaseId) {throw new HttpException('Invalid file id', HttpStatus.BAD_REQUEST)}}