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

fix ap-request

This commit is contained in:
tamaina 2024-03-05 16:50:26 +00:00
parent ab29cbab41
commit a701fed9e5
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
*/ */
import * as assert from 'assert'; import * as assert from 'assert';
import { verifyDraftSignature, parseRequestSignature, genEd25519KeyPair, genRsaKeyPair } from '@misskey-dev/node-http-message-signatures'; import { verifyDraftSignature, parseRequestSignature, genEd25519KeyPair, genRsaKeyPair, importPrivateKey } from '@misskey-dev/node-http-message-signatures';
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) => {
@ -31,32 +31,47 @@ async function getKeyPair(level: string) {
throw new Error('Invalid level'); throw new Error('Invalid level');
} }
describe('ap-request', () => { describe('ap-request post', () => {
const url = 'https://example.com/inbox';
const activity = { a: 1 };
const body = JSON.stringify(activity);
const headers = {
'User-Agent': 'UA',
};
describe.each(['00', '01'])('createSignedPost with verify', (level) => { describe.each(['00', '01'])('createSignedPost with verify', (level) => {
test('pass', async () => { test('pem', async () => {
const keypair = await getKeyPair(level); const keypair = await getKeyPair(level);
const key = { keyId: 'x', 'privateKey': keypair.privateKey }; const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
const url = 'https://example.com/inbox';
const activity = { a: 1 };
const body = JSON.stringify(activity);
const headers = {
'User-Agent': 'UA',
};
const req = await createSignedPost({ level, key, url, body, additionalHeaders: headers }); const req = await createSignedPost({ level, key, url, body, additionalHeaders: headers });
const parsed = parseRequestSignature(req.request); const parsed = parseRequestSignature(req.request);
expect(parsed?.version).toBe('draft'); expect(parsed.version).toBe('draft');
if (!parsed) return;
const verify = await verifyDraftSignature(parsed.value, keypair.publicKey);
assert.deepStrictEqual(verify, true);
});
test('imported', async () => {
const keypair = await getKeyPair(level);
const key = { keyId: 'x', 'privateKey': await importPrivateKey(keypair.privateKey) };
const req = await createSignedPost({ level, key, url, body, additionalHeaders: headers });
const parsed = parseRequestSignature(req.request);
expect(parsed.version).toBe('draft');
if (!parsed) return; if (!parsed) return;
const verify = await verifyDraftSignature(parsed.value, keypair.publicKey); const verify = await verifyDraftSignature(parsed.value, keypair.publicKey);
assert.deepStrictEqual(verify, true); assert.deepStrictEqual(verify, true);
}); });
}); });
});
describe('ap-request get', () => {
describe.each(['00', '01'])('createSignedGet with verify', (level) => { describe.each(['00', '01'])('createSignedGet with verify', (level) => {
test('pass', async () => { test('pass', async () => {
const keypair = await getKeyPair(level); const keypair = await getKeyPair(level);
const key = { keyId: 'x', 'privateKey': keypair.privateKey }; const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
const url = 'https://example.com/outbox'; const url = 'https://example.com/outbox';
const headers = { const headers = {
'User-Agent': 'UA', 'User-Agent': 'UA',
@ -65,7 +80,7 @@ describe('ap-request', () => {
const req = await createSignedGet({ level, key, url, additionalHeaders: headers }); const req = await createSignedGet({ level, key, url, additionalHeaders: headers });
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 = await verifyDraftSignature(parsed.value, keypair.publicKey); const verify = await verifyDraftSignature(parsed.value, keypair.publicKey);
assert.deepStrictEqual(verify, true); assert.deepStrictEqual(verify, true);