sinvo/docmost
1
0
Fork 0
mirror of https://github.com/docmost/docmost.git synced 2026-08-28 01:07:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: tighten page move

Browse Source
This commit is contained in:
Philipinho
2026-08-24 20:24:33 +01:00
parent 549cf7c005
commit 8d7302adc6
6 changed files with 162 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/core/page/services/page.service.ts
+41 -6
View File
@@ -7,6 +7,7 @@ import {
import { CreatePageDto, ContentFormat } from '../dto/create-page.dto';
import { ContentOperation, UpdatePageDto } from '../dto/update-page.dto';
import { PageRepo } from '@docmost/db/repos/page/page.repo';
import { MAX_PAGE_TREE_DEPTH } from '@docmost/db/repos/page/constants';
import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';
import { InsertablePage, Page, User } from '@docmost/db/types/entity.types';
import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
@@ -111,6 +112,14 @@ export class PageService {
throw new NotFoundException('Parent page not found');
}
const ancestorIds = await this.pageRepo.getAncestorPageIds(
parentPage.id,
trx,
);
if (ancestorIds.length >= MAX_PAGE_TREE_DEPTH) {
throw new BadRequestException('Page nesting is too deep');
}
parentPageId = parentPage.id;
}
@@ -839,6 +848,18 @@ export class PageService {
) {
throw new NotFoundException('Parent page not found');
}
const ancestorIds = await this.pageRepo.getAncestorPageIds(
parentPage.id,
);
if (ancestorIds.includes(movedPage.id)) {
throw new BadRequestException(
'Cannot move a page under its own descendant',
);
}
if (ancestorIds.length >= MAX_PAGE_TREE_DEPTH) {
throw new BadRequestException('Page nesting is too deep');
}
parentPageId = parentPage.id;
}
}
@@ -868,6 +889,7 @@ export class PageService {
'spaceId',
'deletedAt',
])
.select(sql<number>`0`.as('depth'))
.where('id', '=', childPageId)
.where('deletedAt', 'is', null)
.unionAll((exp) =>
@@ -884,12 +906,24 @@ export class PageService {
'p.spaceId',
'p.deletedAt',
])
.select(sql<number>`pa.depth + 1`.as('depth'))
.innerJoin('page_ancestors as pa', 'pa.parentPageId', 'p.id')
.where('p.deletedAt', 'is', null),
.where('p.deletedAt', 'is', null)
.where('pa.depth', '<', MAX_PAGE_TREE_DEPTH),
),
)
.selectFrom('page_ancestors')
.selectAll('page_ancestors')
.select([
'id',
'slugId',
'title',
'icon',
'isBase',
'position',
'parentPageId',
'spaceId',
'deletedAt',
])
.select((eb) =>
eb
.exists(
@@ -1009,17 +1043,18 @@ export class PageService {
.withRecursive('page_descendants', (db) =>
db
.selectFrom('pages')
.select(['id'])
.select(['id', sql<number>`0`.as('depth')])
.where('id', '=', pageId)
.unionAll((exp) =>
exp
.selectFrom('pages as p')
.select(['p.id'])
.innerJoin('page_descendants as pd', 'pd.id', 'p.parentPageId'),
.select(['p.id', sql<number>`pd.depth + 1`.as('depth')])
.innerJoin('page_descendants as pd', 'pd.id', 'p.parentPageId')
.where('pd.depth', '<', MAX_PAGE_TREE_DEPTH),
),
)
.selectFrom('page_descendants')
.selectAll()
.select(['id'])
.execute();
const pageIds = descendants.map((d) => d.id);
apps/server/src/core/page/services/trash-cleanup.service.ts
+7 -4
View File
@@ -2,6 +2,8 @@ import { Injectable, Logger } from '@nestjs/common';
import { Interval } from '@nestjs/schedule';
import { InjectKysely } from 'nestjs-kysely';
import { KyselyDB } from '@docmost/db/types/kysely.types';
import { MAX_PAGE_TREE_DEPTH } from '@docmost/db/repos/page/constants';
import { sql } from 'kysely';
import { InjectQueue } from '@nestjs/bullmq';
import { Queue } from 'bullmq';
import { QueueJob, QueueName } from '../../../integrations/queue/constants';
@@ -76,17 +78,18 @@ export class TrashCleanupService {
.withRecursive('page_descendants', (db) =>
db
.selectFrom('pages')
.select(['id'])
.select(['id', sql<number>`0`.as('depth')])
.where('id', '=', pageId)
.unionAll((exp) =>
exp
.selectFrom('pages as p')
.select(['p.id'])
.innerJoin('page_descendants as pd', 'pd.id', 'p.parentPageId'),
.select(['p.id', sql<number>`pd.depth + 1`.as('depth')])
.innerJoin('page_descendants as pd', 'pd.id', 'p.parentPageId')
.where('pd.depth', '<', MAX_PAGE_TREE_DEPTH),
),
)
.selectFrom('page_descendants')
.selectAll()
.select(['id'])
.execute();
const pageIds = descendants.map((d) => d.id);
apps/server/src/core/share/share.service.ts
+6 -2
View File
@@ -20,6 +20,7 @@ import {
import { Node } from '@tiptap/pm/model';
import { ShareRepo } from '@docmost/db/repos/share/share.repo';
import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';
import { MAX_PAGE_TREE_DEPTH } from '@docmost/db/repos/page/constants';
import { updateAttachmentAttr } from './share.util';
import { Page } from '@docmost/db/types/entity.types';
import { validate as isValidUUID } from 'uuid';
@@ -247,6 +248,7 @@ export class ShareService {
.else(false)
.end()
.as('found'),
sql<number>`0`.as('depth'),
])
.where(isValidUUID(childPageId) ? 'id' : 'slugId', '=', childPageId)
.unionAll((exp) =>
@@ -266,14 +268,16 @@ export class ShareService {
.else(false)
.end()
.as('found'),
sql<number>`pa.depth + 1`.as('depth'),
])
.innerJoin('page_ancestors as pa', 'pa.parentPageId', 'p.id')
// Continue recursing only when the target ancestor hasn't been found on that branch.
.where('pa.found', '=', false),
.where('pa.found', '=', false)
.where('pa.depth', '<', MAX_PAGE_TREE_DEPTH),
),
)
.selectFrom('page_ancestors')
.selectAll()
.select(['id', 'slugId', 'title', 'parentPageId', 'spaceId'])
.where('found', '=', true)
.limit(1)
.executeTakeFirst();