mirror of
https://activitypub.software/TransFem-org/Sharkey.git
synced 2024-12-15 13:25:44 +01:00
5f88d56d96
* 1. ed25519キーペアを発行・Personとして公開鍵を送受信 * validate additionalPublicKeys * getAuthUserFromApIdはmainを選ぶ * ✌️ * fix * signatureAlgorithm * set publicKeyCache lifetime * refresh * httpMessageSignatureAcceptable * ED25519_SIGNED_ALGORITHM * ED25519_PUBLIC_KEY_SIGNATURE_ALGORITHM * remove sign additionalPublicKeys signature requirements * httpMessageSignaturesSupported * httpMessageSignaturesImplementationLevel * httpMessageSignaturesImplementationLevel: '01' * perf(federation): Use hint for getAuthUserFromApId (#13470) * Hint for getAuthUserFromApId * とどのつまりこれでいいのか? * use @misskey-dev/node-http-message-signatures * fix * signedPost, signedGet * ap-request.tsを復活させる * remove digest prerender * fix test? * fix test * add httpMessageSignaturesImplementationLevel to FederationInstance * ManyToOne * fetchPersonWithRenewal * exactKey * ✌️ * use const * use gen-key-pair fn. from '@misskey-dev/node-http-message-signatures' * update node-http-message-signatures * fix * @misskey-dev/node-http-message-signatures@0.0.0-alpha.11 * getAuthUserFromApIdでupdatePersonの頻度を増やす * cacheRaw.date * use requiredInputs https://github.com/misskey-dev/misskey/pull/13464#discussion_r1509964359 * update @misskey-dev/node-http-message-signatures * clean up * err msg * fix(backend): fetchInstanceMetadataのLockが永遠に解除されない問題を修正 Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * fix httpMessageSignaturesImplementationLevel validation * fix test * fix * comment * comment * improve test * fix * use Promise.all in genRSAAndEd25519KeyPair * refreshAndprepareEd25519KeyPair * refreshAndfindKey * commetn * refactor public keys add * digestプリレンダを復活させる RFC実装時にどうするか考える * fix, async * fix * !== true * use save * Deliver update person when new key generated (not tested) https://github.com/misskey-dev/misskey/pull/13464#issuecomment-1977049061 * 循環参照で落ちるのを解消? * fix? * Revert "fix?" This reverts commit 0082f6f8e8c5d5febd14933ba9a1ac643f70ca92. * a * logger * log * change logger * 秘密鍵の変更は、フラグではなく鍵を引き回すようにする * addAllKnowingSharedInboxRecipe * nanka meccha kaeta * delivre * キャッシュ有効チェックはロック取得前に行う * @misskey-dev/node-http-message-signatures@0.0.3 * PrivateKeyPem * getLocalUserPrivateKey * fix test * if * fix ap-request * update node-http-message-signatures * fix type error * update package * fix type * update package * retry no key * @misskey-dev/node-http-message-signatures@0.0.8 * fix type error * log keyid * logger * db-resolver * JSON.stringify * HTTP Signatureがなかったり使えなかったりしそうな場合にLD Signatureを活用するように * inbox-delayed use actor if no signature * ユーザーとキーの同一性チェックはhostの一致にする * log signature parse err * save array * とりあえずtryで囲っておく * fetchPersonWithRenewalでエラーが起きたら古いデータを返す * use transactionalEntityManager * fix spdx * @misskey-dev/node-http-message-signatures@0.0.10 * add comment * fix * publicKeyに配列が入ってもいいようにする https://github.com/misskey-dev/misskey/pull/13950 * define additionalPublicKeys * fix * merge fix * refreshAndprepareEd25519KeyPair → refreshAndPrepareEd25519KeyPair * remove gen-key-pair.ts * defaultMaxListeners = 512 * Revert "defaultMaxListeners = 512" This reverts commit f2c412c18057a9300540794ccbe4dfbf6d259ed6. * genRSAAndEd25519KeyPairではキーを直列に生成する? * maxConcurrency: 8 * maxConcurrency: 16 * maxConcurrency: 8 * Revert "genRSAAndEd25519KeyPairではキーを直列に生成する?" This reverts commit d0aada55c1ed5aa98f18731ec82f3ac5eb5a6c16. * maxWorkers: '90%' * Revert "maxWorkers: '90%'" This reverts commit 9e0a93f110456320d6485a871f014f7cdab29b33. * e2e/timelines.tsで個々のテストに対するtimeoutを削除, maxConcurrency: 32 * better error handling of this.userPublickeysRepository.delete * better comment * set result to keypairEntityCache * deliverJobConcurrency: 16, deliverJobPerSec: 1024, inboxJobConcurrency: 4 * inboxJobPerSec: 64 * delete request.headers['host']; * fix * // node-fetch will generate this for us. if we keep 'Host', it won't change with redirects! * move delete host * modify comment * modify comment * fix correct → collect * refreshAndfindKey → refreshAndFindKey * modify comment * modify attachLdSignature * getApId, InboxProcessorService * TODO * [skip ci] add CHANGELOG --------- Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com> Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
87 lines
2.5 KiB
TypeScript
87 lines
2.5 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import type { Config } from '@/config.js';
|
|
import type { ApDbResolverService } from '@/core/activitypub/ApDbResolverService.js';
|
|
import type { ApRendererService } from '@/core/activitypub/ApRendererService.js';
|
|
import type { ApRequestService } from '@/core/activitypub/ApRequestService.js';
|
|
import { Resolver } from '@/core/activitypub/ApResolverService.js';
|
|
import type { IObject } from '@/core/activitypub/type.js';
|
|
import type { HttpRequestService } from '@/core/HttpRequestService.js';
|
|
import type { InstanceActorService } from '@/core/InstanceActorService.js';
|
|
import type { LoggerService } from '@/core/LoggerService.js';
|
|
import type { MetaService } from '@/core/MetaService.js';
|
|
import type { UtilityService } from '@/core/UtilityService.js';
|
|
import type { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
|
|
import { bindThis } from '@/decorators.js';
|
|
import type {
|
|
FollowRequestsRepository,
|
|
NoteReactionsRepository,
|
|
NotesRepository,
|
|
PollsRepository,
|
|
UsersRepository,
|
|
} from '@/models/_.js';
|
|
|
|
type MockResponse = {
|
|
type: string;
|
|
content: string;
|
|
};
|
|
|
|
export class MockResolver extends Resolver {
|
|
#responseMap = new Map<string, MockResponse>();
|
|
#remoteGetTrials: string[] = [];
|
|
|
|
constructor(loggerService: LoggerService) {
|
|
super(
|
|
{} as Config,
|
|
{} as UsersRepository,
|
|
{} as NotesRepository,
|
|
{} as PollsRepository,
|
|
{} as NoteReactionsRepository,
|
|
{} as FollowRequestsRepository,
|
|
{} as UtilityService,
|
|
{} as InstanceActorService,
|
|
{} as MetaService,
|
|
{} as ApRequestService,
|
|
{} as HttpRequestService,
|
|
{} as ApRendererService,
|
|
{} as ApDbResolverService,
|
|
{} as FederatedInstanceService,
|
|
loggerService,
|
|
);
|
|
}
|
|
|
|
public register(uri: string, content: string | Record<string, any>, type = 'application/activity+json'): void {
|
|
this.#responseMap.set(uri, {
|
|
type,
|
|
content: typeof content === 'string' ? content : JSON.stringify(content),
|
|
});
|
|
}
|
|
|
|
public clear(): void {
|
|
this.#responseMap.clear();
|
|
this.#remoteGetTrials.length = 0;
|
|
}
|
|
|
|
public remoteGetTrials(): string[] {
|
|
return this.#remoteGetTrials;
|
|
}
|
|
|
|
@bindThis
|
|
public async resolve(value: string | IObject): Promise<IObject> {
|
|
if (typeof value !== 'string') return value;
|
|
|
|
this.#remoteGetTrials.push(value);
|
|
const r = this.#responseMap.get(value);
|
|
|
|
if (!r) {
|
|
throw new Error('Not registed for mock');
|
|
}
|
|
|
|
const object = JSON.parse(r.content);
|
|
|
|
return object;
|
|
}
|
|
}
|