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>
85 lines
1.8 KiB
TypeScript
85 lines
1.8 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import { createHash } from 'crypto';
|
|
import ms from 'ms';
|
|
import { Injectable } from '@nestjs/common';
|
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
|
import { HttpRequestService } from '@/core/HttpRequestService.js';
|
|
import { ApiError } from '../error.js';
|
|
|
|
export const meta = {
|
|
tags: ['meta'],
|
|
|
|
requireCredential: true,
|
|
secure: true,
|
|
|
|
limit: {
|
|
duration: ms('1hour'),
|
|
max: 50,
|
|
},
|
|
|
|
errors: {
|
|
invalidSchema: {
|
|
message: 'External resource returned invalid schema.',
|
|
code: 'EXT_RESOURCE_RETURNED_INVALID_SCHEMA',
|
|
id: 'bb774091-7a15-4a70-9dc5-6ac8cf125856',
|
|
},
|
|
hashUnmached: {
|
|
message: 'Hash did not match.',
|
|
code: 'EXT_RESOURCE_HASH_DIDNT_MATCH',
|
|
id: '693ba8ba-b486-40df-a174-72f8279b56a4',
|
|
},
|
|
},
|
|
|
|
res: {
|
|
type: 'object',
|
|
properties: {
|
|
type: {
|
|
type: 'string',
|
|
},
|
|
data: {
|
|
type: 'string',
|
|
},
|
|
},
|
|
},
|
|
} as const;
|
|
|
|
export const paramDef = {
|
|
type: 'object',
|
|
properties: {
|
|
url: { type: 'string' },
|
|
hash: { type: 'string' },
|
|
},
|
|
required: ['url', 'hash'],
|
|
} as const;
|
|
|
|
@Injectable()
|
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
|
constructor(
|
|
private httpRequestService: HttpRequestService,
|
|
) {
|
|
super(meta, paramDef, async (ps) => {
|
|
const res = await this.httpRequestService.getJson<{
|
|
type: string;
|
|
data: string;
|
|
}>(ps.url);
|
|
|
|
if (!res.data || !res.type) {
|
|
throw new ApiError(meta.errors.invalidSchema);
|
|
}
|
|
|
|
const resHash = createHash('sha512').update(res.data.replace(/\r\n/g, '\n')).digest('hex');
|
|
if (resHash !== ps.hash) {
|
|
throw new ApiError(meta.errors.hashUnmached);
|
|
}
|
|
|
|
return {
|
|
type: res.type,
|
|
data: res.data,
|
|
};
|
|
});
|
|
}
|
|
}
|