mirror of
https://activitypub.software/TransFem-org/Sharkey.git
synced 2024-12-15 09:15: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>
135 lines
5.4 KiB
TypeScript
135 lines
5.4 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
process.env.NODE_ENV = 'test';
|
|
|
|
import { jest } from '@jest/globals';
|
|
import { Test } from '@nestjs/testing';
|
|
import { Redis } from 'ioredis';
|
|
import { GlobalModule } from '@/GlobalModule.js';
|
|
import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
|
|
import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
|
|
import { HttpRequestService } from '@/core/HttpRequestService.js';
|
|
import { LoggerService } from '@/core/LoggerService.js';
|
|
import { UtilityService } from '@/core/UtilityService.js';
|
|
import { IdService } from '@/core/IdService.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
import type { TestingModule } from '@nestjs/testing';
|
|
|
|
function mockRedis() {
|
|
const hash = {} as any;
|
|
const set = jest.fn((key: string, value) => {
|
|
const ret = hash[key];
|
|
hash[key] = value;
|
|
return ret;
|
|
});
|
|
return set;
|
|
}
|
|
|
|
describe('FetchInstanceMetadataService', () => {
|
|
let app: TestingModule;
|
|
let fetchInstanceMetadataService: jest.Mocked<FetchInstanceMetadataService>;
|
|
let federatedInstanceService: jest.Mocked<FederatedInstanceService>;
|
|
let httpRequestService: jest.Mocked<HttpRequestService>;
|
|
let redisClient: jest.Mocked<Redis>;
|
|
|
|
beforeEach(async () => {
|
|
app = await Test
|
|
.createTestingModule({
|
|
imports: [
|
|
GlobalModule,
|
|
],
|
|
providers: [
|
|
FetchInstanceMetadataService,
|
|
LoggerService,
|
|
UtilityService,
|
|
IdService,
|
|
],
|
|
})
|
|
.useMocker((token) => {
|
|
if (token === HttpRequestService) {
|
|
return { getJson: jest.fn(), getHtml: jest.fn(), send: jest.fn() };
|
|
} else if (token === FederatedInstanceService) {
|
|
return { fetch: jest.fn() };
|
|
} else if (token === DI.redis) {
|
|
return mockRedis;
|
|
}
|
|
return null;
|
|
})
|
|
.compile();
|
|
|
|
app.enableShutdownHooks();
|
|
|
|
fetchInstanceMetadataService = app.get<FetchInstanceMetadataService>(FetchInstanceMetadataService) as jest.Mocked<FetchInstanceMetadataService>;
|
|
federatedInstanceService = app.get<FederatedInstanceService>(FederatedInstanceService) as jest.Mocked<FederatedInstanceService>;
|
|
redisClient = app.get<Redis>(DI.redis) as jest.Mocked<Redis>;
|
|
httpRequestService = app.get<HttpRequestService>(HttpRequestService) as jest.Mocked<HttpRequestService>;
|
|
});
|
|
|
|
afterEach(async () => {
|
|
await app.close();
|
|
});
|
|
|
|
test('Lock and update', async () => {
|
|
redisClient.set = mockRedis();
|
|
const now = Date.now();
|
|
federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: new Date(now - 10 * 1000 * 60 * 60 * 24) } as any);
|
|
httpRequestService.getJson.mockImplementation(() => { throw Error(); });
|
|
const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
|
|
const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
|
|
|
|
await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any);
|
|
expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
|
|
expect(tryLockSpy).toHaveBeenCalledTimes(1);
|
|
expect(unlockSpy).toHaveBeenCalledTimes(1);
|
|
expect(httpRequestService.getJson).toHaveBeenCalled();
|
|
});
|
|
|
|
test('Don\'t lock and update if recently updated', async () => {
|
|
redisClient.set = mockRedis();
|
|
federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: new Date() } as any);
|
|
httpRequestService.getJson.mockImplementation(() => { throw Error(); });
|
|
const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
|
|
const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
|
|
|
|
await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any);
|
|
expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
|
|
expect(tryLockSpy).toHaveBeenCalledTimes(0);
|
|
expect(unlockSpy).toHaveBeenCalledTimes(0);
|
|
expect(httpRequestService.getJson).toHaveBeenCalledTimes(0);
|
|
});
|
|
|
|
test('Do nothing when lock not acquired', async () => {
|
|
redisClient.set = mockRedis();
|
|
const now = Date.now();
|
|
federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: new Date(now - 10 * 1000 * 60 * 60 * 24) } as any);
|
|
httpRequestService.getJson.mockImplementation(() => { throw Error(); });
|
|
await fetchInstanceMetadataService.tryLock('example.com');
|
|
const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
|
|
const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
|
|
|
|
await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any);
|
|
expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
|
|
expect(tryLockSpy).toHaveBeenCalledTimes(1);
|
|
expect(unlockSpy).toHaveBeenCalledTimes(0);
|
|
expect(httpRequestService.getJson).toHaveBeenCalledTimes(0);
|
|
});
|
|
|
|
test('Do when forced', async () => {
|
|
redisClient.set = mockRedis();
|
|
const now = Date.now();
|
|
federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: new Date(now - 10 * 1000 * 60 * 60 * 24) } as any);
|
|
httpRequestService.getJson.mockImplementation(() => { throw Error(); });
|
|
await fetchInstanceMetadataService.tryLock('example.com');
|
|
const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
|
|
const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
|
|
|
|
await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any, true);
|
|
expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(0);
|
|
expect(tryLockSpy).toHaveBeenCalledTimes(0);
|
|
expect(unlockSpy).toHaveBeenCalledTimes(1);
|
|
expect(httpRequestService.getJson).toHaveBeenCalled();
|
|
});
|
|
});
|