luckberg/familysync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(12): IN-03 replace private web-push source import with Node.js built-in crypto

Browse Source 
generate-secrets.mjs was importing from ../apps/api/node_modules/web-push/src/index.js
(a private source path) which breaks if web-push restructures internally or
workspace hoisting moves the package. Replace with Node.js built-in createECDH
('prime256v1') which produces identical base64url-encoded keys, including the
same defensive padding logic as web-push for short key buffers.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Lucas Berger
2026-06-15 16:22:07 -04:00
co-authored by Claude Sonnet 4.6
parent 3babbfa20e
commit b0b5bceaed
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/generate-secrets.mjs
+24 -6
View File
@@ -18,15 +18,33 @@
* pnpm generate-secrets * pnpm generate-secrets
*/ */
// web-push is a CommonJS module — import via default then destructure. // IN-03: use Node.js built-in crypto to generate VAPID keys — avoids importing
// Resolve from apps/api/node_modules to avoid a root-level dependency. // web-push via its private source tree (../apps/api/node_modules/web-push/src/index.js)
import webpush from '../apps/api/node_modules/web-push/src/index.js'; // which breaks if web-push restructures internally or workspace hoisting moves the package.
const { generateVAPIDKeys } = webpush; // createECDH('prime256v1') + getPublicKey()/getPrivateKey() produces the same
import { randomBytes } from 'node:crypto'; // base64url-encoded keys as web-push.generateVAPIDKeys().
import { randomBytes, createECDH } from 'node:crypto';
const sessionSecret = randomBytes(32).toString('hex'); const sessionSecret = randomBytes(32).toString('hex');
const encKey = randomBytes(32).toString('hex'); const encKey = randomBytes(32).toString('hex');
const vapid = generateVAPIDKeys();
// VAPID key generation (P-256 / prime256v1 — same curve as web-push)
const ecdhCurve = createECDH('prime256v1');
ecdhCurve.generateKeys();
// Pad raw buffers to the expected lengths, matching web-push defensive padding
// (https://github.com/web-push-libs/web-push/issues/295)
let pubBuffer = ecdhCurve.getPublicKey();
let privBuffer = ecdhCurve.getPrivateKey();
if (privBuffer.length < 32) {
privBuffer = Buffer.concat([Buffer.alloc(32 - privBuffer.length), privBuffer]);
}
if (pubBuffer.length < 65) {
pubBuffer = Buffer.concat([Buffer.alloc(65 - pubBuffer.length), pubBuffer]);
}
const vapid = {
publicKey: pubBuffer.toString('base64url'),
privateKey: privBuffer.toString('base64url'),
};
console.log(`# FamilySync Bootstrap Secrets — generated ${new Date().toISOString()} console.log(`# FamilySync Bootstrap Secrets — generated ${new Date().toISOString()}
# Paste into your docker-compose.yml environment block under the 'api' service. # Paste into your docker-compose.yml environment block under the 'api' service.