mirror of
https://git.boykissers.com/pawkey/pawkey-sk.git
synced 2025-12-20 04:04:16 +00:00
* 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>
75 lines
1.9 KiB
TypeScript
75 lines
1.9 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import { Inject, Injectable } from '@nestjs/common';
|
|
import { IsNull } from 'typeorm';
|
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
|
import type { UsersRepository } from '@/models/_.js';
|
|
import { SignupService } from '@/core/SignupService.js';
|
|
import { UserEntityService } from '@/core/entities/UserEntityService.js';
|
|
import { localUsernameSchema, passwordSchema } from '@/models/User.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
|
|
export const meta = {
|
|
tags: ['admin'],
|
|
|
|
secure: true,
|
|
|
|
res: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
ref: 'User',
|
|
properties: {
|
|
token: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
},
|
|
},
|
|
},
|
|
} as const;
|
|
|
|
export const paramDef = {
|
|
type: 'object',
|
|
properties: {
|
|
username: localUsernameSchema,
|
|
password: passwordSchema,
|
|
},
|
|
required: ['username', 'password'],
|
|
} as const;
|
|
|
|
@Injectable()
|
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
|
constructor(
|
|
@Inject(DI.usersRepository)
|
|
private usersRepository: UsersRepository,
|
|
|
|
private userEntityService: UserEntityService,
|
|
private signupService: SignupService,
|
|
) {
|
|
super(meta, paramDef, async (ps, _me) => {
|
|
const me = _me ? await this.usersRepository.findOneByOrFail({ id: _me.id }) : null;
|
|
const noUsers = (await this.usersRepository.countBy({
|
|
host: IsNull(),
|
|
})) === 0;
|
|
if (!noUsers && !me?.isRoot) throw new Error('access denied');
|
|
|
|
const { account, secret } = await this.signupService.signup({
|
|
username: ps.username,
|
|
password: ps.password,
|
|
ignorePreservedUsernames: true,
|
|
});
|
|
|
|
const res = await this.userEntityService.pack(account, account, {
|
|
detail: true,
|
|
includeSecrets: true,
|
|
});
|
|
|
|
(res as any).token = secret;
|
|
|
|
return res;
|
|
});
|
|
}
|
|
}
|