Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/keyResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,19 @@ export type ResolveKeyResult = ResolveKeySuccess | ResolveKeyFailure;

function asPublicKey(raw: string): ReturnType<typeof createPublicKey> {
const trimmed = raw.trim();
let key: ReturnType<typeof createPublicKey>;
if (trimmed.includes('BEGIN PUBLIC KEY')) {
return createPublicKey(trimmed);
key = createPublicKey(trimmed);
} else {
const der = Buffer.from(trimmed, 'base64');
key = createPublicKey({ key: der, format: 'der', type: 'spki' });
}
const der = Buffer.from(trimmed, 'base64');
return createPublicKey({ key: der, format: 'der', type: 'spki' });
if (key.asymmetricKeyType !== 'ed25519') {
throw new Error(
`public key is ${key.asymmetricKeyType}; only ed25519 signing keys are accepted`
);
}
return key;
}

type RemoteKeyRecord = {
Expand Down
57 changes: 56 additions & 1 deletion tests/verify.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import { readFile } from 'node:fs/promises';
import { readFile, writeFile, unlink } from 'node:fs/promises';
import { mkdtemp, rm } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { resolve } from 'node:path';
import { generateKeyPairSync } from 'node:crypto';
import { describe, expect, it } from 'vitest';
import { verifyReceipt } from '../src/verify.js';
import { resolvePublicKey } from '../src/keyResolver.js';

async function loadJson(name: string): Promise<unknown> {
const path = resolve(process.cwd(), 'tests/fixtures', name);
Expand Down Expand Up @@ -60,3 +65,53 @@ describe('verifyReceipt', () => {
}
});
});

describe('resolvePublicKey key-type enforcement', () => {
async function makeTmpKeyFile(keyPem: string): Promise<string> {
const dir = await mkdtemp(join(tmpdir(), 'pp-test-'));
const keyPath = join(dir, 'key.pem');
await writeFile(keyPath, keyPem);
return keyPath;
}

async function cleanup(keyPath: string): Promise<void> {
const dir = keyPath.replace(/\/[^/]+$/, '');
try {
await rm(dir, { recursive: true, force: true });
} catch {
// best-effort cleanup
}
}

it('rejects RSA public keys as non-ed25519', async () => {
const { publicKey } = generateKeyPairSync('rsa', { modulusLength: 2048 });
const pem = publicKey.export({ type: 'spki', format: 'pem' });
const keyPath = await makeTmpKeyFile(pem);
try {
const result = await resolvePublicKey({ keyFile: keyPath, signatureKeyId: 'any' });
expect(result.ok).toBe(false);
if (!result.ok) {
expect(result.errorCode).toBe('KEY_RESOLUTION_FAILED');
expect(result.errorMessage.toLowerCase()).toContain('rsa');
}
} finally {
await cleanup(keyPath);
}
});

it('rejects ECDSA P-256 public keys as non-ed25519', async () => {
const { publicKey } = generateKeyPairSync('ec', { namedCurve: 'P-256' });
const pem = publicKey.export({ type: 'spki', format: 'pem' });
const keyPath = await makeTmpKeyFile(pem);
try {
const result = await resolvePublicKey({ keyFile: keyPath, signatureKeyId: 'any' });
expect(result.ok).toBe(false);
if (!result.ok) {
expect(result.errorCode).toBe('KEY_RESOLUTION_FAILED');
expect(result.errorMessage.toLowerCase()).toContain('ec');
}
} finally {
await cleanup(keyPath);
}
});
});