* 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>
86 lines
2.5 KiB
TypeScript
86 lines
2.5 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import { Injectable } from '@nestjs/common';
|
|
import { isUserRelated } from '@/misc/is-user-related.js';
|
|
import type { Packed } from '@/misc/json-schema.js';
|
|
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
|
|
import { bindThis } from '@/decorators.js';
|
|
import Channel, { type MiChannelService } from '../channel.js';
|
|
|
|
class ChannelChannel extends Channel {
|
|
public readonly chName = 'channel';
|
|
public static shouldShare = false;
|
|
public static requireCredential = false as const;
|
|
private channelId: string;
|
|
|
|
constructor(
|
|
private noteEntityService: NoteEntityService,
|
|
|
|
id: string,
|
|
connection: Channel['connection'],
|
|
) {
|
|
super(id, connection);
|
|
//this.onNote = this.onNote.bind(this);
|
|
}
|
|
|
|
@bindThis
|
|
public async init(params: any) {
|
|
this.channelId = params.channelId as string;
|
|
|
|
// Subscribe stream
|
|
this.subscriber.on('notesStream', this.onNote);
|
|
}
|
|
|
|
@bindThis
|
|
private async onNote(note: Packed<'Note'>) {
|
|
if (note.channelId !== this.channelId) return;
|
|
|
|
// 流れてきたNoteがミュートしているユーザーが関わるものだったら無視する
|
|
if (isUserRelated(note, this.userIdsWhoMeMuting)) return;
|
|
// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
|
|
if (isUserRelated(note, this.userIdsWhoBlockingMe)) return;
|
|
|
|
if (note.renote && !note.text && isUserRelated(note, this.userIdsWhoMeMutingRenotes)) return;
|
|
|
|
if (this.user && note.renoteId && !note.text) {
|
|
if (note.renote && Object.keys(note.renote.reactions).length > 0) {
|
|
const myRenoteReaction = await this.noteEntityService.populateMyReaction(note.renote, this.user.id);
|
|
note.renote.myReaction = myRenoteReaction;
|
|
}
|
|
}
|
|
|
|
this.connection.cacheNote(note);
|
|
|
|
this.send('note', note);
|
|
}
|
|
|
|
@bindThis
|
|
public dispose() {
|
|
// Unsubscribe events
|
|
this.subscriber.off('notesStream', this.onNote);
|
|
}
|
|
}
|
|
|
|
@Injectable()
|
|
export class ChannelChannelService implements MiChannelService<false> {
|
|
public readonly shouldShare = ChannelChannel.shouldShare;
|
|
public readonly requireCredential = ChannelChannel.requireCredential;
|
|
public readonly kind = ChannelChannel.kind;
|
|
|
|
constructor(
|
|
private noteEntityService: NoteEntityService,
|
|
) {
|
|
}
|
|
|
|
@bindThis
|
|
public create(id: string, connection: Channel['connection']): ChannelChannel {
|
|
return new ChannelChannel(
|
|
this.noteEntityService,
|
|
id,
|
|
connection,
|
|
);
|
|
}
|
|
}
|