
* 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>
110 lines
2.6 KiB
TypeScript
110 lines
2.6 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import { Inject, Injectable } from '@nestjs/common';
|
|
import { IdService } from '@/core/IdService.js';
|
|
import type { SwSubscriptionsRepository } from '@/models/_.js';
|
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
|
import { MetaService } from '@/core/MetaService.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
|
|
export const meta = {
|
|
tags: ['account'],
|
|
|
|
requireCredential: true,
|
|
secure: true,
|
|
|
|
description: 'Register to receive push notifications.',
|
|
|
|
res: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
properties: {
|
|
state: {
|
|
type: 'string',
|
|
optional: true, nullable: false,
|
|
enum: ['already-subscribed', 'subscribed'],
|
|
},
|
|
key: {
|
|
type: 'string',
|
|
optional: false, nullable: true,
|
|
},
|
|
userId: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
},
|
|
endpoint: {
|
|
type: 'string',
|
|
optional: false, nullable: false,
|
|
},
|
|
sendReadMessage: {
|
|
type: 'boolean',
|
|
optional: false, nullable: false,
|
|
},
|
|
},
|
|
},
|
|
} as const;
|
|
|
|
export const paramDef = {
|
|
type: 'object',
|
|
properties: {
|
|
endpoint: { type: 'string' },
|
|
auth: { type: 'string' },
|
|
publickey: { type: 'string' },
|
|
sendReadMessage: { type: 'boolean', default: false },
|
|
},
|
|
required: ['endpoint', 'auth', 'publickey'],
|
|
} as const;
|
|
|
|
@Injectable()
|
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
|
constructor(
|
|
@Inject(DI.swSubscriptionsRepository)
|
|
private swSubscriptionsRepository: SwSubscriptionsRepository,
|
|
|
|
private idService: IdService,
|
|
private metaService: MetaService,
|
|
) {
|
|
super(meta, paramDef, async (ps, me) => {
|
|
// if already subscribed
|
|
const exist = await this.swSubscriptionsRepository.findOneBy({
|
|
userId: me.id,
|
|
endpoint: ps.endpoint,
|
|
auth: ps.auth,
|
|
publickey: ps.publickey,
|
|
});
|
|
|
|
const instance = await this.metaService.fetch(true);
|
|
|
|
if (exist != null) {
|
|
return {
|
|
state: 'already-subscribed' as const,
|
|
key: instance.swPublicKey,
|
|
userId: me.id,
|
|
endpoint: exist.endpoint,
|
|
sendReadMessage: exist.sendReadMessage,
|
|
};
|
|
}
|
|
|
|
await this.swSubscriptionsRepository.insert({
|
|
id: this.idService.gen(),
|
|
userId: me.id,
|
|
endpoint: ps.endpoint,
|
|
auth: ps.auth,
|
|
publickey: ps.publickey,
|
|
sendReadMessage: ps.sendReadMessage,
|
|
});
|
|
|
|
return {
|
|
state: 'subscribed' as const,
|
|
key: instance.swPublicKey,
|
|
userId: me.id,
|
|
endpoint: ps.endpoint,
|
|
sendReadMessage: ps.sendReadMessage,
|
|
};
|
|
});
|
|
}
|
|
}
|