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>
93 lines
2.7 KiB
TypeScript
93 lines
2.7 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 { DriveFilesRepository } from '@/models/_.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
import { CustomEmojiService } from '@/core/CustomEmojiService.js';
|
|
import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
|
|
import { ApiError } from '../../../error.js';
|
|
|
|
export const meta = {
|
|
tags: ['admin'],
|
|
|
|
requireCredential: true,
|
|
requireRolePolicy: 'canManageCustomEmojis',
|
|
kind: 'write:admin:emoji',
|
|
|
|
errors: {
|
|
noSuchFile: {
|
|
message: 'No such file.',
|
|
code: 'NO_SUCH_FILE',
|
|
id: 'fc46b5a4-6b92-4c33-ac66-b806659bb5cf',
|
|
},
|
|
duplicateName: {
|
|
message: 'Duplicate name.',
|
|
code: 'DUPLICATE_NAME',
|
|
id: 'f7a3462c-4e6e-4069-8421-b9bd4f4c3975',
|
|
},
|
|
},
|
|
|
|
ref: 'EmojiDetailed',
|
|
} as const;
|
|
|
|
export const paramDef = {
|
|
type: 'object',
|
|
properties: {
|
|
name: { type: 'string', pattern: '^[a-zA-Z0-9_]+$' },
|
|
fileId: { type: 'string', format: 'misskey:id' },
|
|
category: {
|
|
type: 'string',
|
|
nullable: true,
|
|
description: 'Use `null` to reset the category.',
|
|
},
|
|
aliases: { type: 'array', items: {
|
|
type: 'string',
|
|
} },
|
|
license: { type: 'string', nullable: true },
|
|
isSensitive: { type: 'boolean' },
|
|
localOnly: { type: 'boolean' },
|
|
roleIdsThatCanBeUsedThisEmojiAsReaction: { type: 'array', items: {
|
|
type: 'string',
|
|
} },
|
|
},
|
|
required: ['name', 'fileId'],
|
|
} as const;
|
|
|
|
// TODO: ロジックをサービスに切り出す
|
|
|
|
@Injectable()
|
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
|
constructor(
|
|
@Inject(DI.driveFilesRepository)
|
|
private driveFilesRepository: DriveFilesRepository,
|
|
|
|
private customEmojiService: CustomEmojiService,
|
|
|
|
private emojiEntityService: EmojiEntityService,
|
|
) {
|
|
super(meta, paramDef, async (ps, me) => {
|
|
const driveFile = await this.driveFilesRepository.findOneBy({ id: ps.fileId });
|
|
if (driveFile == null) throw new ApiError(meta.errors.noSuchFile);
|
|
const isDuplicate = await this.customEmojiService.checkDuplicate(ps.name);
|
|
if (isDuplicate) throw new ApiError(meta.errors.duplicateName);
|
|
|
|
const emoji = await this.customEmojiService.add({
|
|
driveFile,
|
|
name: ps.name,
|
|
category: ps.category ?? null,
|
|
aliases: ps.aliases ?? [],
|
|
host: null,
|
|
license: ps.license ?? null,
|
|
isSensitive: ps.isSensitive ?? false,
|
|
localOnly: ps.localOnly ?? false,
|
|
roleIdsThatCanBeUsedThisEmojiAsReaction: ps.roleIdsThatCanBeUsedThisEmojiAsReaction ?? [],
|
|
}, me);
|
|
|
|
return this.emojiEntityService.packDetailed(emoji);
|
|
});
|
|
}
|
|
}
|