c96bc36fed
* fix: fix improper authorization when accessing with third-party application
* refactor: refactor type definitions
* fix: get rid of unnecessary access limitation
* enhance: サードパーティアプリケーションがWebsocket APIを使えるように
* fix: add missing parentheses
* Revert "fix(backend): add missing kind definition for admin endpoints to improve security"
This reverts commit 5150053275.
* frontend: 翻訳の抜けを訂正, read:adminとwrite:adminはアクセス発行トークンのデフォルトでは非表示にする
* enhance(test): misskey-ghsa-7pxq-6xx9-xpgmに関するテストを追加
* enhance(test): Websocket APIに対するテストも追加
* enhance(refactor): `@/misc/api-permissions.ts`を`misskey-js/permissions`に統合
* fix(frontend): アクセストークン発行UIで全ての権限を有効にした際、管理者用APIへのアクセスも許可してしまう問題を修正
* enhance(backend): Websocketの接続に最低限必要な権限を変更
* fix(backend): `/api/admin/meta`をサードパーティアプリケーションからはアクセスできないように
* fix(backend): エンドポイントにアクセスするために必要な権限を変更
* fix(frontend/locale): Add missing type declaration
* chore: update `misskey-js/src/autogen`
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
97 lines
2.5 KiB
TypeScript
97 lines
2.5 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import { Inject, Injectable } from '@nestjs/common';
|
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
|
import type { ModerationLogsRepository } from '@/models/_.js';
|
|
import { QueryService } from '@/core/QueryService.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
import { ModerationLogEntityService } from '@/core/entities/ModerationLogEntityService.js';
|
|
|
|
export const meta = {
|
|
tags: ['admin'],
|
|
|
|
requireCredential: true,
|
|
requireAdmin: true,
|
|
kind: 'read:admin:show-moderation-log',
|
|
|
|
res: {
|
|
type: 'array',
|
|
optional: false, nullable: false,
|
|
items: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
properties: {
|
|
id: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
format: 'id',
|
|
},
|
|
createdAt: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
format: 'date-time',
|
|
},
|
|
type: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
},
|
|
info: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
},
|
|
userId: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
format: 'id',
|
|
},
|
|
user: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
ref: 'UserDetailed',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
} as const;
|
|
|
|
export const paramDef = {
|
|
type: 'object',
|
|
properties: {
|
|
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
|
|
sinceId: { type: 'string', format: 'misskey:id' },
|
|
untilId: { type: 'string', format: 'misskey:id' },
|
|
type: { type: 'string', nullable: true },
|
|
userId: { type: 'string', format: 'misskey:id', nullable: true },
|
|
},
|
|
required: [],
|
|
} as const;
|
|
|
|
@Injectable()
|
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
|
constructor(
|
|
@Inject(DI.moderationLogsRepository)
|
|
private moderationLogsRepository: ModerationLogsRepository,
|
|
|
|
private moderationLogEntityService: ModerationLogEntityService,
|
|
private queryService: QueryService,
|
|
) {
|
|
super(meta, paramDef, async (ps, me) => {
|
|
const query = this.queryService.makePaginationQuery(this.moderationLogsRepository.createQueryBuilder('report'), ps.sinceId, ps.untilId);
|
|
|
|
if (ps.type != null) {
|
|
query.andWhere('report.type = :type', { type: ps.type });
|
|
}
|
|
|
|
if (ps.userId != null) {
|
|
query.andWhere('report.userId = :userId', { userId: ps.userId });
|
|
}
|
|
|
|
const reports = await query.limit(ps.limit).getMany();
|
|
|
|
return await this.moderationLogEntityService.packMany(reports);
|
|
});
|
|
}
|
|
}
|