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>
79 lines
1.6 KiB
TypeScript
79 lines
1.6 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import { URL } from 'node:url';
|
|
import { Injectable } from '@nestjs/common';
|
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
|
import { RelayService } from '@/core/RelayService.js';
|
|
import { ApiError } from '../../../error.js';
|
|
|
|
export const meta = {
|
|
tags: ['admin'],
|
|
|
|
requireCredential: true,
|
|
requireModerator: true,
|
|
kind: 'write:admin:relays',
|
|
|
|
errors: {
|
|
invalidUrl: {
|
|
message: 'Invalid URL',
|
|
code: 'INVALID_URL',
|
|
id: 'fb8c92d3-d4e5-44e7-b3d4-800d5cef8b2c',
|
|
},
|
|
},
|
|
|
|
res: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
properties: {
|
|
id: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
format: 'id',
|
|
},
|
|
inbox: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
format: 'url',
|
|
},
|
|
status: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
default: 'requesting',
|
|
enum: [
|
|
'requesting',
|
|
'accepted',
|
|
'rejected',
|
|
],
|
|
},
|
|
},
|
|
},
|
|
} as const;
|
|
|
|
export const paramDef = {
|
|
type: 'object',
|
|
properties: {
|
|
inbox: { type: 'string' },
|
|
},
|
|
required: ['inbox'],
|
|
} as const;
|
|
|
|
@Injectable()
|
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
|
constructor(
|
|
private relayService: RelayService,
|
|
) {
|
|
super(meta, paramDef, async (ps, me) => {
|
|
try {
|
|
if (new URL(ps.inbox).protocol !== 'https:') throw new Error('https only');
|
|
} catch {
|
|
throw new ApiError(meta.errors.invalidUrl);
|
|
}
|
|
|
|
return await this.relayService.addRelay(ps.inbox);
|
|
});
|
|
}
|
|
}
|