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>
103 lines
2.8 KiB
TypeScript
103 lines
2.8 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 { EmojisRepository } from '@/models/_.js';
|
|
import type { MiDriveFile } from '@/models/DriveFile.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
import { DriveService } from '@/core/DriveService.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: {
|
|
noSuchEmoji: {
|
|
message: 'No such emoji.',
|
|
code: 'NO_SUCH_EMOJI',
|
|
id: 'e2785b66-dca3-4087-9cac-b93c541cc425',
|
|
},
|
|
duplicateName: {
|
|
message: 'Duplicate name.',
|
|
code: 'DUPLICATE_NAME',
|
|
id: 'f7a3462c-4e6e-4069-8421-b9bd4f4c3975',
|
|
},
|
|
},
|
|
|
|
res: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
properties: {
|
|
id: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
format: 'id',
|
|
},
|
|
},
|
|
},
|
|
} as const;
|
|
|
|
export const paramDef = {
|
|
type: 'object',
|
|
properties: {
|
|
emojiId: { type: 'string', format: 'misskey:id' },
|
|
},
|
|
required: ['emojiId'],
|
|
} as const;
|
|
|
|
// TODO: ロジックをサービスに切り出す
|
|
|
|
@Injectable()
|
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
|
constructor(
|
|
@Inject(DI.emojisRepository)
|
|
private emojisRepository: EmojisRepository,
|
|
private emojiEntityService: EmojiEntityService,
|
|
private customEmojiService: CustomEmojiService,
|
|
private driveService: DriveService,
|
|
) {
|
|
super(meta, paramDef, async (ps, me) => {
|
|
const emoji = await this.emojisRepository.findOneBy({ id: ps.emojiId });
|
|
if (emoji == null) {
|
|
throw new ApiError(meta.errors.noSuchEmoji);
|
|
}
|
|
|
|
let driveFile: MiDriveFile;
|
|
|
|
try {
|
|
// Create file
|
|
driveFile = await this.driveService.uploadFromUrl({ url: emoji.originalUrl, user: null, force: true });
|
|
} catch (e) {
|
|
// TODO: need to return Drive Error
|
|
throw new ApiError();
|
|
}
|
|
|
|
// Duplication Check
|
|
const isDuplicate = await this.customEmojiService.checkDuplicate(emoji.name);
|
|
if (isDuplicate) throw new ApiError(meta.errors.duplicateName);
|
|
|
|
const addedEmoji = await this.customEmojiService.add({
|
|
driveFile,
|
|
name: emoji.name,
|
|
category: emoji.category,
|
|
aliases: emoji.aliases,
|
|
host: null,
|
|
license: emoji.license,
|
|
isSensitive: emoji.isSensitive,
|
|
localOnly: emoji.localOnly,
|
|
roleIdsThatCanBeUsedThisEmojiAsReaction: emoji.roleIdsThatCanBeUsedThisEmojiAsReaction,
|
|
}, me);
|
|
|
|
return this.emojiEntityService.packDetailed(addedEmoji);
|
|
});
|
|
}
|
|
}
|