usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use gen-key-pair fn. from '@misskey-dev/node-http-message-signatures'

This commit is contained in:
tamaina 2024-03-01 12:52:46 +00:00
parent fd71ad7a5f
commit 67758d2d1e
3 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/core/UserKeypairService.ts
View File

@ -11,7 +11,7 @@ import { RedisKVCache } from '@/misc/cache.js';
import type { MiUserKeypair } from '@/models/UserKeypair.js'; import type { MiUserKeypair } from '@/models/UserKeypair.js';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { genEd25519KeyPair } from '@/misc/gen-key-pair.js'; import { genEd25519KeyPair } from '@misskey-dev/node-http-message-signatures';
import { GlobalEventService, GlobalEvents } from '@/core/GlobalEventService.js'; import { GlobalEventService, GlobalEvents } from '@/core/GlobalEventService.js';
@Injectable() @Injectable()

36
packages/backend/src/misc/gen-key-pair.ts
View File

@ -3,41 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-only * SPDX-License-Identifier: AGPL-3.0-only
*/ */
import * as crypto from 'node:crypto'; import { genEd25519KeyPair, genRsaKeyPair } from '@misskey-dev/node-http-message-signatures';
import * as util from 'node:util';
const generateKeyPair = util.promisify(crypto.generateKeyPair);
export async function genRsaKeyPair(modulusLength = 4096) {
return await generateKeyPair('rsa', {
modulusLength,
publicKeyEncoding: {
type: 'spki',
format: 'pem',
},
privateKeyEncoding: {
type: 'pkcs8',
format: 'pem',
cipher: undefined,
passphrase: undefined,
},
});
}
export async function genEd25519KeyPair() {
return await generateKeyPair('ed25519', {
publicKeyEncoding: {
type: 'spki',
format: 'pem',
},
privateKeyEncoding: {
type: 'pkcs8',
format: 'pem',
cipher: undefined,
passphrase: undefined,
},
});
}
export async function genRSAAndEd25519KeyPair(rsaModulusLength = 4096) { export async function genRSAAndEd25519KeyPair(rsaModulusLength = 4096) {
const rsa = await genRsaKeyPair(rsaModulusLength); const rsa = await genRsaKeyPair(rsaModulusLength);

7
packages/backend/test/unit/ap-request.ts
View File

@ -4,8 +4,7 @@
*/ */
import * as assert from 'assert'; import * as assert from 'assert';
import { verifyDraftSignature, parseRequestSignature } from '@misskey-dev/node-http-message-signatures'; import { verifyDraftSignature, parseRequestSignature, genEd25519KeyPair, genRsaKeyPair } from '@misskey-dev/node-http-message-signatures';
import { genEd25519KeyPair, genRsaKeyPair } from '@/misc/gen-key-pair.js';
import { createSignedGet, createSignedPost } from '@/core/activitypub/ApRequestService.js'; import { createSignedGet, createSignedPost } from '@/core/activitypub/ApRequestService.js';
export const buildParsedSignature = (signingString: string, signature: string, algorithm: string) => { export const buildParsedSignature = (signingString: string, signature: string, algorithm: string) => {
@ -49,7 +48,7 @@ describe('ap-request', () => {
const parsed = parseRequestSignature(req.request); const parsed = parseRequestSignature(req.request);
expect(parsed?.version).toBe('draft'); expect(parsed?.version).toBe('draft');
if (!parsed) return; if (!parsed) return;
const verify = verifyDraftSignature(parsed?.value, keypair.publicKey); const verify = verifyDraftSignature(parsed.value, keypair.publicKey);
assert.deepStrictEqual(verify, true); assert.deepStrictEqual(verify, true);
}); });
}); });
@ -68,7 +67,7 @@ describe('ap-request', () => {
const parsed = parseRequestSignature(req.request); const parsed = parseRequestSignature(req.request);
expect(parsed?.version).toBe('draft'); expect(parsed?.version).toBe('draft');
if (!parsed) return; if (!parsed) return;
const verify = verifyDraftSignature(parsed?.value, keypair.publicKey); const verify = verifyDraftSignature(parsed.value, keypair.publicKey);
assert.deepStrictEqual(verify, true); assert.deepStrictEqual(verify, true);
}); });
}); });