mirror of
https://codeberg.org/yeentown/barkey.git
synced 2025-05-24 06:36:57 +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>
85 lines
2.4 KiB
TypeScript
85 lines
2.4 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import { Injectable } from '@nestjs/common';
|
|
import { isInstanceMuted, isUserFromMutedInstance } from '@/misc/is-instance-muted.js';
|
|
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
|
|
import { bindThis } from '@/decorators.js';
|
|
import Channel, { type MiChannelService } from '../channel.js';
|
|
|
|
class MainChannel extends Channel {
|
|
public readonly chName = 'main';
|
|
public static shouldShare = true;
|
|
public static requireCredential = true as const;
|
|
public static kind = 'read:account';
|
|
|
|
constructor(
|
|
private noteEntityService: NoteEntityService,
|
|
|
|
id: string,
|
|
connection: Channel['connection'],
|
|
) {
|
|
super(id, connection);
|
|
}
|
|
|
|
@bindThis
|
|
public async init(params: any) {
|
|
// Subscribe main stream channel
|
|
this.subscriber.on(`mainStream:${this.user!.id}`, async data => {
|
|
switch (data.type) {
|
|
case 'notification': {
|
|
// Ignore notifications from instances the user has muted
|
|
if (isUserFromMutedInstance(data.body, new Set<string>(this.userProfile?.mutedInstances ?? []))) return;
|
|
if (data.body.userId && this.userIdsWhoMeMuting.has(data.body.userId)) return;
|
|
|
|
if (data.body.note && data.body.note.isHidden) {
|
|
const note = await this.noteEntityService.pack(data.body.note.id, this.user, {
|
|
detail: true,
|
|
});
|
|
this.connection.cacheNote(note);
|
|
data.body.note = note;
|
|
}
|
|
break;
|
|
}
|
|
case 'mention': {
|
|
if (isInstanceMuted(data.body, new Set<string>(this.userProfile?.mutedInstances ?? []))) return;
|
|
|
|
if (this.userIdsWhoMeMuting.has(data.body.userId)) return;
|
|
if (data.body.isHidden) {
|
|
const note = await this.noteEntityService.pack(data.body.id, this.user, {
|
|
detail: true,
|
|
});
|
|
this.connection.cacheNote(note);
|
|
data.body = note;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
this.send(data.type, data.body);
|
|
});
|
|
}
|
|
}
|
|
|
|
@Injectable()
|
|
export class MainChannelService implements MiChannelService<true> {
|
|
public readonly shouldShare = MainChannel.shouldShare;
|
|
public readonly requireCredential = MainChannel.requireCredential;
|
|
public readonly kind = MainChannel.kind;
|
|
|
|
constructor(
|
|
private noteEntityService: NoteEntityService,
|
|
) {
|
|
}
|
|
|
|
@bindThis
|
|
public create(id: string, connection: Channel['connection']): MainChannel {
|
|
return new MainChannel(
|
|
this.noteEntityService,
|
|
id,
|
|
connection,
|
|
);
|
|
}
|
|
}
|