mirror of
https://github.com/paricafe/misskey.git
synced 2025-01-11 06:40:49 -06:00
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>
146 lines
3 KiB
TypeScript
146 lines
3 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import * as os from 'node:os';
|
|
import si from 'systeminformation';
|
|
import { Inject, Injectable } from '@nestjs/common';
|
|
import { DataSource } from 'typeorm';
|
|
import * as Redis from 'ioredis';
|
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
|
|
export const meta = {
|
|
requireCredential: true,
|
|
requireModerator: true,
|
|
kind: 'read:admin:server-info',
|
|
|
|
tags: ['admin', 'meta'],
|
|
|
|
res: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
properties: {
|
|
machine: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
},
|
|
os: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
example: 'linux',
|
|
},
|
|
node: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
},
|
|
psql: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
},
|
|
cpu: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
properties: {
|
|
model: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
},
|
|
cores: {
|
|
type: 'number',
|
|
optional: false, nullable: false,
|
|
},
|
|
},
|
|
},
|
|
mem: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
properties: {
|
|
total: {
|
|
type: 'number',
|
|
optional: false, nullable: false,
|
|
format: 'bytes',
|
|
},
|
|
},
|
|
},
|
|
fs: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
properties: {
|
|
total: {
|
|
type: 'number',
|
|
optional: false, nullable: false,
|
|
format: 'bytes',
|
|
},
|
|
used: {
|
|
type: 'number',
|
|
optional: false, nullable: false,
|
|
format: 'bytes',
|
|
},
|
|
},
|
|
},
|
|
net: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
properties: {
|
|
interface: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
example: 'eth0',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
} as const;
|
|
|
|
export const paramDef = {
|
|
type: 'object',
|
|
properties: {},
|
|
required: [],
|
|
} as const;
|
|
|
|
@Injectable()
|
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
|
constructor(
|
|
@Inject(DI.db)
|
|
private db: DataSource,
|
|
|
|
@Inject(DI.redis)
|
|
private redisClient: Redis.Redis,
|
|
|
|
) {
|
|
super(meta, paramDef, async () => {
|
|
const memStats = await si.mem();
|
|
const fsStats = await si.fsSize();
|
|
const netInterface = await si.networkInterfaceDefault();
|
|
|
|
const redisServerInfo = await this.redisClient.info('Server');
|
|
const m = redisServerInfo.match(new RegExp('^redis_version:(.*)', 'm'));
|
|
const redis_version = m?.[1];
|
|
|
|
return {
|
|
machine: os.hostname(),
|
|
os: os.platform(),
|
|
node: process.version,
|
|
psql: await this.db.query('SHOW server_version').then(x => x[0].server_version),
|
|
redis: redis_version,
|
|
cpu: {
|
|
model: os.cpus()[0].model,
|
|
cores: os.cpus().length,
|
|
},
|
|
mem: {
|
|
total: memStats.total,
|
|
},
|
|
fs: {
|
|
total: fsStats[0].size,
|
|
used: fsStats[0].used,
|
|
},
|
|
net: {
|
|
interface: netInterface,
|
|
},
|
|
};
|
|
});
|
|
}
|
|
}
|