Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

fix(backend:files): escape regexp metacharacters in file paths (#305)

David Owi36a843cba34d
diff --git a/backend/src/applications/comments/services/comments-queries.e2e-spec.ts b/backend/src/applications/comments/services/comments-queries.e2e-spec.ts
new file mode 100644
index 00000000..ad49f616
--- /dev/null
+++ b/backend/src/applications/comments/services/comments-queries.e2e-spec.ts
@@ -0,0 +1,135 @@
+import { Test, TestingModule } from '@nestjs/testing'
+import { eq, inArray } from 'drizzle-orm'
+import { randomUUID } from 'node:crypto'
+import { AvailabilityModule } from '../../../infrastructure/availability/availability.module.js'
+import type { Cache } from '../../../infrastructure/cache/cache.service.js'
+import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants.js'
+import { DatabaseModule } from '../../../infrastructure/database/database.module.js'
+import type { DBSchema } from '../../../infrastructure/database/interfaces/database.interface.js'
+import { dbGetInsertedId } from '../../../infrastructure/database/utils.js'
+import { files } from '../../files/schemas/files.schema.js'
+import { FilesQueries } from '../../files/services/files-queries.service.js'
+import { sharesMembers } from '../../shares/schemas/shares-members.schema.js'
+import { shares } from '../../shares/schemas/shares.schema.js'
+import { SharesQueries } from '../../shares/services/shares-queries.service.js'
+import { spacesMembers } from '../../spaces/schemas/spaces-members.schema.js'
+import { spacesRoots } from '../../spaces/schemas/spaces-roots.schema.js'
+import { spaces } from '../../spaces/schemas/spaces.schema.js'
+import { SpacesQueries } from '../../spaces/services/spaces-queries.service.js'
+import { users } from '../../users/schemas/users.schema.js'
+import { comments } from '../schemas/comments.schema.js'
+import { CommentsQueries } from './comments-queries.service.js'
+
+describe('Comments queries (e2e)', () => {
+ let module: TestingModule
+ let db: DBSchema
+ let commentsQueries: CommentsQueries
+ let ownerId: number
+ let memberId: number
+ let spaceId: number
+ let shareId: number
+
+ const suffix = randomUUID().replaceAll('-', '').slice(0, 12)
+ const rootName = `comments-root-[${suffix}`
+ const caseEquivalentRootName = rootName.toUpperCase()
+ const siblingRootName = `${rootName}-sibling`
+ const nestedName = 'nested.+'
+ const spaceAlias = `e2e-comments-space-${suffix}`
+ const shareAlias = `e2e-comments-share-${suffix}`
+ const noCache = {
+ genSlugKey: vi.fn((...args: unknown[]) => args.join(':')),
+ get: vi.fn().mockResolvedValue(undefined),
+ set: vi.fn().mockResolvedValue(true)
+ } as unknown as Cache
+
+ beforeAll(async () => {
+ module = await Test.createTestingModule({ imports: [AvailabilityModule, DatabaseModule] }).compile()
+ module.useLogger(['fatal'])
+ db = await module.resolve<DBSchema>(DB_TOKEN_PROVIDER)
+ const filesQueries = new FilesQueries(db)
+ const spacesQueries = new SpacesQueries(db, noCache, filesQueries)
+ const sharesQueries = new SharesQueries(db, noCache)
+ commentsQueries = new CommentsQueries(db, spacesQueries, sharesQueries)
+
+ ownerId = dbGetInsertedId(
+ await db.insert(users).values({
+ login: `e2e-comments-owner-${suffix}`,
+ email: `e2e-comments-owner-${suffix}@example.test`,
+ password: 'password'
+ })
+ )
+ memberId = dbGetInsertedId(
+ await db.insert(users).values({
+ login: `e2e-comments-member-${suffix}`,
+ email: `e2e-comments-member-${suffix}@example.test`,
+ password: 'password'
+ })
+ )
+
+ const rootFileId = dbGetInsertedId(await db.insert(files).values({ ownerId, path: '.', name: rootName, isDir: true }))
+ const anchoredFileId = dbGetInsertedId(
+ await db
+ .insert(files)
+ .values({ ownerId, path: `${caseEquivalentRootName}/${nestedName}`, name: 'anchored.txt', isDir: false, mime: 'text/plain' })
+ )
+ const siblingFileId = dbGetInsertedId(
+ await db.insert(files).values({ ownerId, path: `${siblingRootName}/${nestedName}`, name: 'outside.txt', isDir: false, mime: 'text/plain' })
+ )
+ spaceId = dbGetInsertedId(await db.insert(spaces).values({ alias: spaceAlias, name: 'Comments space' }))
+ const nativeFileId = dbGetInsertedId(
+ await db.insert(files).values({ spaceId, path: 'native-folder', name: 'native.txt', isDir: false, mime: 'text/plain' })
+ )
+ await db.insert(spacesRoots).values({ spaceId, fileId: rootFileId, alias: 'anchor', name: 'Anchor' })
+ await db.insert(spacesMembers).values({ spaceId, userId: memberId, permissions: 'a:d:m:so' })
+
+ shareId = dbGetInsertedId(await db.insert(shares).values({ ownerId, fileId: rootFileId, alias: shareAlias, name: 'Comments share' }))
+ await db.insert(sharesMembers).values({ shareId, userId: memberId, permissions: 'd:m' })
+ await db.insert(comments).values([
+ { userId: ownerId, fileId: anchoredFileId, content: 'Anchored comment' },
+ { userId: ownerId, fileId: nativeFileId, content: 'Native space comment' },
+ { userId: ownerId, fileId: siblingFileId, content: 'Sibling comment' }
+ ])
+ })
+
+ afterAll(async () => {
+ try {
+ if (shareId) await db.delete(shares).where(eq(shares.id, shareId))
+ if (spaceId) await db.delete(spaces).where(eq(spaces.id, spaceId))
+ const userIds = [ownerId, memberId].filter((id): id is number => Number.isInteger(id))
+ if (userIds.length) await db.delete(users).where(inArray(users.id, userIds))
+ } finally {
+ await module?.close()
+ }
+ })
+
+ it('resolves comments from an anchored root and native files in the same space', async () => {
+ const recentComments = await commentsQueries.getRecentsFromSpaces(memberId, [spaceId], 10)
+
+ expect(recentComments).toHaveLength(2)
+ expect(recentComments.some(({ content }) => content === 'Sibling comment')).toBe(false)
+ expect(recentComments).toEqual(
+ expect.arrayContaining([
+ expect.objectContaining({
+ content: 'Anchored comment',
+ file: expect.objectContaining({ path: `files/${spaceAlias}/anchor/${nestedName}`, name: 'anchored.txt' })
+ }),
+ expect.objectContaining({
+ content: 'Native space comment',
+ file: expect.objectContaining({ path: `files/${spaceAlias}/native-folder`, name: 'native.txt' })
+ })
+ ])
+ )
+ })
+
+ it('resolves comments from a direct share', async () => {
+ const recentComments = await commentsQueries.getRecentsFromShares(memberId, [shareId], 10)
+
+ expect(recentComments.some(({ content }) => content === 'Sibling comment')).toBe(false)
+ expect(recentComments).toEqual([
+ expect.objectContaining({
+ content: 'Anchored comment',
+ file: expect.objectContaining({ path: `shares/${shareAlias}/${nestedName}`, name: 'anchored.txt' })
+ })
+ ])
+ })
+})
diff --git a/backend/src/applications/comments/services/comments-queries.service.ts b/backend/src/applications/comments/services/comments-queries.service.ts
index 8ef6fe5d..c013c87b 100644
--- a/backend/src/applications/comments/services/comments-queries.service.ts
+++ b/backend/src/applications/comments/services/comments-queries.service.ts
@@ -4,7 +4,7 @@ import { alias, union } from 'drizzle-orm/mysql-core'
import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants.js'
import type { DBSchema } from '../../../infrastructure/database/interfaces/database.interface.js'
import { dbCheckAffectedRows, dbGetInsertedId } from '../../../infrastructure/database/utils.js'
-import { filePathSQL, files } from '../../files/schemas/files.schema.js'
+import { childPathMatch, filePathSQL, files, replacePathPrefix } from '../../files/schemas/files.schema.js'
import { UserMailNotification } from '../../notifications/interfaces/user-mail-notification.interface.js'
import { shares } from '../../shares/schemas/shares.schema.js'
import { externalShareScopeSQL } from '../../shares/utils/external-share-scope.sql.js'
@@ -102,6 +102,7 @@ export class CommentsQueries {
getRecentsFromShares(userId: number, shareIds: number[], limit: number) {
const shareFile: any = alias(files, 'shareFile')
+ const shareFilePath = filePathSQL(shareFile)
const externalShareTargets = this.db
.select({ id: shares.id, parentId: shares.parentId, externalPath: shares.externalPath })
.from(shares)
@@ -120,7 +121,7 @@ export class CommentsQueries {
path: sql<string>`
CONCAT_WS('/', ${SPACE_REPOSITORY.SHARES},
IF (${shareFile.id} IS NOT NULL,
- IF (${files.id} = ${shareFile.id}, NULL, REGEXP_REPLACE(${files.path}, ${filePathSQL(shareFile)}, ${shares.alias})),
+ IF (${files.id} = ${shareFile.id}, NULL, ${replacePathPrefix(files.path, shareFilePath, shares.alias)}),
CONCAT_WS('/', ${shares.alias}, IF (${files.path} = '.', NULL, ${files.path}))
)
)`.as('path'),
@@ -153,7 +154,7 @@ export class CommentsQueries {
sql`${files.ownerId} <=> ${shareFile.ownerId}`,
sql`${files.spaceExternalRootId} <=> ${shareFile.spaceExternalRootId}`,
sql`${files.shareExternalId} <=> ${shareFile.shareExternalId}`,
- sql`${files.path} REGEXP CONCAT('^', IF(${shareFile.path} = '.', CONCAT(${shareFile.name}, '(/.*|)$'), CONCAT(${shareFile.path}, '/')))`
+ childPathMatch(files.path, shareFilePath)
)
)
)
@@ -197,6 +198,18 @@ export class CommentsQueries {
getRecentsFromSpaces(userId: number, spaceIds: number[], limit: number) {
const spaceRootFile: any = alias(files, 'spaceRootFile')
+ const spaceRootFilePath = filePathSQL(spaceRootFile)
+ const fileFromSpaceRoot = or(
+ eq(files.id, spaceRootFile.id),
+ and(
+ isNotNull(spaceRootFile.id),
+ eq(spaceRootFile.isDir, true),
+ // A file moved to trash leaves the storage scope of its former anchored root.
+ eq(files.inTrash, spaceRootFile.inTrash),
+ sql`${files.ownerId} <=> ${spaceRootFile.ownerId}`,
+ childPathMatch(files.path, spaceRootFilePath)
+ )
+ )
return this.db
.select({
id: comments.id,
@@ -209,8 +222,8 @@ export class CommentsQueries {
CONCAT_WS('/',
IF (${files.inTrash} = 0, ${SPACE_REPOSITORY.FILES}, ${SPACE_REPOSITORY.TRASH}),
IF (${files.ownerId} = ${userId}, ${SPACE_ALIAS.PERSONAL}, ${spaces.alias}),
- IF (${spaceRootFile.id} IS NOT NULL,
- IF (${files.id} = ${spaceRootFile.id}, NULL, IF (${files.path} = '.', NULL, REGEXP_REPLACE(${files.path}, ${filePathSQL(spaceRootFile)}, ${spacesRoots.alias}))),
+ IF (${fileFromSpaceRoot},
+ IF (${files.id} = ${spaceRootFile.id}, NULL, IF (${files.path} = '.', NULL, ${replacePathPrefix(files.path, spaceRootFilePath, spacesRoots.alias)})),
NULLIF(CONCAT_WS('/', IF (${files.spaceExternalRootId} = ${spacesRoots.id}, ${spacesRoots.alias}, NULL), IF (${files.path} = '.', NULL, ${files.path})), '')
)
)`.as('path'),
@@ -229,17 +242,8 @@ export class CommentsQueries {
or(
// all files from spaces
eq(files.spaceId, spaces.id),
- // all files from space roots
- eq(files.id, spacesRoots.fileId),
- // all files under the space roots
- and(
- isNotNull(spaceRootFile.id),
- eq(spaceRootFile.isDir, true),
- // A file moved to trash leaves the storage scope of its former anchored root.
- eq(files.inTrash, spaceRootFile.inTrash),
- sql`${files.ownerId} <=> ${spaceRootFile.ownerId}`,
- sql`${files.path} REGEXP CONCAT('^', IF(${spaceRootFile.path} = '.', CONCAT(${spaceRootFile.name}, '(/.*|)$'), CONCAT(${spaceRootFile.path}, '/')))`
- )
+ // all files from or under the space roots
+ fileFromSpaceRoot
)
)
.innerJoin(comments, and(eq(comments.fileId, files.id), ne(comments.userId, userId)))
diff --git a/backend/src/applications/files/schemas/files.schema.spec.ts b/backend/src/applications/files/schemas/files.schema.spec.ts
index fdf9d426..89d81583 100644
--- a/backend/src/applications/files/schemas/files.schema.spec.ts
+++ b/backend/src/applications/files/schemas/files.schema.spec.ts
@@ -1,13 +1,13 @@
import { sql } from 'drizzle-orm'
-import { MySqlDialect } from 'drizzle-orm/mysql-core'
-import { childFilesMatch, childFilesReplacePath, files } from './files.schema.js'
+import { alias, MySqlDialect } from 'drizzle-orm/mysql-core'
+import { childFilesMatch, childFilesReplacePath, childPathMatch, filePathSQL, files, replacePathPrefix } from './files.schema.js'
describe('files path SQL helpers', () => {
const dialect = new MySqlDialect()
it('binds paths instead of interpolating them into the SQL statement', () => {
- const srcPath = "source\\'directory"
- const dstPath = "destination\\'directory"
+ const srcPath = "source/[.+*?^$(){}|\\\\'directory"
+ const dstPath = "destination/[.+*?^$(){}|\\\\'directory"
const query = dialect.sqlToQuery(
sql`UPDATE ${files} SET ${files.path} = ${childFilesReplacePath(srcPath, dstPath)} WHERE ${childFilesMatch(srcPath)}`
)
@@ -18,6 +18,21 @@ describe('files path SQL helpers', () => {
expect(query.params).toEqual([dstPath, srcPath, srcPath, srcPath])
})
+ it('composes dynamic path expressions without using regular expressions', () => {
+ const sourceFile: any = alias(files, 'sourceFile')
+ const sourcePath = filePathSQL(sourceFile)
+ const query = dialect.sqlToQuery(
+ sql`SELECT ${replacePathPrefix(files.path, sourcePath, sourceFile.name)} FROM ${files} LEFT JOIN ${sourceFile} ON ${childPathMatch(files.path, sourcePath)}`
+ )
+
+ expect(query.sql).not.toContain('REGEXP')
+ expect(query.sql).not.toContain('COLLATE')
+ expect(query.sql).toContain('SUBSTRING(`files`.`path`, CHAR_LENGTH(')
+ expect(query.sql).toContain("LEFT(CONCAT(`files`.`path`, '/'), CHAR_LENGTH(")
+ expect(query.sql).toContain('`sourceFile`.`path`')
+ expect(query.params).toEqual([])
+ })
+
it('matches an exact path or a slash-separated descendant without ignoring trailing spaces', () => {
const path = 'documents/project '
const query = dialect.sqlToQuery(childFilesMatch(path))
diff --git a/backend/src/applications/files/schemas/files.schema.ts b/backend/src/applications/files/schemas/files.schema.ts
index f86f7c12..3186ceda 100644
--- a/backend/src/applications/files/schemas/files.schema.ts
+++ b/backend/src/applications/files/schemas/files.schema.ts
@@ -1,4 +1,4 @@
-import { SQL, sql, SQLWrapper } from 'drizzle-orm'
+import { SQL, sql, type SQLWrapper } from 'drizzle-orm'
import { AnyMySqlColumn, bigint, boolean, index, mysqlTable, varchar } from 'drizzle-orm/mysql-core'
import { shares } from '../../shares/schemas/shares.schema.js'
import { spacesRoots } from '../../spaces/schemas/spaces-roots.schema.js'
@@ -56,13 +56,16 @@ export const filePathSQL = (file: any): SQL<string> => sql`
)
`
-// Appending '/' handles both an exact path and its descendants while keeping trailing spaces significant with PAD SPACE collations.
-export const childPathMatch = (pathSQL: SQLWrapper, path: string): SQL<string> =>
+// Appending '/' handles both an exact path and its descendants while keeping trailing spaces significant.
+export const childPathMatch = (pathSQL: SQLWrapper, path: string | SQLWrapper): SQL<string> =>
sql`LEFT(CONCAT(${pathSQL}, '/'), CHAR_LENGTH(${path}) + 1) = CONCAT(${path}, '/')`
// Applies the literal path-boundary match to the path stored on file records.
export const childFilesMatch = (path: string): SQL<string> => childPathMatch(files.path, path)
// Replaces a previously matched source prefix while preserving the remaining child-path suffix.
-export const childFilesReplacePath = (srcPath: string, dstPath: string): SQL<string> =>
- sql`CONCAT(${dstPath}, SUBSTRING(${files.path}, CHAR_LENGTH(${srcPath}) + 1))`
+export const replacePathPrefix = (pathSQL: SQLWrapper, srcPath: string | SQLWrapper, dstPath: string | SQLWrapper): SQL<string> =>
+ sql`CONCAT(${dstPath}, SUBSTRING(${pathSQL}, CHAR_LENGTH(${srcPath}) + 1))`
+
+// Applies the literal prefix replacement to the path stored on file records.
+export const childFilesReplacePath = (srcPath: string, dstPath: string): SQL<string> => replacePathPrefix(files.path, srcPath, dstPath)
diff --git a/backend/src/applications/files/services/files-favorites-queries.e2e-spec.ts b/backend/src/applications/files/services/files-favorites-queries.e2e-spec.ts
index a01aae2a..479b2109 100644
--- a/backend/src/applications/files/services/files-favorites-queries.e2e-spec.ts
+++ b/backend/src/applications/files/services/files-favorites-queries.e2e-spec.ts
@@ -46,11 +46,14 @@ describe('Files favorites queries (e2e)', () => {
let shareId: number
let rootFileId: number
let activeFileId: number
+ let movedFileId: number
let trashedFileId: number
let syncPathId: number
const suffix = randomUUID().replaceAll('-', '').slice(0, 12)
- const rootName = `favorite-root-${suffix}`
+ const rootName = `favorite-root-[${suffix}`
+ const nestedName = 'nested.+'
+ const movedParentPath = `${rootName}-moved`
const spaceAlias = `e2e-favorite-space-${suffix}`
const shareAlias = `e2e-favorite-share-${suffix}`
const syncClientId = randomUUID()
@@ -86,7 +89,14 @@ describe('Files favorites queries (e2e)', () => {
)
rootFileId = dbGetInsertedId(await db.insert(files).values({ ownerId, path: '.', name: rootName, isDir: true }))
- activeFileId = dbGetInsertedId(await db.insert(files).values({ ownerId, path: rootName, name: 'active.txt', isDir: false }))
+ activeFileId = dbGetInsertedId(
+ await db
+ .insert(files)
+ .values({ ownerId, path: `${rootName.toUpperCase()}/${nestedName}`, name: 'active.txt', isDir: false, mime: 'text/plain' })
+ )
+ movedFileId = dbGetInsertedId(
+ await db.insert(files).values({ ownerId, path: movedParentPath, name: 'moved', isDir: true, mime: 'inode/directory' })
+ )
trashedFileId = dbGetInsertedId(await db.insert(files).values({ ownerId, path: rootName, name: 'trashed.txt', isDir: false, inTrash: true }))
spaceId = dbGetInsertedId(await db.insert(spaces).values({ alias: spaceAlias, name: 'Favorite space' }))
await db.insert(spacesRoots).values({ spaceId, fileId: rootFileId, alias: 'anchor', name: 'Anchor' })
@@ -134,7 +144,8 @@ describe('Files favorites queries (e2e)', () => {
{ userId: ownerId, fileId: rootFileId },
{ userId: ownerId, fileId: trashedFileId },
{ userId: memberId, fileId: trashedFileId },
- { userId: memberId, fileId: activeFileId }
+ { userId: memberId, fileId: activeFileId },
+ { userId: memberId, fileId: movedFileId }
])
await db.insert(comments).values([
{ userId: ownerId, fileId: trashedFileId, content: 'Comment from owner' },
@@ -168,7 +179,7 @@ describe('Files favorites queries (e2e)', () => {
expect.objectContaining({
fileId: activeFileId,
repository: FILE_REPOSITORY.SPACE,
- path: `files/${spaceAlias}/anchor`,
+ path: `files/${spaceAlias}/anchor/${nestedName}`,
displayRootName: 'Favorite space'
})
])
@@ -178,11 +189,13 @@ describe('Files favorites queries (e2e)', () => {
expect.objectContaining({
fileId: activeFileId,
repository: FILE_REPOSITORY.SHARE,
- path: `shares/${shareAlias}`,
+ path: `shares/${shareAlias}/${nestedName}`,
displayRootName: 'Favorite share'
})
])
)
+ expect(spaceLocations.some(({ fileId }) => fileId === movedFileId)).toBe(false)
+ expect(shareLocations.some(({ fileId }) => fileId === movedFileId)).toBe(false)
})
it('returns browser details', async () => {
@@ -214,10 +227,11 @@ describe('Files favorites queries (e2e)', () => {
it('does not resolve a trashed child through its former space anchor', async () => {
const spaceIds = (await spacesQueries.spaceIdentities(memberId)).map(({ id }) => id)
const locations = await favoritesQueries.getFavoriteLocationsFromSpaces(memberId, spaceIds)
+ const recentComments = await commentsQueries.getRecentsFromSpaces(memberId, spaceIds, 10)
expect(spaceIds).toContain(spaceId)
expect(locations.some(({ fileId }) => fileId === trashedFileId)).toBe(false)
- await expect(commentsQueries.getRecentsFromSpaces(memberId, spaceIds, 10)).resolves.toEqual([])
+ expect(recentComments.some(({ content }) => content === 'Comment from owner')).toBe(false)
await expect(favoritesQueries.getFavoritesFromUser(ownerId, true, true)).resolves.toEqual(
expect.arrayContaining([
@@ -232,9 +246,10 @@ describe('Files favorites queries (e2e)', () => {
it('does not resolve a trashed child through its former share', async () => {
const shareIds = (await sharesQueries.shareIdentities(memberId, 0)).map(({ id }) => id)
const locations = await favoritesQueries.getFavoriteLocationsFromShares(memberId, shareIds)
+ const recentComments = await commentsQueries.getRecentsFromShares(memberId, shareIds, 10)
expect(shareIds).toContain(shareId)
expect(locations.some(({ fileId }) => fileId === trashedFileId)).toBe(false)
- await expect(commentsQueries.getRecentsFromShares(memberId, shareIds, 10)).resolves.toEqual([])
+ expect(recentComments.some(({ content }) => content === 'Comment from owner')).toBe(false)
})
})
diff --git a/backend/src/applications/files/services/files-favorites-queries.service.ts b/backend/src/applications/files/services/files-favorites-queries.service.ts
index b337af23..4423f787 100644
--- a/backend/src/applications/files/services/files-favorites-queries.service.ts
+++ b/backend/src/applications/files/services/files-favorites-queries.service.ts
@@ -15,7 +15,7 @@ import { syncPaths } from '../../sync/schemas/sync-paths.schema.js'
import { FILE_REPOSITORY } from '../constants/operations.js'
import type { FileFavorite, FileFavoriteLocation, FileFavoriteRepository } from '../schemas/file-favorite.interface.js'
import { filesFavorites } from '../schemas/files-favorites.schema.js'
-import { filePathSQL, files } from '../schemas/files.schema.js'
+import { childPathMatch, filePathSQL, files, replacePathPrefix } from '../schemas/files.schema.js'
@Injectable()
export class FilesFavoritesQueries {
@@ -84,6 +84,7 @@ export class FilesFavoritesQueries {
const directSpaceRoot: any = alias(spacesRoots, 'favoriteDirectSpaceRoot')
const anchoredSpaceRoot: any = alias(spacesRoots, 'favoriteAnchoredSpaceRoot')
const spaceRootFile: any = alias(files, 'favoriteSpaceRootFile')
+ const spaceRootFilePath = filePathSQL(spaceRootFile)
const fileFromSpaceRoot = or(
eq(files.id, spaceRootFile.id),
and(
@@ -94,7 +95,7 @@ export class FilesFavoritesQueries {
sql`${files.ownerId} <=> ${spaceRootFile.ownerId}`,
sql`${files.spaceExternalRootId} <=> ${spaceRootFile.spaceExternalRootId}`,
sql`${files.shareExternalId} <=> ${spaceRootFile.shareExternalId}`,
- sql`LEFT(CONCAT(${files.path}, '/'), CHAR_LENGTH(${filePathSQL(spaceRootFile)}) + 1) = CONCAT(${filePathSQL(spaceRootFile)}, '/')`
+ childPathMatch(files.path, spaceRootFilePath)
)
)
const directFiles = this.db
@@ -130,7 +131,7 @@ export class FilesFavoritesQueries {
IF (
${files.id} = ${spaceRootFile.id},
NULL,
- CONCAT(${anchoredSpaceRoot.alias}, SUBSTRING(${files.path}, CHAR_LENGTH(${filePathSQL(spaceRootFile)}) + 1))
+ ${replacePathPrefix(files.path, spaceRootFilePath, anchoredSpaceRoot.alias)}
)
)
`.as('path'),
@@ -156,8 +157,9 @@ export class FilesFavoritesQueries {
const spaceShareRoot: any = alias(spacesRoots, 'favoriteSpaceShareRoot')
const externalShareSpaceRoot: any = alias(spacesRoots, 'favoriteExternalShareSpaceRoot')
const externalSpaceRoot: any = alias(spacesRoots, 'favoriteExternalSpaceRoot')
- const fileFromRoot = (rootFile: any) =>
- or(
+ const fileFromRoot = (rootFile: any) => {
+ const rootFilePath = filePathSQL(rootFile)
+ return or(
eq(files.id, rootFile.id),
and(
eq(rootFile.isDir, true),
@@ -167,11 +169,13 @@ export class FilesFavoritesQueries {
sql`${files.ownerId} <=> ${rootFile.ownerId}`,
sql`${files.spaceExternalRootId} <=> ${rootFile.spaceExternalRootId}`,
sql`${files.shareExternalId} <=> ${rootFile.shareExternalId}`,
- sql`LEFT(CONCAT(${files.path}, '/'), CHAR_LENGTH(${filePathSQL(rootFile)}) + 1) = CONCAT(${filePathSQL(rootFile)}, '/')`
+ childPathMatch(files.path, rootFilePath)
)
)
- const rootLocationSelect = (rootFile: any, spaceRoot: any) =>
- ({
+ }
+ const rootLocationSelect = (rootFile: any, spaceRoot: any) => {
+ const rootFilePath = filePathSQL(rootFile)
+ return {
fileId: sql<number>`${files.id}`.as('fileId'),
repository: sql<FileFavoriteRepository>`${FILE_REPOSITORY.SHARE}`.as('repository'),
path: sql<string>`
@@ -179,7 +183,7 @@ export class FilesFavoritesQueries {
IF (
${files.id} = ${rootFile.id},
NULL,
- CONCAT(${shares.alias}, SUBSTRING(${files.path}, CHAR_LENGTH(${filePathSQL(rootFile)}) + 1))
+ ${replacePathPrefix(files.path, rootFilePath, shares.alias)}
)
)
`.as('path'),
@@ -187,7 +191,8 @@ export class FilesFavoritesQueries {
displayRootName: sql<string>`${shares.name}`.as('displayRootName'),
contextId: sql<number>`${shares.id}`.as('contextId'),
rootId: sql<number>`COALESCE(${spaceRoot.id}, 0)`.as('rootId')
- }) satisfies Record<keyof FileFavoriteLocation, any>
+ } satisfies Record<keyof FileFavoriteLocation, any>
+ }
const externalLocationSelect = (spaceRoot: any) =>
({
fileId: sql<number>`${files.id}`.as('fileId'),
diff --git a/backend/src/applications/shares/services/shares-queries.e2e-spec.ts b/backend/src/applications/shares/services/shares-queries.e2e-spec.ts
new file mode 100644
index 00000000..bc2a9823
--- /dev/null
+++ b/backend/src/applications/shares/services/shares-queries.e2e-spec.ts
@@ -0,0 +1,290 @@
+import { Test, TestingModule } from '@nestjs/testing'
+import { eq, inArray } from 'drizzle-orm'
+import { randomUUID } from 'node:crypto'
+import { AvailabilityModule } from '../../../infrastructure/availability/availability.module.js'
+import type { Cache } from '../../../infrastructure/cache/cache.service.js'
+import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants.js'
+import { DatabaseModule } from '../../../infrastructure/database/database.module.js'
+import type { DBSchema } from '../../../infrastructure/database/interfaces/database.interface.js'
+import { dbGetInsertedId } from '../../../infrastructure/database/utils.js'
+import { files } from '../../files/schemas/files.schema.js'
+import { spacesRoots } from '../../spaces/schemas/spaces-roots.schema.js'
+import { spaces } from '../../spaces/schemas/spaces.schema.js'
+import type { UserModel } from '../../users/models/user.model.js'
+import { users } from '../../users/schemas/users.schema.js'
+import { sharesMembers } from '../schemas/shares-members.schema.js'
+import { shares } from '../schemas/shares.schema.js'
+import { SharesQueries } from './shares-queries.service.js'
+
+describe('Shares queries (e2e)', () => {
+ let module: TestingModule
+ let db: DBSchema
+ let sharesQueries: SharesQueries
+ let actorId: number
+ let ownerId: number
+ let externalRootId: number
+ let childId: number
+ let grandchildId: number
+ let internalRootId: number
+ let pathSpaceId: number
+ let spaceFileShareId: number
+ let movedSpaceFileShareId: number
+ let parentFileShareId: number
+ let childFileShareId: number
+ let movedChildFileShareId: number
+ let sameFileChildShareId: number
+
+ const suffix = randomUUID().replaceAll('-', '').slice(0, 12)
+ const aliases = {
+ root: `e2e-ext-root-${suffix}`,
+ child: `e2e-ext-child-${suffix}`,
+ grandchild: `e2e-ext-grandchild-${suffix}`,
+ unauthorizedChild: `e2e-ext-unauthorized-${suffix}`,
+ internalRoot: `e2e-internal-root-${suffix}`,
+ malformedChild: `e2e-ext-malformed-${suffix}`,
+ spaceFile: `e2e-space-file-${suffix}`,
+ parentFile: `e2e-parent-file-${suffix}`,
+ childFile: `e2e-child-file-${suffix}`,
+ movedSpaceFile: `e2e-moved-space-file-${suffix}`,
+ movedChildFile: `e2e-moved-child-file-${suffix}`,
+ sameFileChild: `e2e-same-file-child-${suffix}`
+ }
+ const externalPath = `/e2e/external/${suffix}`
+ const pathRootName = `root-[${suffix}`
+ const movedPathRootName = `${pathRootName}-moved`
+ const parentDirectoryName = 'notes['
+ const movedParentDirectoryName = `${parentDirectoryName}-moved`
+ const noCache = {
+ genSlugKey: vi.fn((...args: unknown[]) => args.join(':')),
+ get: vi.fn().mockResolvedValue(undefined),
+ set: vi.fn().mockResolvedValue(true)
+ } as unknown as Cache
+
+ beforeAll(async () => {
+ module = await Test.createTestingModule({ imports: [AvailabilityModule, DatabaseModule] }).compile()
+ module.useLogger(['fatal'])
+ db = await module.resolve<DBSchema>(DB_TOKEN_PROVIDER)
+ sharesQueries = new SharesQueries(db, noCache)
+
+ actorId = dbGetInsertedId(
+ await db.insert(users).values({
+ login: `e2e-share-actor-${suffix}`,
+ email: `e2e-share-actor-${suffix}@example.test`,
+ password: 'password'
+ })
+ )
+ ownerId = dbGetInsertedId(
+ await db.insert(users).values({
+ login: `e2e-share-owner-${suffix}`,
+ email: `e2e-share-owner-${suffix}@example.test`,
+ password: 'password'
+ })
+ )
+
+ externalRootId = dbGetInsertedId(await db.insert(shares).values({ alias: aliases.root, name: 'External root', ownerId: null, externalPath }))
+ childId = dbGetInsertedId(
+ await db.insert(shares).values({
+ alias: aliases.child,
+ name: 'External child',
+ ownerId,
+ parentId: externalRootId,
+ externalPath
+ })
+ )
+ grandchildId = dbGetInsertedId(
+ await db.insert(shares).values({
+ alias: aliases.grandchild,
+ name: 'External grandchild',
+ ownerId,
+ parentId: childId,
+ externalPath
+ })
+ )
+ await db.insert(shares).values({
+ alias: aliases.unauthorizedChild,
+ name: 'External child without membership',
+ ownerId,
+ parentId: externalRootId,
+ externalPath
+ })
+
+ internalRootId = dbGetInsertedId(
+ await db.insert(shares).values({ alias: aliases.internalRoot, name: 'Internal root', ownerId, externalPath: null })
+ )
+ const malformedChildId = dbGetInsertedId(
+ await db.insert(shares).values({
+ alias: aliases.malformedChild,
+ name: 'Malformed external child',
+ ownerId,
+ parentId: internalRootId,
+ externalPath
+ })
+ )
+
+ await db.insert(sharesMembers).values([
+ { shareId: externalRootId, userId: actorId, permissions: 'a:d:m:so' },
+ { shareId: childId, userId: actorId, permissions: 'd:m' },
+ { shareId: grandchildId, userId: actorId, permissions: 'm' },
+ { shareId: malformedChildId, userId: actorId, permissions: 'd:m' }
+ ])
+
+ const pathRootFileId = dbGetInsertedId(await db.insert(files).values({ ownerId, path: '.', name: pathRootName, isDir: true }))
+ const spaceTargetFileId = dbGetInsertedId(
+ await db.insert(files).values({ ownerId, path: `${pathRootName.toUpperCase()}/${pathRootName}`, name: 'space-target.txt', isDir: false })
+ )
+ const movedSpaceTargetFileId = dbGetInsertedId(
+ await db.insert(files).values({ ownerId, path: `${pathRootName}/before-move`, name: 'space-moved.txt', isDir: false })
+ )
+ pathSpaceId = dbGetInsertedId(await db.insert(spaces).values({ alias: `e2e-share-path-space-${suffix}`, name: 'Share path space' }))
+ const pathSpaceRootId = dbGetInsertedId(
+ await db.insert(spacesRoots).values({ spaceId: pathSpaceId, fileId: pathRootFileId, alias: 'anchor', name: 'Anchor' })
+ )
+ spaceFileShareId = dbGetInsertedId(
+ await db.insert(shares).values({
+ ownerId,
+ spaceId: pathSpaceId,
+ spaceRootId: pathSpaceRootId,
+ fileId: spaceTargetFileId,
+ alias: aliases.spaceFile,
+ name: 'Space file share'
+ })
+ )
+ movedSpaceFileShareId = dbGetInsertedId(
+ await db.insert(shares).values({
+ ownerId,
+ spaceId: pathSpaceId,
+ spaceRootId: pathSpaceRootId,
+ fileId: movedSpaceTargetFileId,
+ alias: aliases.movedSpaceFile,
+ name: 'Moved space file share'
+ })
+ )
+ await db.update(files).set({ path: movedPathRootName }).where(eq(files.id, movedSpaceTargetFileId))
+
+ const parentFileId = dbGetInsertedId(await db.insert(files).values({ ownerId, path: pathRootName, name: parentDirectoryName, isDir: true }))
+ const childFileId = dbGetInsertedId(
+ await db.insert(files).values({
+ ownerId,
+ path: `${pathRootName.toUpperCase()}/${parentDirectoryName.toUpperCase()}/${parentDirectoryName}`,
+ name: 'child.txt',
+ isDir: false
+ })
+ )
+ const movedChildFileId = dbGetInsertedId(
+ await db.insert(files).values({ ownerId, path: `${pathRootName}/${parentDirectoryName}/before-move`, name: 'child-moved.txt', isDir: false })
+ )
+ parentFileShareId = dbGetInsertedId(
+ await db.insert(shares).values({ ownerId, fileId: parentFileId, alias: aliases.parentFile, name: 'Parent file share' })
+ )
+ childFileShareId = dbGetInsertedId(
+ await db.insert(shares).values({
+ ownerId,
+ parentId: parentFileShareId,
+ fileId: childFileId,
+ alias: aliases.childFile,
+ name: 'Child file share'
+ })
+ )
+ movedChildFileShareId = dbGetInsertedId(
+ await db.insert(shares).values({
+ ownerId,
+ parentId: parentFileShareId,
+ fileId: movedChildFileId,
+ alias: aliases.movedChildFile,
+ name: 'Moved child file share'
+ })
+ )
+ await db
+ .update(files)
+ .set({ path: `${pathRootName}/${movedParentDirectoryName}` })
+ .where(eq(files.id, movedChildFileId))
+ sameFileChildShareId = dbGetInsertedId(
+ await db.insert(shares).values({
+ ownerId,
+ parentId: parentFileShareId,
+ fileId: parentFileId,
+ alias: aliases.sameFileChild,
+ name: 'Same file child share'
+ })
+ )
+ })
+
+ afterAll(async () => {
+ try {
+ const rootIds = [externalRootId, internalRootId].filter((id): id is number => Number.isInteger(id))
+ if (rootIds.length) {
+ await db.delete(shares).where(inArray(shares.id, rootIds))
+ }
+ if (pathSpaceId) await db.delete(spaces).where(eq(spaces.id, pathSpaceId))
+ const userIds = [actorId, ownerId].filter((id): id is number => Number.isInteger(id))
+ if (userIds.length) {
+ await db.delete(users).where(inArray(users.id, userIds))
+ }
+ } finally {
+ await module?.close()
+ }
+ })
+
+ it('keeps descendant permissions while resolving the external root storage scope', async () => {
+ const root = await sharesQueries.permissions(actorId, aliases.root)
+ const child = await sharesQueries.permissions(actorId, aliases.child)
+ const grandchild = await sharesQueries.permissions(actorId, aliases.grandchild)
+
+ expect(root).toMatchObject({
+ id: externalRootId,
+ permissions: 'a:d:m:so',
+ root: { externalPath, externalParentShareId: null }
+ })
+ expect(child).toMatchObject({
+ id: childId,
+ permissions: 'd:m',
+ root: { externalPath, externalParentShareId: externalRootId }
+ })
+ expect(grandchild).toMatchObject({
+ id: grandchildId,
+ permissions: 'm',
+ root: { externalPath, externalParentShareId: externalRootId }
+ })
+ expect(grandchild!.root!.externalParentShareId).not.toBe(childId)
+ })
+
+ it('uses the same external root scope without replacing each listed share permissions', async () => {
+ const roots = await sharesQueries.shareRootFiles({ id: actorId, isAdmin: false } as UserModel, null)
+ const child = roots.find((root) => root.root!.alias === aliases.child)
+ const grandchild = roots.find((root) => root.root!.alias === aliases.grandchild)
+
+ expect(child).toMatchObject({ origin: { shareExternalId: externalRootId }, root: { permissions: 'd:m' } })
+ expect(grandchild).toMatchObject({ origin: { shareExternalId: externalRootId }, root: { permissions: 'm' } })
+ })
+
+ it('does not inherit access from an external parent without a child membership', async () => {
+ await expect(sharesQueries.permissions(actorId, aliases.unauthorizedChild)).resolves.toBeUndefined()
+ })
+
+ it('fails closed when an external child has a non-external parent', async () => {
+ await expect(sharesQueries.permissions(actorId, aliases.malformedChild)).resolves.toBeUndefined()
+
+ const roots = await sharesQueries.shareRootFiles({ id: actorId, isAdmin: false } as UserModel, null)
+ expect(roots.some((root) => root.root!.alias === aliases.malformedChild)).toBe(false)
+ })
+
+ it('resolves file paths literally from space and parent-share roots', async () => {
+ const listedShares = await sharesQueries.listShares({ id: ownerId, isAdmin: false } as UserModel)
+
+ expect(listedShares.find(({ id }) => id === spaceFileShareId)).toMatchObject({
+ file: { path: `${pathRootName}/space-target.txt` }
+ })
+ expect(listedShares.find(({ id }) => id === childFileShareId)).toMatchObject({
+ file: { path: 'notes[/child.txt' }
+ })
+ expect(listedShares.find(({ id }) => id === movedSpaceFileShareId)).toMatchObject({
+ file: { path: `${movedPathRootName}/space-moved.txt` }
+ })
+ expect(listedShares.find(({ id }) => id === movedChildFileShareId)).toMatchObject({
+ file: { path: `${pathRootName}/${movedParentDirectoryName}/child-moved.txt` }
+ })
+ expect(listedShares.find(({ id }) => id === sameFileChildShareId)).toMatchObject({
+ file: { path: '.' }
+ })
+ })
+})
diff --git a/backend/src/applications/shares/services/shares-queries.service.ts b/backend/src/applications/shares/services/shares-queries.service.ts
index 78aac1d1..738f91b6 100644
--- a/backend/src/applications/shares/services/shares-queries.service.ts
+++ b/backend/src/applications/shares/services/shares-queries.service.ts
@@ -22,7 +22,7 @@ import { fileHasCommentsSubquerySQL } from '../../comments/schemas/comments.sche
import type { FileProps } from '../../files/interfaces/file-props.interface.js'
import type { FileSpace } from '../../files/interfaces/file-space.interface.js'
import { filesFavorites } from '../../files/schemas/files-favorites.schema.js'
-import { filePathSQL, files } from '../../files/schemas/files.schema.js'
+import { childPathMatch, filePathSQL, files, replacePathPrefix } from '../../files/schemas/files.schema.js'
import { links } from '../../links/schemas/links.schema.js'
import type { SpaceBrowseDetails } from '../../spaces/interfaces/space-files.interface.js'
import { SpaceEnv } from '../../spaces/models/space-env.model.js'
@@ -1024,6 +1024,15 @@ export class SharesQueries {
const parentShareFile: any = alias(files, 'parentShareFile')
const childShareFromRoot: any = alias(spacesRoots, 'childShareFromRoot')
const shareMembers: any = alias(sharesMembers, 'shareMembers')
+ const selectedFilePath = filePathSQL(files)
+ const shareRootFilePath = filePathSQL(shareRootFile)
+ const parentShareFilePath = filePathSQL(parentShareFile)
+ const relativeFilePathFromRoot = (rootFilePath: SQL<string>): SQL<string> =>
+ sql`IF (
+ ${and(childPathMatch(selectedFilePath, rootFilePath), sql`CHAR_LENGTH(${selectedFilePath}) > CHAR_LENGTH(${rootFilePath})`)},
+ ${replacePathPrefix(selectedFilePath, sql`CONCAT(${rootFilePath}, '/')`, '')},
+ ${selectedFilePath}
+ )`
const selectFile = {
id: sql`IF (${shares.fileId} IS NULL AND ${shareRootFile.id} IS NOT NULL,
${shareRootFile.id}, ${files.id})`.as('fileId'),
@@ -1034,11 +1043,11 @@ export class SharesQueries {
IF(${childShareFromRoot.id} IS NOT NULL
OR ${shares.fileId} = ${parentShare.fileId}, ${parentShare.name}, ${files.name}))`.as('fileName'),
path: sql`IF (${shareRootFile.id} IS NOT NULL AND ${shares.fileId} IS NOT NULL,
- REGEXP_REPLACE(${filePathSQL(files)}, CONCAT(${filePathSQL(shareRootFile)}, '/'), ''),
+ ${relativeFilePathFromRoot(shareRootFilePath)},
IF(${parentShareFile.id} IS NOT NULL AND ${shares.fileId} IS NOT NULL,
IF(${parentShareFile.id} = ${shares.fileId}, '.',
- REGEXP_REPLACE(${filePathSQL(files)}, CONCAT(${filePathSQL(parentShareFile)}, '/'), '')),
- IF(${shares.fileId} IS NOT NULL, ${filePathSQL(files)}, '.')))`.as('filePath'),
+ ${relativeFilePathFromRoot(parentShareFilePath)}),
+ IF(${shares.fileId} IS NOT NULL, ${selectedFilePath}, '.')))`.as('filePath'),
isDir: sql`IF (${shares.fileId} IS NULL AND ${shares.spaceRootId} IS NOT NULL,
${shareRootFile.isDir}, ${files.isDir})`.as('fileIsDir'),
inTrash: sql`IF (${shares.fileId} IS NULL AND ${shares.spaceRootId} IS NOT NULL,
diff --git a/backend/src/applications/shares/shares.e2e-spec.ts b/backend/src/applications/shares/shares.e2e-spec.ts
index 34bbf1e5..00e1df59 100644
--- a/backend/src/applications/shares/shares.e2e-spec.ts
+++ b/backend/src/applications/shares/shares.e2e-spec.ts
@@ -1,5 +1,5 @@
import { Test, TestingModule } from '@nestjs/testing'
-import { inArray } from 'drizzle-orm'
+import { eq, inArray } from 'drizzle-orm'
import { randomUUID } from 'node:crypto'
import { AvailabilityModule } from '../../infrastructure/availability/availability.module.js'
import type { Cache } from '../../infrastructure/cache/cache.service.js'
@@ -14,7 +14,6 @@ import { files } from '../files/schemas/files.schema.js'
import { FilesFavoritesQueries } from '../files/services/files-favorites-queries.service.js'
import { FilesQueries } from '../files/services/files-queries.service.js'
import { SpacesQueries } from '../spaces/services/spaces-queries.service.js'
-import type { UserModel } from '../users/models/user.model.js'
import { users } from '../users/schemas/users.schema.js'
import { SharesQueries } from './services/shares-queries.service.js'
import { sharesMembers } from './schemas/shares-members.schema.js'
@@ -24,23 +23,18 @@ describe('Shares (e2e)', () => {
let module: TestingModule
let db: DBSchema
let sharesQueries: SharesQueries
- let actorId: number
let childActorId: number
let ownerId: number
let externalRootId: number
let childId: number
let grandchildId: number
- let internalRootId: number
let externalFileId: number
const suffix = randomUUID().replaceAll('-', '').slice(0, 12)
const aliases = {
root: `e2e-ext-root-${suffix}`,
child: `e2e-ext-child-${suffix}`,
- grandchild: `e2e-ext-grandchild-${suffix}`,
- unauthorizedChild: `e2e-ext-unauthorized-${suffix}`,
- internalRoot: `e2e-internal-root-${suffix}`,
- malformedChild: `e2e-ext-malformed-${suffix}`
+ grandchild: `e2e-ext-grandchild-${suffix}`
}
const externalPath = `/e2e/external/${suffix}`
const noCache = {
@@ -55,13 +49,6 @@ describe('Shares (e2e)', () => {
db = await module.resolve<DBSchema>(DB_TOKEN_PROVIDER)
sharesQueries = new SharesQueries(db, noCache)
- actorId = dbGetInsertedId(
- await db.insert(users).values({
- login: `e2e-share-actor-${suffix}`,
- email: `e2e-share-actor-${suffix}@example.test`,
- password: 'password'
- })
- )
childActorId = dbGetInsertedId(
await db.insert(users).values({
login: `e2e-share-child-actor-${suffix}`,
@@ -96,32 +83,7 @@ describe('Shares (e2e)', () => {
externalPath
})
)
- await db.insert(shares).values({
- alias: aliases.unauthorizedChild,
- name: 'External child without membership',
- ownerId,
- parentId: externalRootId,
- externalPath
- })
-
- internalRootId = dbGetInsertedId(
- await db.insert(shares).values({ alias: aliases.internalRoot, name: 'Internal root', ownerId, externalPath: null })
- )
- const malformedChildId = dbGetInsertedId(
- await db.insert(shares).values({
- alias: aliases.malformedChild,
- name: 'Malformed external child',
- ownerId,
- parentId: internalRootId,
- externalPath
- })
- )
-
await db.insert(sharesMembers).values([
- { shareId: externalRootId, userId: actorId, permissions: 'a:d:m:so' },
- { shareId: childId, userId: actorId, permissions: 'd:m' },
- { shareId: grandchildId, userId: actorId, permissions: 'm' },
- { shareId: malformedChildId, userId: actorId, permissions: 'd:m' },
{ shareId: childId, userId: childActorId, permissions: 'd:m' },
{ shareId: grandchildId, userId: childActorId, permissions: 'm' }
])
@@ -135,55 +97,14 @@ describe('Shares (e2e)', () => {
afterAll(async () => {
try {
- const rootIds = [externalRootId, internalRootId].filter((id): id is number => Number.isInteger(id))
- if (rootIds.length) {
- await db.delete(shares).where(inArray(shares.id, rootIds))
- }
- const userIds = [actorId, childActorId, ownerId].filter((id): id is number => Number.isInteger(id))
- if (userIds.length) {
- await db.delete(users).where(inArray(users.id, userIds))
- }
+ if (externalRootId) await db.delete(shares).where(eq(shares.id, externalRootId))
+ const userIds = [childActorId, ownerId].filter((id): id is number => Number.isInteger(id))
+ if (userIds.length) await db.delete(users).where(inArray(users.id, userIds))
} finally {
await module?.close()
}
})
- it('keeps descendant permissions while resolving the external root storage scope', async () => {
- const root = await sharesQueries.permissions(actorId, aliases.root)
- const child = await sharesQueries.permissions(actorId, aliases.child)
- const grandchild = await sharesQueries.permissions(actorId, aliases.grandchild)
-
- expect(root).toMatchObject({
- id: externalRootId,
- permissions: 'a:d:m:so',
- root: { externalPath, externalParentShareId: null }
- })
- expect(child).toMatchObject({
- id: childId,
- permissions: 'd:m',
- root: { externalPath, externalParentShareId: externalRootId }
- })
- expect(grandchild).toMatchObject({
- id: grandchildId,
- permissions: 'm',
- root: { externalPath, externalParentShareId: externalRootId }
- })
- expect(grandchild!.root!.externalParentShareId).not.toBe(childId)
- })
-
- it('uses the same external root scope without replacing each listed share permissions', async () => {
- const roots = await sharesQueries.shareRootFiles({ id: actorId, isAdmin: false } as UserModel, null)
- const child = roots.find((root) => root.root!.alias === aliases.child)
- const grandchild = roots.find((root) => root.root!.alias === aliases.grandchild)
-
- expect(child).toMatchObject({ origin: { shareExternalId: externalRootId }, root: { permissions: 'd:m' } })
- expect(grandchild).toMatchObject({ origin: { shareExternalId: externalRootId }, root: { permissions: 'm' } })
- })
-
- it('does not inherit access from an external parent without a child membership', async () => {
- await expect(sharesQueries.permissions(actorId, aliases.unauthorizedChild)).resolves.toBeUndefined()
- })
-
it('resolves favorite and recent-comment locations through an external child only', async () => {
const favoritesQueries = new FilesFavoritesQueries(db)
const spacesQueries = new SpacesQueries(db, noCache, new FilesQueries(db))
@@ -203,11 +124,4 @@ describe('Shares (e2e)', () => {
expect.objectContaining({ file: expect.objectContaining({ path: `shares/${aliases.child}`, displayRootName: 'External child' }) })
])
})
-
- it('fails closed when an external child has a non-external parent', async () => {
- await expect(sharesQueries.permissions(actorId, aliases.malformedChild)).resolves.toBeUndefined()
-
- const roots = await sharesQueries.shareRootFiles({ id: actorId, isAdmin: false } as UserModel, null)
- expect(roots.some((root) => root.root!.alias === aliases.malformedChild)).toBe(false)
- })
})
diff --git a/backend/src/applications/sync/services/sync-queries.e2e-spec.ts b/backend/src/applications/sync/services/sync-queries.e2e-spec.ts
new file mode 100644
index 00000000..c818a793
--- /dev/null
+++ b/backend/src/applications/sync/services/sync-queries.e2e-spec.ts
@@ -0,0 +1,196 @@
+import { Test, TestingModule } from '@nestjs/testing'
+import { eq } from 'drizzle-orm'
+import { randomUUID } from 'node:crypto'
+import { AvailabilityModule } from '../../../infrastructure/availability/availability.module.js'
+import type { Cache } from '../../../infrastructure/cache/cache.service.js'
+import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants.js'
+import { DatabaseModule } from '../../../infrastructure/database/database.module.js'
+import type { DBSchema } from '../../../infrastructure/database/interfaces/database.interface.js'
+import { dbGetInsertedId } from '../../../infrastructure/database/utils.js'
+import { files } from '../../files/schemas/files.schema.js'
+import { shares } from '../../shares/schemas/shares.schema.js'
+import { spacesRoots } from '../../spaces/schemas/spaces-roots.schema.js'
+import { spaces } from '../../spaces/schemas/spaces.schema.js'
+import { users } from '../../users/schemas/users.schema.js'
+import { SYNC_CLIENT_TYPE, SYNC_PATH_CONFLICT_MODE, SYNC_PATH_DIFF_MODE, SYNC_PATH_MODE, SYNC_PATH_SCHEDULER_UNIT } from '../constants/sync.js'
+import type { SyncPathSettings } from '../interfaces/sync-path.interface.js'
+import { syncClients } from '../schemas/sync-clients.schema.js'
+import { syncPaths } from '../schemas/sync-paths.schema.js'
+import { SyncQueries } from './sync-queries.service.js'
+
+describe('Sync queries (e2e)', () => {
+ let module: TestingModule
+ let db: DBSchema
+ let syncQueries: SyncQueries
+ let ownerId: number
+ let spaceId: number
+ let shareId: number
+
+ const suffix = randomUUID().replaceAll('-', '').slice(0, 12)
+ const rootName = `sync-root-[${suffix}`
+ const nestedName = 'nested.+'
+ const movedParentPath = `${rootName}-moved`
+ const spaceAlias = `e2e-sync-space-${suffix}`
+ const shareAlias = `e2e-sync-share-${suffix}`
+ const syncClientId = randomUUID()
+ const noCache = {
+ genSlugKey: vi.fn((...args: unknown[]) => args.join(':')),
+ get: vi.fn().mockResolvedValue(undefined),
+ set: vi.fn().mockResolvedValue(true)
+ } as unknown as Cache
+
+ beforeAll(async () => {
+ module = await Test.createTestingModule({ imports: [AvailabilityModule, DatabaseModule] }).compile()
+ module.useLogger(['fatal'])
+ db = await module.resolve<DBSchema>(DB_TOKEN_PROVIDER)
+ syncQueries = new SyncQueries(db, noCache)
+
+ ownerId = dbGetInsertedId(
+ await db.insert(users).values({
+ login: `e2e-sync-owner-${suffix}`,
+ email: `e2e-sync-owner-${suffix}@example.test`,
+ password: 'password'
+ })
+ )
+
+ const rootFileId = dbGetInsertedId(await db.insert(files).values({ ownerId, path: '.', name: rootName, isDir: true }))
+ const directChildFileId = dbGetInsertedId(await db.insert(files).values({ ownerId, path: rootName.toUpperCase(), name: nestedName, isDir: true }))
+ const activeFileId = dbGetInsertedId(
+ await db
+ .insert(files)
+ .values({ ownerId, path: `${rootName.toUpperCase()}/${nestedName}`, name: 'active.txt', isDir: false, mime: 'text/plain' })
+ )
+ const movedFileId = dbGetInsertedId(
+ await db.insert(files).values({ ownerId, path: movedParentPath, name: 'moved', isDir: true, mime: 'inode/directory' })
+ )
+ spaceId = dbGetInsertedId(await db.insert(spaces).values({ alias: spaceAlias, name: 'Sync space' }))
+ const spaceRootId = dbGetInsertedId(await db.insert(spacesRoots).values({ spaceId, fileId: rootFileId, alias: 'anchor', name: 'Anchor' }))
+ shareId = dbGetInsertedId(await db.insert(shares).values({ ownerId, fileId: rootFileId, alias: shareAlias, name: 'Sync share' }))
+
+ await db.insert(syncClients).values({
+ id: syncClientId,
+ ownerId,
+ token: randomUUID(),
+ tokenExpiration: Number.MAX_SAFE_INTEGER,
+ info: {
+ node: 'Sync client',
+ os: 'test',
+ osRelease: 'test',
+ user: 'test',
+ type: SYNC_CLIENT_TYPE.DESKTOP,
+ version: 'test'
+ }
+ })
+ const settings: SyncPathSettings = {
+ name: 'Sync path',
+ localPath: '/sync',
+ remotePath: '',
+ permissions: '',
+ mode: SYNC_PATH_MODE.BOTH,
+ ignoreDelete: false,
+ enabled: true,
+ diffMode: SYNC_PATH_DIFF_MODE.FAST,
+ conflictMode: SYNC_PATH_CONFLICT_MODE.RECENT,
+ filters: [],
+ scheduler: { value: 0, unit: SYNC_PATH_SCHEDULER_UNIT.DISABLED },
+ timestamp: 0,
+ lastSync: new Date(0)
+ }
+ await db.insert(syncPaths).values([
+ {
+ clientId: syncClientId,
+ spaceId,
+ spaceRootId,
+ fileId: activeFileId,
+ settings: {
+ ...settings,
+ name: 'Space sync',
+ localPath: '/sync/space',
+ remotePath: `spaces/${spaceAlias}/anchor/${nestedName}/active.txt`
+ }
+ },
+ {
+ clientId: syncClientId,
+ shareId,
+ fileId: activeFileId,
+ settings: {
+ ...settings,
+ name: 'Share sync',
+ localPath: '/sync/share',
+ remotePath: `shares/${shareAlias}/${nestedName}/active.txt`
+ }
+ },
+ {
+ clientId: syncClientId,
+ spaceId,
+ spaceRootId,
+ fileId: directChildFileId,
+ settings: {
+ ...settings,
+ name: 'Direct child space sync',
+ localPath: '/sync/direct-child-space',
+ remotePath: `spaces/${spaceAlias}/anchor/${nestedName}`
+ }
+ },
+ {
+ clientId: syncClientId,
+ shareId,
+ fileId: directChildFileId,
+ settings: {
+ ...settings,
+ name: 'Direct child share sync',
+ localPath: '/sync/direct-child-share',
+ remotePath: `shares/${shareAlias}/${nestedName}`
+ }
+ },
+ {
+ clientId: syncClientId,
+ spaceId,
+ spaceRootId,
+ fileId: movedFileId,
+ settings: {
+ ...settings,
+ name: 'Moved space sync',
+ localPath: '/sync/moved-space',
+ remotePath: `spaces/${spaceAlias}/anchor/moved`
+ }
+ },
+ {
+ clientId: syncClientId,
+ shareId,
+ fileId: movedFileId,
+ settings: {
+ ...settings,
+ name: 'Moved share sync',
+ localPath: '/sync/moved-share',
+ remotePath: `shares/${shareAlias}/moved`
+ }
+ }
+ ])
+ })
+
+ afterAll(async () => {
+ try {
+ if (shareId) await db.delete(shares).where(eq(shares.id, shareId))
+ if (spaceId) await db.delete(spaces).where(eq(spaces.id, spaceId))
+ if (ownerId) await db.delete(users).where(eq(users.id, ownerId))
+ } finally {
+ await module?.close()
+ }
+ })
+
+ it('resolves sync paths through an anchored space and a direct share', async () => {
+ const paths = await syncQueries.getPaths(syncClientId)
+
+ expect(paths).toEqual(
+ expect.arrayContaining([
+ expect.objectContaining({ remotePath: `spaces/${spaceAlias}/anchor/${nestedName}/active.txt` }),
+ expect.objectContaining({ remotePath: `shares/${shareAlias}/${nestedName}/active.txt` }),
+ expect.objectContaining({ remotePath: `spaces/${spaceAlias}/anchor/${nestedName}` }),
+ expect.objectContaining({ remotePath: `shares/${shareAlias}/${nestedName}` }),
+ expect.objectContaining({ remotePath: `spaces/${spaceAlias}/${movedParentPath}/moved` }),
+ expect.objectContaining({ remotePath: `shares/${movedParentPath}/moved` })
+ ])
+ )
+ })
+})
diff --git a/backend/src/applications/sync/services/sync-queries.service.ts b/backend/src/applications/sync/services/sync-queries.service.ts
index 2f0d4bce..d4b372de 100644
--- a/backend/src/applications/sync/services/sync-queries.service.ts
+++ b/backend/src/applications/sync/services/sync-queries.service.ts
@@ -9,7 +9,7 @@ import { Cache } from '../../../infrastructure/cache/cache.service.js'
import { DB_TOKEN_PROVIDER } from '../../../infrastructure/database/constants.js'
import type { DBSchema } from '../../../infrastructure/database/interfaces/database.interface.js'
import { concatDistinctObjectsInArray, dbCheckAffectedRows, dbGetInsertedId } from '../../../infrastructure/database/utils.js'
-import { filePathSQL, files } from '../../files/schemas/files.schema.js'
+import { childPathMatch, filePathSQL, files, replacePathPrefix } from '../../files/schemas/files.schema.js'
import { shares } from '../../shares/schemas/shares.schema.js'
import { spacesRoots } from '../../spaces/schemas/spaces-roots.schema.js'
import { spaces } from '../../spaces/schemas/spaces.schema.js'
@@ -162,6 +162,18 @@ export class SyncQueries {
getPaths(clientId: string): Promise<{ id: number; settings: SyncPathSettings; remotePath: string }[]> {
const shareFile: any = alias(files, 'shareFile')
const spaceRootFile: any = alias(files, 'spaceRootFile')
+ const shareFilePath = filePathSQL(shareFile)
+ const spaceRootFilePath = filePathSQL(spaceRootFile)
+ const spacePath = sql`IF (
+ ${childPathMatch(files.path, spaceRootFilePath)},
+ ${replacePathPrefix(files.path, spaceRootFilePath, spacesRoots.alias)},
+ ${files.path}
+ )`
+ const sharePath = sql`IF (
+ ${childPathMatch(files.path, shareFilePath)},
+ ${replacePathPrefix(files.path, shareFilePath, shares.alias)},
+ ${files.path}
+ )`
return this.db
.select({
id: syncPaths.id,
@@ -178,7 +190,7 @@ export class SyncQueries {
ELSE
IF (${spacesRoots.externalPath} IS NOT NULL,
CONCAT_WS('/', ${spacesRoots.alias}, IF (${files.path} = '.', NULL, ${files.path}), ${files.name}),
- CONCAT_WS('/', REGEXP_REPLACE(${files.path}, ${filePathSQL(spaceRootFile)}, ${spacesRoots.alias}), ${files.name})
+ CONCAT_WS('/', ${spacePath}, ${files.name})
)
END
END
@@ -188,7 +200,7 @@ export class SyncQueries {
CASE WHEN ${syncPaths.fileId} IS NULL THEN ${shares.alias}
ELSE
IF (${shareFile.id} IS NOT NULL,
- IF (${files.id} = ${shareFile.id}, NULL, REGEXP_REPLACE(${files.path}, ${filePathSQL(shareFile)}, ${shares.alias})),
+ IF (${files.id} = ${shareFile.id}, NULL, ${sharePath}),
CONCAT_WS('/', ${shares.alias}, IF (${files.path} = '.', NULL, ${files.path}))
)
END,