Skip to content

feat :Field-level AES-256-GCM encryption at rest for reversible secrets#960

Merged
1nonlypiece merged 1 commit into
Disciplr-Org:mainfrom
githoboman:Add-field-level-encryption-for-verifier-secrets-and-webhook-secrets-at-rest-in-src/lib/encryption.ts
Jun 29, 2026
Merged

feat :Field-level AES-256-GCM encryption at rest for reversible secrets#960
1nonlypiece merged 1 commit into
Disciplr-Org:mainfrom
githoboman:Add-field-level-encryption-for-verifier-secrets-and-webhook-secrets-at-rest-in-src/lib/encryption.ts

Conversation

@githoboman

Copy link
Copy Markdown
Contributor

What was implemented
Field-level AES-256-GCM encryption at rest for reversible secrets, applied to webhook signing secrets.
Closes #683

New files
src/lib/encryption.ts — the envelope-encryption helper. encryptField/decryptField using AES-256-GCM. Ciphertext is stored as v1:::: (base64), self-describing and tagged with the key id so rotated-out keys still decrypt old data. Also exposes resolveKeys, isEncrypted, encryptNullable/decryptNullable, and typed DecryptionError/EncryptionKeyError. Fails closed: throws if no key is configured and never returns ciphertext on a decrypt failure.
src/tests/encryption.test.ts — covers round-trip (incl. empty/unicode), tamper detection on ciphertext/tag/IV, no-silent-passthrough, wrong-key rejection, key-id rotation (decrypt under retired key, active = first key, orphaned-kid failure), and config failures (missing key, wrong length, bad JSON, duplicate kid).
docs/field-encryption.md — scheme + zero-downtime key-rotation runbook.
jest.setup.cjs — seeds a test-only FIELD_ENCRYPTION_KEY so existing DB-gated webhook suites keep working.
Edited
src/config/env.ts — added FIELD_ENCRYPTION_KEY / FIELD_ENCRYPTION_KEYS to the schema and a getFieldEncryptionConfig() resolver (read directly from process.env, decoupled from full initEnv() so the helper works in isolation).
src/repositories/webhookSubscriberRepository.ts — encrypts on write (create, upsert, rotateSecret) and decrypts on read (toSubscriber). Reads tolerate legacy plaintext during rollout (decryptSecretColumn), which self-heals to ciphertext on next write. The service layer's reversible secret contract is unchanged — plaintext exists only in memory.
src/tests/webhookSubscriber.rotation.test.ts — raw-DB-column assertions now decrypt before comparing.
.env.example, docs/security-ci.md, jest.config.cjs — config/doc/test wiring.
No package.json changes.

@drips-wave

drips-wave Bot commented Jun 29, 2026

Copy link
Copy Markdown

@githoboman Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits.

You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀

Learn more about application limits

@1nonlypiece 1nonlypiece merged commit a3c908d into Disciplr-Org:main Jun 29, 2026
2 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add field-level encryption for verifier secrets and webhook secrets at rest in src/lib/encryption.ts

2 participants