perf(federation): Ed25519署名に対応する (#13464)
* 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 commit0082f6f8e8. * 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 commitf2c412c180. * genRSAAndEd25519KeyPairではキーを直列に生成する? * maxConcurrency: 8 * maxConcurrency: 16 * maxConcurrency: 8 * Revert "genRSAAndEd25519KeyPairではキーを直列に生成する?" This reverts commitd0aada55c1. * maxWorkers: '90%' * Revert "maxWorkers: '90%'" This reverts commit9e0a93f110. * 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>
This commit is contained in:
		| @@ -158,4 +158,9 @@ export class MiInstance { | ||||
| 		length: 16384, default: '', | ||||
| 	}) | ||||
| 	public moderationNote: string; | ||||
|  | ||||
| 	@Column('varchar', { | ||||
| 		length: 16, default: '00', nullable: false, | ||||
| 	}) | ||||
| 	public httpMessageSignaturesImplementationLevel: string; | ||||
| } | ||||
|   | ||||
| @@ -3,7 +3,7 @@ | ||||
|  * SPDX-License-Identifier: AGPL-3.0-only | ||||
|  */ | ||||
|  | ||||
| import { PrimaryColumn, Entity, JoinColumn, Column, OneToOne } from 'typeorm'; | ||||
| import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne } from 'typeorm'; | ||||
| import { id } from './util/id.js'; | ||||
| import { MiUser } from './User.js'; | ||||
|  | ||||
| @@ -12,22 +12,42 @@ export class MiUserKeypair { | ||||
| 	@PrimaryColumn(id()) | ||||
| 	public userId: MiUser['id']; | ||||
|  | ||||
| 	@OneToOne(type => MiUser, { | ||||
| 	@ManyToOne(type => MiUser, { | ||||
| 		onDelete: 'CASCADE', | ||||
| 	}) | ||||
| 	@JoinColumn() | ||||
| 	public user: MiUser | null; | ||||
|  | ||||
| 	/** | ||||
| 	 * RSA public key | ||||
| 	 */ | ||||
| 	@Column('varchar', { | ||||
| 		length: 4096, | ||||
| 	}) | ||||
| 	public publicKey: string; | ||||
|  | ||||
| 	/** | ||||
| 	 * RSA private key | ||||
| 	 */ | ||||
| 	@Column('varchar', { | ||||
| 		length: 4096, | ||||
| 	}) | ||||
| 	public privateKey: string; | ||||
|  | ||||
| 	@Column('varchar', { | ||||
| 		length: 128, | ||||
| 		nullable: true, | ||||
| 		default: null, | ||||
| 	}) | ||||
| 	public ed25519PublicKey: string | null; | ||||
|  | ||||
| 	@Column('varchar', { | ||||
| 		length: 128, | ||||
| 		nullable: true, | ||||
| 		default: null, | ||||
| 	}) | ||||
| 	public ed25519PrivateKey: string | null; | ||||
|  | ||||
| 	constructor(data: Partial<MiUserKeypair>) { | ||||
| 		if (data == null) return; | ||||
|  | ||||
|   | ||||
| @@ -9,7 +9,13 @@ import { MiUser } from './User.js'; | ||||
|  | ||||
| @Entity('user_publickey') | ||||
| export class MiUserPublickey { | ||||
| 	@PrimaryColumn(id()) | ||||
| 	@PrimaryColumn('varchar', { | ||||
| 		length: 256, | ||||
| 	}) | ||||
| 	public keyId: string; | ||||
|  | ||||
| 	@Index() | ||||
| 	@Column(id()) | ||||
| 	public userId: MiUser['id']; | ||||
|  | ||||
| 	@OneToOne(type => MiUser, { | ||||
| @@ -18,12 +24,6 @@ export class MiUserPublickey { | ||||
| 	@JoinColumn() | ||||
| 	public user: MiUser | null; | ||||
|  | ||||
| 	@Index({ unique: true }) | ||||
| 	@Column('varchar', { | ||||
| 		length: 256, | ||||
| 	}) | ||||
| 	public keyId: string; | ||||
|  | ||||
| 	@Column('varchar', { | ||||
| 		length: 4096, | ||||
| 	}) | ||||
|   | ||||
| @@ -116,5 +116,9 @@ export const packedFederationInstanceSchema = { | ||||
| 			type: 'string', | ||||
| 			optional: true, nullable: true, | ||||
| 		}, | ||||
| 		httpMessageSignaturesImplementationLevel: { | ||||
| 			type: 'string', | ||||
| 			optional: false, nullable: false, | ||||
| 		}, | ||||
| 	}, | ||||
| } as const; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 tamaina
					tamaina