82822e29d9
* 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>
75 lines
2.5 KiB
TypeScript
75 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 { UsersRepository, AbuseUserReportsRepository } from '@/models/_.js';
|
|
import { InstanceActorService } from '@/core/InstanceActorService.js';
|
|
import { QueueService } from '@/core/QueueService.js';
|
|
import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
import { ModerationLogService } from '@/core/ModerationLogService.js';
|
|
|
|
export const meta = {
|
|
tags: ['admin'],
|
|
|
|
requireCredential: true,
|
|
requireModerator: true,
|
|
kind: 'write:admin:resolve-abuse-user-report',
|
|
} as const;
|
|
|
|
export const paramDef = {
|
|
type: 'object',
|
|
properties: {
|
|
reportId: { type: 'string', format: 'misskey:id' },
|
|
forward: { type: 'boolean', default: false },
|
|
},
|
|
required: ['reportId'],
|
|
} as const;
|
|
|
|
// TODO: ロジックをサービスに切り出す
|
|
|
|
@Injectable()
|
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
|
constructor(
|
|
@Inject(DI.usersRepository)
|
|
private usersRepository: UsersRepository,
|
|
|
|
@Inject(DI.abuseUserReportsRepository)
|
|
private abuseUserReportsRepository: AbuseUserReportsRepository,
|
|
|
|
private queueService: QueueService,
|
|
private instanceActorService: InstanceActorService,
|
|
private apRendererService: ApRendererService,
|
|
private moderationLogService: ModerationLogService,
|
|
) {
|
|
super(meta, paramDef, async (ps, me) => {
|
|
const report = await this.abuseUserReportsRepository.findOneBy({ id: ps.reportId });
|
|
|
|
if (report == null) {
|
|
throw new Error('report not found');
|
|
}
|
|
|
|
if (ps.forward && report.targetUserHost != null) {
|
|
const actor = await this.instanceActorService.getInstanceActor();
|
|
const targetUser = await this.usersRepository.findOneByOrFail({ id: report.targetUserId });
|
|
|
|
this.queueService.deliver(actor, this.apRendererService.addContext(this.apRendererService.renderFlag(actor, targetUser.uri!, report.comment)), targetUser.inbox, false);
|
|
}
|
|
|
|
await this.abuseUserReportsRepository.update(report.id, {
|
|
resolved: true,
|
|
assigneeId: me.id,
|
|
forwarded: ps.forward && report.targetUserHost != null,
|
|
});
|
|
|
|
this.moderationLogService.log(me, 'resolveAbuseReport', {
|
|
reportId: report.id,
|
|
report: report,
|
|
forwarded: ps.forward && report.targetUserHost != null,
|
|
});
|
|
});
|
|
}
|
|
}
|