WIP - audit logs

This commit is contained in:
Philipinho
2026-01-10 12:57:27 +00:00
parent 732951a322
commit 52b34bc6f4
18 changed files with 526 additions and 68 deletions
+1
View File
@@ -44,6 +44,7 @@
"@nestjs-labs/nestjs-ioredis": "^11.0.4", "@nestjs-labs/nestjs-ioredis": "^11.0.4",
"@nestjs/bullmq": "^11.0.4", "@nestjs/bullmq": "^11.0.4",
"@nestjs/common": "^11.1.9", "@nestjs/common": "^11.1.9",
"nestjs-cls": "^4.5.0",
"@nestjs/config": "^4.0.2", "@nestjs/config": "^4.0.2",
"@nestjs/core": "^11.1.9", "@nestjs/core": "^11.1.9",
"@nestjs/event-emitter": "^3.0.1", "@nestjs/event-emitter": "^3.0.1",
+14 -1
View File
@@ -1,6 +1,8 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { APP_INTERCEPTOR } from '@nestjs/core';
import { AppController } from './app.controller'; import { AppController } from './app.controller';
import { AppService } from './app.service'; import { AppService } from './app.service';
import { AuditActorInterceptor } from './common/interceptors/audit-actor.interceptor';
import { CoreModule } from './core/core.module'; import { CoreModule } from './core/core.module';
import { EnvironmentModule } from './integrations/environment/environment.module'; import { EnvironmentModule } from './integrations/environment/environment.module';
import { CollaborationModule } from './collaboration/collaboration.module'; import { CollaborationModule } from './collaboration/collaboration.module';
@@ -18,6 +20,7 @@ import { SecurityModule } from './integrations/security/security.module';
import { TelemetryModule } from './integrations/telemetry/telemetry.module'; import { TelemetryModule } from './integrations/telemetry/telemetry.module';
import { RedisModule } from '@nestjs-labs/nestjs-ioredis'; import { RedisModule } from '@nestjs-labs/nestjs-ioredis';
import { RedisConfigService } from './integrations/redis/redis-config.service'; import { RedisConfigService } from './integrations/redis/redis-config.service';
import { ClsModule } from 'nestjs-cls';
const enterpriseModules = []; const enterpriseModules = [];
try { try {
@@ -35,6 +38,10 @@ try {
@Module({ @Module({
imports: [ imports: [
ClsModule.forRoot({
global: true,
middleware: { mount: true },
}),
CoreModule, CoreModule,
DatabaseModule, DatabaseModule,
EnvironmentModule, EnvironmentModule,
@@ -60,6 +67,12 @@ try {
...enterpriseModules, ...enterpriseModules,
], ],
controllers: [AppController], controllers: [AppController],
providers: [AppService], providers: [
AppService,
{
provide: APP_INTERCEPTOR,
useClass: AuditActorInterceptor,
},
],
}) })
export class AppModule {} export class AppModule {}
@@ -0,0 +1,101 @@
export const AuditEvent = {
// Workspace Invitations
WORKSPACE_CREATED: 'workspace.created',
WORKSPACE_INVITE_CREATED: 'workspace.invite_created',
WORKSPACE_INVITE_REVOKED: 'workspace.invite_revoked',
WORKSPACE_INVITE_ACCEPTED: 'workspace.invite_accepted',
WORKSPACE_USER_CREATED: 'workspace.user_created',
WORKSPACE_USER_DEACTIVATED: 'workspace.user_deactivated',
WORKSPACE_ALLOWED_DOMAIN_UPDATED: 'workspace.allowed_domain_updated',
WORKSPACE_ICON_CHANGED: 'workspace.icon_changed',
WORKSPACE_NAME_CHANGED: 'workspace.name_changed',
WORKSPACE_AI_TOGGLED: 'workspace.ai_toggled',
USER_CREATED: 'user.created',
USER_DELETED: 'user.deleted',
USER_LOGIN: 'user.login',
USER_LOGOUT: 'user.logout',
USER_ROLE_CHANGED: 'user.user_role_changed',
USER_PASSWORD_CHANGED: 'user.password_changed',
USER_PASSWORD_RESET: 'user.reset_password',
USER_PHOTO_CHANGED: 'user.reset_password',
USER_NAME_CHANGED: 'user.name_changed',
USER_EMAIL_CHANGED: 'user.email_changed',
USER_MFA_SETUP: 'user.mfa_setup',
USER_MFA_BACKUP_CODE_GENERATED: 'user.mfa_backup_code_generated',
// API Keys
API_KEY_CREATED: 'api_key.created',
API_KEY_UPDATED: 'api_key.updated',
API_KEY_DELETED: 'api_key.deleted',
// Space
SPACE_CREATED: 'space.created',
SPACE_UPDATED: 'space.updated',
SPACE_DELETED: 'space.deleted',
SPACE_MEMBER_ADDED: 'space.member_added',
SPACE_MEMBER_REMOVED: 'space.member_removed',
SPACE_MEMBER_ROLE_CHANGED: 'space.member_role_changed',
// OR SPACE_USER_ADDED: 'space.user_added',
// SPACE_GROUP_ADDED: 'space.group_added',
// GROUP
GROUP_CREATED: 'group.created',
GROUP_UPDATED: 'group.updated',
GROUP_DELETED: 'group.deleted',
GROUP_MEMBER_ADDED: 'group.member_added',
GROUP_MEMBER_REMOVED: 'group.member_removed',
// Comments
COMMENT_CREATED: 'comment.created',
COMMENT_UPDATED: 'comment.updated',
COMMENT_DELETED: 'comment.deleted',
COMMENT_RESOLVED: 'comment.resolved',
COMMENT_REOPENED: 'comment.reopened',
// PAGE
PAGE_CREATED: 'page.created',
PAGE_UPDATED: 'page.updated',
PAGE_TRASHED: 'page.trash',
PAGE_DELETED: 'page.deleted',
PAGE_SHARED: 'page.shared',
ATTACHMENT_UPLOADED: 'attachment.uploaded',
PAGE_IMPORTED: 'page.imported',
PAGE_RESTORED: 'page.restored',
PAGE_EXPORTED: 'page.exported',
SPACE_EXPORTED: 'space.imported',
// SSO EVENTS
} as const;
export type AuditEventType = (typeof AuditEvent)[keyof typeof AuditEvent];
export type ActorType = 'user' | 'system' | 'api_key';
export interface AuditLogPayload {
event: AuditEventType;
resourceType: string;
resourceId?: string;
changes?: {
before?: Record<string, any>;
after?: Record<string, any>;
};
metadata?: Record<string, any>;
}
export interface AuditLogData extends AuditLogPayload {
workspaceId: string;
actorId?: string;
actorType: ActorType;
ipAddress?: string;
userAgent?: string;
}
@@ -0,0 +1,29 @@
import {
CallHandler,
ExecutionContext,
Injectable,
NestInterceptor,
} from '@nestjs/common';
import { Observable } from 'rxjs';
import { ClsService } from 'nestjs-cls';
import { AuditContext, AUDIT_CONTEXT_KEY } from '../middlewares/audit-context.middleware';
@Injectable()
export class AuditActorInterceptor implements NestInterceptor {
constructor(private readonly cls: ClsService) {}
intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
const request = context.switchToHttp().getRequest();
const user = request.user?.user;
if (user?.id) {
const auditContext = this.cls.get<AuditContext>(AUDIT_CONTEXT_KEY);
if (auditContext) {
auditContext.actorId = user.id;
this.cls.set(AUDIT_CONTEXT_KEY, auditContext);
}
}
return next.handle();
}
}
@@ -0,0 +1,50 @@
import { Injectable, NestMiddleware } from '@nestjs/common';
import { FastifyRequest, FastifyReply } from 'fastify';
import { ClsService } from 'nestjs-cls';
export interface AuditContext {
workspaceId: string | null;
actorId: string | null;
actorType: 'user' | 'system' | 'api_key';
ipAddress: string | null;
}
export const AUDIT_CONTEXT_KEY = 'auditContext';
@Injectable()
export class AuditContextMiddleware implements NestMiddleware {
constructor(private readonly cls: ClsService) {}
use(req: FastifyRequest['raw'], res: FastifyReply['raw'], next: () => void) {
const workspaceId = (req as any).workspaceId ?? null;
const ipAddress = this.extractIpAddress(req);
const auditContext: AuditContext = {
workspaceId,
actorId: null,
actorType: 'user',
ipAddress,
};
this.cls.set(AUDIT_CONTEXT_KEY, auditContext);
next();
}
private extractIpAddress(req: FastifyRequest['raw']): string | null {
const xForwardedFor = req.headers['x-forwarded-for'];
if (xForwardedFor) {
const ips = Array.isArray(xForwardedFor)
? xForwardedFor[0]
: xForwardedFor.split(',')[0];
return ips?.trim() ?? null;
}
const xRealIp = req.headers['x-real-ip'];
if (xRealIp) {
return Array.isArray(xRealIp) ? xRealIp[0] : xRealIp;
}
return (req as any).socket?.remoteAddress ?? null;
}
}
+24 -4
View File
@@ -15,7 +15,13 @@ import { SpaceModule } from './space/space.module';
import { GroupModule } from './group/group.module'; import { GroupModule } from './group/group.module';
import { CaslModule } from './casl/casl.module'; import { CaslModule } from './casl/casl.module';
import { DomainMiddleware } from '../common/middlewares/domain.middleware'; import { DomainMiddleware } from '../common/middlewares/domain.middleware';
import { AuditContextMiddleware } from '../common/middlewares/audit-context.middleware';
import { ShareModule } from './share/share.module'; import { ShareModule } from './share/share.module';
import {
AUDIT_SERVICE,
NoopAuditService,
} from '../integrations/audit/audit.service';
import { ClsMiddleware } from 'nestjs-cls';
@Module({ @Module({
imports: [ imports: [
@@ -31,17 +37,31 @@ import { ShareModule } from './share/share.module';
CaslModule, CaslModule,
ShareModule, ShareModule,
], ],
providers: [
{
provide: AUDIT_SERVICE,
useClass: NoopAuditService,
},
],
exports: [AUDIT_SERVICE],
}) })
export class CoreModule implements NestModule { export class CoreModule implements NestModule {
configure(consumer: MiddlewareConsumer) { configure(consumer: MiddlewareConsumer) {
consumer const excludedRoutes = [
.apply(DomainMiddleware)
.exclude(
{ path: 'auth/setup', method: RequestMethod.POST }, { path: 'auth/setup', method: RequestMethod.POST },
{ path: 'health', method: RequestMethod.GET }, { path: 'health', method: RequestMethod.GET },
{ path: 'health/live', method: RequestMethod.GET }, { path: 'health/live', method: RequestMethod.GET },
{ path: 'billing/stripe/webhook', method: RequestMethod.POST }, { path: 'billing/stripe/webhook', method: RequestMethod.POST },
) ];
consumer
.apply(DomainMiddleware)
.exclude(...excludedRoutes)
.forRoutes('*');
consumer
.apply(AuditContextMiddleware)
.exclude(...excludedRoutes)
.forRoutes('*'); .forRoutes('*');
} }
} }
@@ -1,5 +1,6 @@
import { import {
BadRequestException, BadRequestException,
Inject,
Injectable, Injectable,
NotFoundException, NotFoundException,
} from '@nestjs/common'; } from '@nestjs/common';
@@ -14,6 +15,11 @@ import { RemoveSpaceMemberDto } from '../dto/remove-space-member.dto';
import { UpdateSpaceMemberRoleDto } from '../dto/update-space-member-role.dto'; import { UpdateSpaceMemberRoleDto } from '../dto/update-space-member-role.dto';
import { SpaceRole } from '../../../common/helpers/types/permission'; import { SpaceRole } from '../../../common/helpers/types/permission';
import { PaginationResult } from '@docmost/db/pagination/pagination'; import { PaginationResult } from '@docmost/db/pagination/pagination';
import { AuditEvent } from '../../../common/events/audit-events';
import {
AUDIT_SERVICE,
IAuditService,
} from '../../../integrations/audit/audit.service';
@Injectable() @Injectable()
export class SpaceMemberService { export class SpaceMemberService {
@@ -21,6 +27,7 @@ export class SpaceMemberService {
private spaceMemberRepo: SpaceMemberRepo, private spaceMemberRepo: SpaceMemberRepo,
private spaceRepo: SpaceRepo, private spaceRepo: SpaceRepo,
@InjectKysely() private readonly db: KyselyDB, @InjectKysely() private readonly db: KyselyDB,
@Inject(AUDIT_SERVICE) private readonly auditService: IAuditService,
) {} ) {}
async addUserToSpace( async addUserToSpace(
@@ -161,8 +168,43 @@ export class SpaceMemberService {
if (membersToAdd.length > 0) { if (membersToAdd.length > 0) {
await this.spaceMemberRepo.insertSpaceMember(membersToAdd); await this.spaceMemberRepo.insertSpaceMember(membersToAdd);
} else {
// either they are already members or do not exist on the workspace // Audit log for each member added
for (const user of validUsers) {
this.auditService.log({
event: AuditEvent.SPACE_MEMBER_ADDED,
resourceType: 'space_members',
resourceId: dto.spaceId,
changes: {
after: { role: dto.role },
},
metadata: {
spaceId: dto.spaceId,
spaceName: space.name,
userId: user.id,
userName: user.name,
memberType: 'user',
},
});
}
for (const group of validGroups) {
this.auditService.log({
event: AuditEvent.SPACE_MEMBER_ADDED,
resourceType: 'space_members',
resourceId: dto.spaceId,
changes: {
after: { role: dto.role },
},
metadata: {
spaceId: dto.spaceId,
spaceName: space.name,
groupId: group.id,
groupName: group.name,
memberType: 'group',
},
});
}
} }
} }
@@ -209,6 +251,22 @@ export class SpaceMemberService {
spaceMember.id, spaceMember.id,
dto.spaceId, dto.spaceId,
); );
this.auditService.log({
event: AuditEvent.SPACE_MEMBER_REMOVED,
resourceType: 'space_member',
resourceId: dto.spaceId,
changes: {
before: { role: spaceMember.role },
},
metadata: {
spaceId: dto.spaceId,
spaceName: space.name,
userId: spaceMember.userId,
groupId: spaceMember.groupId,
memberType: spaceMember.userId ? 'user' : 'group',
},
});
} }
async updateSpaceMemberRole( async updateSpaceMemberRole(
@@ -259,6 +317,23 @@ export class SpaceMemberService {
spaceMember.id, spaceMember.id,
dto.spaceId, dto.spaceId,
); );
this.auditService.log({
event: AuditEvent.SPACE_MEMBER_ROLE_CHANGED,
resourceType: 'space_members',
resourceId: dto.spaceId,
changes: {
before: { role: spaceMember.role },
after: { role: dto.role },
},
metadata: {
spaceId: dto.spaceId,
spaceName: space.name,
userId: spaceMember.userId,
groupId: spaceMember.groupId,
memberType: spaceMember.userId ? 'user' : 'group',
},
});
} }
async validateLastAdmin(spaceId: string): Promise<void> { async validateLastAdmin(spaceId: string): Promise<void> {
@@ -1,5 +1,6 @@
import { import {
BadRequestException, BadRequestException,
Inject,
Injectable, Injectable,
Logger, Logger,
NotFoundException, NotFoundException,
@@ -33,6 +34,11 @@ import {
validateAllowedEmail, validateAllowedEmail,
validateSsoEnforcement, validateSsoEnforcement,
} from '../../auth/auth.util'; } from '../../auth/auth.util';
import { AuditEvent } from '../../../common/events/audit-events';
import {
AUDIT_SERVICE,
IAuditService,
} from '../../../integrations/audit/audit.service';
@Injectable() @Injectable()
export class WorkspaceInvitationService { export class WorkspaceInvitationService {
@@ -46,6 +52,7 @@ export class WorkspaceInvitationService {
@InjectKysely() private readonly db: KyselyDB, @InjectKysely() private readonly db: KyselyDB,
@InjectQueue(QueueName.BILLING_QUEUE) private billingQueue: Queue, @InjectQueue(QueueName.BILLING_QUEUE) private billingQueue: Queue,
private readonly environmentService: EnvironmentService, private readonly environmentService: EnvironmentService,
@Inject(AUDIT_SERVICE) private readonly auditService: IAuditService,
) {} ) {}
async getInvitations(workspaceId: string, pagination: PaginationOptions) { async getInvitations(workspaceId: string, pagination: PaginationOptions) {
@@ -179,6 +186,24 @@ export class WorkspaceInvitationService {
workspace.hostname, workspace.hostname,
); );
}); });
// Audit log for each invitation created
for (const invitation of invites) {
this.auditService.log({
event: AuditEvent.WORKSPACE_INVITE_CREATED,
resourceType: 'workspace_invitation',
resourceId: invitation.id,
changes: {
after: {
email: invitation.email,
role: invitation.role,
},
},
metadata: {
groupIds: invitation.groupIds,
},
});
}
} }
} }
@@ -344,11 +369,32 @@ export class WorkspaceInvitationService {
invitationId: string, invitationId: string,
workspaceId: string, workspaceId: string,
): Promise<void> { ): Promise<void> {
const invitation = await this.db
.selectFrom('workspaceInvitations')
.select(['id', 'email', 'role'])
.where('id', '=', invitationId)
.where('workspaceId', '=', workspaceId)
.executeTakeFirst();
await this.db await this.db
.deleteFrom('workspaceInvitations') .deleteFrom('workspaceInvitations')
.where('id', '=', invitationId) .where('id', '=', invitationId)
.where('workspaceId', '=', workspaceId) .where('workspaceId', '=', workspaceId)
.execute(); .execute();
if (invitation) {
this.auditService.log({
event: AuditEvent.WORKSPACE_INVITE_REVOKED,
resourceType: 'workspace_invitation',
resourceId: invitation.id,
changes: {
before: {
email: invitation.email,
role: invitation.role,
},
},
});
}
} }
async getInvitationLinkById( async getInvitationLinkById(
@@ -1,6 +1,7 @@
import { import {
BadRequestException, BadRequestException,
ForbiddenException, ForbiddenException,
Inject,
Injectable, Injectable,
Logger, Logger,
NotFoundException, NotFoundException,
@@ -34,6 +35,11 @@ import { QueueJob, QueueName } from '../../../integrations/queue/constants';
import { Queue } from 'bullmq'; import { Queue } from 'bullmq';
import { generateRandomSuffixNumbers } from '../../../common/helpers'; import { generateRandomSuffixNumbers } from '../../../common/helpers';
import { isPageEmbeddingsTableExists } from '@docmost/db/helpers/helpers'; import { isPageEmbeddingsTableExists } from '@docmost/db/helpers/helpers';
import { AuditEvent } from '../../../common/events/audit-events';
import {
AUDIT_SERVICE,
IAuditService,
} from '../../../integrations/audit/audit.service';
@Injectable() @Injectable()
export class WorkspaceService { export class WorkspaceService {
@@ -52,6 +58,7 @@ export class WorkspaceService {
@InjectQueue(QueueName.ATTACHMENT_QUEUE) private attachmentQueue: Queue, @InjectQueue(QueueName.ATTACHMENT_QUEUE) private attachmentQueue: Queue,
@InjectQueue(QueueName.BILLING_QUEUE) private billingQueue: Queue, @InjectQueue(QueueName.BILLING_QUEUE) private billingQueue: Queue,
@InjectQueue(QueueName.AI_QUEUE) private aiQueue: Queue, @InjectQueue(QueueName.AI_QUEUE) private aiQueue: Queue,
@Inject(AUDIT_SERVICE) private readonly auditService: IAuditService,
) {} ) {}
async findById(workspaceId: string) { async findById(workspaceId: string) {
@@ -428,6 +435,20 @@ export class WorkspaceService {
user.id, user.id,
workspaceId, workspaceId,
); );
this.auditService.log({
event: AuditEvent.USER_ROLE_CHANGED,
resourceType: 'users',
resourceId: user.id,
changes: {
before: { role: user.role },
after: { role: newRole },
},
metadata: {
userName: user.name,
userEmail: user.email,
},
});
} }
async generateHostname( async generateHostname(
@@ -531,6 +552,19 @@ export class WorkspaceService {
.execute(); .execute();
}); });
this.auditService.log({
event: AuditEvent.USER_DELETED,
resourceType: 'users',
resourceId: user.id,
changes: {
before: {
name: user.name,
email: user.email,
role: user.role,
},
},
});
try { try {
await this.attachmentQueue.add(QueueJob.DELETE_USER_AVATARS, user); await this.attachmentQueue.add(QueueJob.DELETE_USER_AVATARS, user);
} catch (err) { } catch (err) {
@@ -0,0 +1,32 @@
import { Kysely, sql } from 'kysely';
export async function up(db: Kysely<any>): Promise<void> {
await db.schema
.createTable('audit_logs')
.addColumn('id', 'uuid', (col) =>
col.primaryKey().defaultTo(sql`gen_uuid_v7()`),
)
.addColumn('workspace_id', 'uuid', (col) =>
col.notNull().references('workspaces.id').onDelete('cascade'),
)
.addColumn('actor_id', 'uuid', (col) =>
col.references('users.id').onDelete('set null'),
)
.addColumn('actor_type', 'varchar', (col) =>
col.notNull().defaultTo('user'),
)
.addColumn('event', 'varchar', (col) => col.notNull())
.addColumn('resource_type', 'varchar', (col) => col.notNull())
.addColumn('resource_id', 'uuid')
.addColumn('changes', 'jsonb')
.addColumn('metadata', 'jsonb')
.addColumn('ip_address', sql `inet`)
.addColumn('created_at', 'timestamptz', (col) =>
col.notNull().defaultTo(sql`now()`),
)
.execute();
}
export async function down(db: Kysely<any>): Promise<void> {
await db.schema.dropTable('audit_logs').execute();
}
+26 -13
View File
@@ -3,18 +3,13 @@
* Please do not edit it manually. * Please do not edit it manually.
*/ */
import type { ColumnType } from 'kysely'; import type { ColumnType } from "kysely";
export type Generated<T> = export type Generated<T> = T extends ColumnType<infer S, infer I, infer U>
T extends ColumnType<infer S, infer I, infer U>
? ColumnType<S, I | undefined, U> ? ColumnType<S, I | undefined, U>
: ColumnType<T, T | undefined, T>; : ColumnType<T, T | undefined, T>;
export type Int8 = ColumnType< export type Int8 = ColumnType<string, bigint | number | string, bigint | number | string>;
string,
bigint | number | string,
bigint | number | string
>;
export type Json = JsonValue; export type Json = JsonValue;
@@ -32,13 +27,13 @@ export type Timestamp = ColumnType<Date, Date | string, Date | string>;
export interface ApiKeys { export interface ApiKeys {
createdAt: Generated<Timestamp>; createdAt: Generated<Timestamp>;
creatorId: string;
deletedAt: Timestamp | null; deletedAt: Timestamp | null;
expiresAt: Timestamp | null; expiresAt: Timestamp | null;
id: Generated<string>; id: Generated<string>;
lastUsedAt: Timestamp | null; lastUsedAt: Timestamp | null;
name: string | null; name: string | null;
updatedAt: Generated<Timestamp>; updatedAt: Generated<Timestamp>;
creatorId: string;
workspaceId: string; workspaceId: string;
} }
@@ -61,6 +56,20 @@ export interface Attachments {
workspaceId: string; workspaceId: string;
} }
export interface AuditLogs {
actorId: string | null;
actorType: Generated<string>;
changes: Json | null;
createdAt: Generated<Timestamp>;
event: string;
id: Generated<string>;
ipAddress: string | null;
metadata: Json | null;
resourceId: string | null;
resourceType: string;
workspaceId: string;
}
export interface AuthAccounts { export interface AuthAccounts {
authProviderId: string | null; authProviderId: string | null;
createdAt: Generated<Timestamp>; createdAt: Generated<Timestamp>;
@@ -77,25 +86,25 @@ export interface AuthProviders {
createdAt: Generated<Timestamp>; createdAt: Generated<Timestamp>;
creatorId: string | null; creatorId: string | null;
deletedAt: Timestamp | null; deletedAt: Timestamp | null;
groupSync: Generated<boolean>;
id: Generated<string>; id: Generated<string>;
isEnabled: Generated<boolean>; isEnabled: Generated<boolean>;
groupSync: Generated<boolean>;
ldapBaseDn: string | null; ldapBaseDn: string | null;
ldapBindDn: string | null; ldapBindDn: string | null;
ldapBindPassword: string | null; ldapBindPassword: string | null;
ldapConfig: Json | null;
ldapTlsCaCert: string | null; ldapTlsCaCert: string | null;
ldapTlsEnabled: Generated<boolean | null>; ldapTlsEnabled: Generated<boolean | null>;
ldapUrl: string | null; ldapUrl: string | null;
ldapUserAttributes: Json | null; ldapUserAttributes: Json | null;
ldapUserSearchFilter: string | null; ldapUserSearchFilter: string | null;
ldapConfig: Json | null;
settings: Json | null;
name: string; name: string;
oidcClientId: string | null; oidcClientId: string | null;
oidcClientSecret: string | null; oidcClientSecret: string | null;
oidcIssuer: string | null; oidcIssuer: string | null;
samlCertificate: string | null; samlCertificate: string | null;
samlUrl: string | null; samlUrl: string | null;
settings: Json | null;
type: string; type: string;
updatedAt: Generated<Timestamp>; updatedAt: Generated<Timestamp>;
workspaceId: string; workspaceId: string;
@@ -225,9 +234,11 @@ export interface Pages {
icon: string | null; icon: string | null;
id: Generated<string>; id: Generated<string>;
isLocked: Generated<boolean>; isLocked: Generated<boolean>;
isRestricted: Generated<boolean>;
lastUpdatedById: string | null; lastUpdatedById: string | null;
parentPageId: string | null; parentPageId: string | null;
position: string | null; position: string | null;
restrictedById: string | null;
slugId: string; slugId: string;
spaceId: string; spaceId: string;
textContent: string | null; textContent: string | null;
@@ -298,12 +309,12 @@ export interface Users {
deletedAt: Timestamp | null; deletedAt: Timestamp | null;
email: string; email: string;
emailVerifiedAt: Timestamp | null; emailVerifiedAt: Timestamp | null;
hasGeneratedPassword: Generated<boolean | null>;
id: Generated<string>; id: Generated<string>;
invitedById: string | null; invitedById: string | null;
lastActiveAt: Timestamp | null; lastActiveAt: Timestamp | null;
lastLoginAt: Timestamp | null; lastLoginAt: Timestamp | null;
locale: string | null; locale: string | null;
hasGeneratedPassword: Generated<boolean | null>;
name: string | null; name: string | null;
password: string | null; password: string | null;
role: string | null; role: string | null;
@@ -363,6 +374,7 @@ export interface Workspaces {
export interface DB { export interface DB {
apiKeys: ApiKeys; apiKeys: ApiKeys;
attachments: Attachments; attachments: Attachments;
auditLogs: AuditLogs;
authAccounts: AuthAccounts; authAccounts: AuthAccounts;
authProviders: AuthProviders; authProviders: AuthProviders;
backlinks: Backlinks; backlinks: Backlinks;
@@ -372,6 +384,7 @@ export interface DB {
groups: Groups; groups: Groups;
groupUsers: GroupUsers; groupUsers: GroupUsers;
pageHistory: PageHistory; pageHistory: PageHistory;
AuditLog: PagePermissions;
pages: Pages; pages: Pages;
shares: Shares; shares: Shares;
spaceMembers: SpaceMembers; spaceMembers: SpaceMembers;
+2 -43
View File
@@ -1,47 +1,6 @@
import { import { DB } from '@docmost/db/types/db';
ApiKeys,
Attachments,
AuthAccounts,
AuthProviders,
Backlinks,
Billing,
Comments,
FileTasks,
Groups,
GroupUsers,
PageHistory,
Pages,
Shares,
SpaceMembers,
Spaces,
UserMfa,
Users,
UserTokens,
WorkspaceInvitations,
Workspaces,
} from '@docmost/db/types/db';
import { PageEmbeddings } from '@docmost/db/types/embeddings.types'; import { PageEmbeddings } from '@docmost/db/types/embeddings.types';
export interface DbInterface { export interface DbInterface extends DB {
attachments: Attachments;
authAccounts: AuthAccounts;
authProviders: AuthProviders;
backlinks: Backlinks;
billing: Billing;
comments: Comments;
fileTasks: FileTasks;
groups: Groups;
groupUsers: GroupUsers;
pageEmbeddings: PageEmbeddings; pageEmbeddings: PageEmbeddings;
pageHistory: PageHistory;
pages: Pages;
shares: Shares;
spaceMembers: SpaceMembers;
spaces: Spaces;
userMfa: UserMfa;
users: Users;
userTokens: UserTokens;
workspaceInvitations: WorkspaceInvitations;
workspaces: Workspaces;
apiKeys: ApiKeys;
} }
@@ -20,6 +20,7 @@ import {
FileTasks, FileTasks,
UserMfa as _UserMFA, UserMfa as _UserMFA,
ApiKeys, ApiKeys,
AuditLogs,
} from './db'; } from './db';
import { PageEmbeddings } from '@docmost/db/types/embeddings.types'; import { PageEmbeddings } from '@docmost/db/types/embeddings.types';
@@ -131,3 +132,8 @@ export type UpdatableApiKey = Updateable<Omit<ApiKeys, 'id'>>;
export type PageEmbedding = Selectable<PageEmbeddings>; export type PageEmbedding = Selectable<PageEmbeddings>;
export type InsertablePageEmbedding = Insertable<PageEmbeddings>; export type InsertablePageEmbedding = Insertable<PageEmbeddings>;
export type UpdatablePageEmbedding = Updateable<Omit<PageEmbeddings, 'id'>>; export type UpdatablePageEmbedding = Updateable<Omit<PageEmbeddings, 'id'>>;
// Audit Log
export type AuditLog = Selectable<AuditLogs>;
export type InsertableAuditLog = Insertable<AuditLogs>;
export type UpdatableAuditLog = Updateable<Omit<AuditLogs, 'id'>>;
@@ -0,0 +1,48 @@
import { Injectable } from '@nestjs/common';
import { AuditLogPayload, ActorType } from '../../common/events/audit-events';
export type IAuditService = {
log(payload: AuditLogPayload): void | Promise<void>;
logWithContext(
payload: AuditLogPayload,
context: {
workspaceId: string;
actorId?: string;
actorType?: ActorType;
ipAddress?: string;
userAgent?: string;
},
): void | Promise<void>;
setActorId(actorId: string): void;
setActorType(actorType: ActorType): void;
};
export const AUDIT_SERVICE = Symbol('AUDIT_SERVICE');
@Injectable()
export class NoopAuditService implements IAuditService {
log(_payload: AuditLogPayload): void {
// No-op: swallow the log when EE module is not available
}
logWithContext(
_payload: AuditLogPayload,
_context: {
workspaceId: string;
actorId?: string;
actorType?: ActorType;
ipAddress?: string;
userAgent?: string;
},
): void {
// No-op: swallow the log when EE module is not available
}
setActorId(_actorId: string): void {
// No-op
}
setActorType(_actorType: ActorType): void {
// No-op
}
}
@@ -6,6 +6,7 @@ export enum QueueName {
FILE_TASK_QUEUE = '{file-task-queue}', FILE_TASK_QUEUE = '{file-task-queue}',
SEARCH_QUEUE = '{search-queue}', SEARCH_QUEUE = '{search-queue}',
AI_QUEUE = '{ai-queue}', AI_QUEUE = '{ai-queue}',
AUDIT_QUEUE = '{audit-queue}',
} }
export enum QueueJob { export enum QueueJob {
@@ -58,4 +59,7 @@ export enum QueueJob {
GENERATE_PAGE_EMBEDDINGS = 'generate-page-embeddings', GENERATE_PAGE_EMBEDDINGS = 'generate-page-embeddings',
DELETE_PAGE_EMBEDDINGS = 'delete-page-embeddings', DELETE_PAGE_EMBEDDINGS = 'delete-page-embeddings',
AUDIT_LOG = 'audit-log',
AUDIT_CLEANUP = 'audit-cleanup',
} }
@@ -73,6 +73,14 @@ import { BacklinksProcessor } from './processors/backlinks.processor';
attempts: 1, attempts: 1,
}, },
}), }),
BullModule.registerQueue({
name: QueueName.AUDIT_QUEUE,
defaultJobOptions: {
removeOnComplete: true,
removeOnFail: true,
attempts: 3,
},
}),
], ],
exports: [BullModule], exports: [BullModule],
providers: [BacklinksProcessor], providers: [BacklinksProcessor],
+19
View File
@@ -578,6 +578,9 @@ importers:
nanoid: nanoid:
specifier: 3.3.11 specifier: 3.3.11
version: 3.3.11 version: 3.3.11
nestjs-cls:
specifier: ^4.5.0
version: 4.5.0(@nestjs/common@11.1.9(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.9)(reflect-metadata@0.2.2)(rxjs@7.8.2)
nestjs-kysely: nestjs-kysely:
specifier: ^1.2.0 specifier: ^1.2.0
version: 1.2.0(@nestjs/common@11.1.9(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.9)(kysely@0.28.2)(reflect-metadata@0.2.2) version: 1.2.0(@nestjs/common@11.1.9(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.9)(kysely@0.28.2)(reflect-metadata@0.2.2)
@@ -7982,6 +7985,15 @@ packages:
neo-async@2.6.2: neo-async@2.6.2:
resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
nestjs-cls@4.5.0:
resolution: {integrity: sha512-oi3GNCc5pnsnVI5WJKMDwmg4NP+JyEw+edlwgepyUba5+RGGtJzpbVaaxXGW1iPbDuQde3/fA8Jdjq9j88BVcQ==}
engines: {node: '>=16'}
peerDependencies:
'@nestjs/common': '> 7.0.0 < 11'
'@nestjs/core': '> 7.0.0 < 11'
reflect-metadata: '*'
rxjs: '>= 7'
nestjs-kysely@1.2.0: nestjs-kysely@1.2.0:
resolution: {integrity: sha512-KseCGb0SXCzIYC+Hx3Z3d+kPAfSZCSK6j9UoqUV/gcBCPad9utC7itmoUw0/w5sV+Jf9pc1DKpgClP1IkflA4w==} resolution: {integrity: sha512-KseCGb0SXCzIYC+Hx3Z3d+kPAfSZCSK6j9UoqUV/gcBCPad9utC7itmoUw0/w5sV+Jf9pc1DKpgClP1IkflA4w==}
peerDependencies: peerDependencies:
@@ -19131,6 +19143,13 @@ snapshots:
neo-async@2.6.2: {} neo-async@2.6.2: {}
nestjs-cls@4.5.0(@nestjs/common@11.1.9(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.9)(reflect-metadata@0.2.2)(rxjs@7.8.2):
dependencies:
'@nestjs/common': 11.1.9(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
'@nestjs/core': 11.1.9(@nestjs/common@11.1.9(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.9)(reflect-metadata@0.2.2)(rxjs@7.8.2)
reflect-metadata: 0.2.2
rxjs: 7.8.2
nestjs-kysely@1.2.0(@nestjs/common@11.1.9(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.9)(kysely@0.28.2)(reflect-metadata@0.2.2): nestjs-kysely@1.2.0(@nestjs/common@11.1.9(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.9)(kysely@0.28.2)(reflect-metadata@0.2.2):
dependencies: dependencies:
'@nestjs/common': 11.1.9(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2) '@nestjs/common': 11.1.9(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)