Skip to content

fix: Replace SHA-256 key derivation with PBKDF2 #6237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JhaSourav07 merged 3 commits into from
Jun 21, 2026
+9 −8
Merged

fix: Replace SHA-256 key derivation with PBKDF2 #6237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e06556a
fix: strengthen encryption key derivation with PBKDF2
Abfa41 Jun 21, 2026
5761a49
test: update crypto tests for salted payload format
Abfa41 Jun 21, 2026
5800713
chore: retrigger ci
Abfa41 Jun 21, 2026
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
4 changes: 2 additions & 2 deletions lib/crypto.empty-fallback.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ describe('crypto empty / missing inputs verification', () => {
const encrypted = encryptToken(plain);
expect(encrypted).toBeDefined();
expect(encrypted).not.toBe(plain);
expect(encrypted.split('.')).toHaveLength(3);
expect(encrypted.split('.')).toHaveLength(4);
expect(decryptToken(encrypted)).toBe(plain);
});

it('handles empty string encryption and decryption', () => {
const encrypted = encryptToken('');
expect(encrypted.split('.')).toHaveLength(3);
expect(encrypted.split('.')).toHaveLength(4);
expect(decryptToken(encrypted)).toBe('');
});

Expand Down
13 changes: 7 additions & 6 deletions lib/crypto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,26 @@ import crypto from 'node:crypto';

const ALGO = 'aes-256-gcm';

function key(): Buffer {
function key(salt: Buffer): Buffer {
const k = process.env.ENCRYPTION_KEY;
if (!k || k.length < 32) {
throw new Error('ENCRYPTION_KEY must be at least 32 characters');
}
return crypto.createHash('sha256').update(k).digest();
return crypto.pbkdf2Sync(k, salt, 100000, 32, 'sha512');
}

export function encryptToken(plain: string): string {
const salt = crypto.randomBytes(16);
const iv = crypto.randomBytes(12);
const cipher = crypto.createCipheriv(ALGO, key(), iv);
const cipher = crypto.createCipheriv(ALGO, key(salt), iv);
const enc = Buffer.concat([cipher.update(plain, 'utf8'), cipher.final()]);
const tag = cipher.getAuthTag();
return [iv, tag, enc].map((b) => b.toString('base64')).join('.');
return [salt, iv, tag, enc].map((b) => b.toString('base64')).join('.');
}

export function decryptToken(payload: string): string {
const [iv, tag, enc] = payload.split('.').map((p) => Buffer.from(p, 'base64'));
const decipher = crypto.createDecipheriv(ALGO, key(), iv);
const [salt, iv, tag, enc] = payload.split('.').map((p) => Buffer.from(p, 'base64'));
const decipher = crypto.createDecipheriv(ALGO, key(salt), iv);
decipher.setAuthTag(tag);
return Buffer.concat([decipher.update(enc), decipher.final()]).toString('utf8');
}
Loading