starred/webmail
1
0
Fork 0
mirror of https://github.com/bulwarkmail/webmail.git synced 2026-11-01 16:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: treat an empty PLUGIN_SIGNING_KEY_FILE as unset #996

Browse Source
This commit is contained in:
Linus Rath
2026-09-30 14:24:29 +02:00
parent 70dee66966
commit b663f0e774
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/admin/__tests__/plugin-signing.test.ts
+12
View File
@@ -64,6 +64,18 @@ describe('plugin signing key storage', () => {
await expect(getPublicKeyBase64()).resolves.toBe(expected.subarray(-32).toString('base64'));
});
it('treats an empty PLUGIN_SIGNING_KEY_FILE as unset', async () => {
const configDir = path.join(dir, 'config');
const pem = privateKeyPem();
await mkdir(configDir);
await writeFile(path.join(configDir, 'plugin-signing.key'), pem);
vi.stubEnv('PLUGIN_SIGNING_KEY_FILE', '');
vi.stubEnv('ADMIN_CONFIG_DIR', configDir);
const expected = createPublicKey(pem).export({ type: 'spki', format: 'der' }) as Buffer;
await expect(getPublicKeyBase64()).resolves.toBe(expected.subarray(-32).toString('base64'));
});
it('keeps generating plugin-signing.key when external path is unset', async () => {
const configDir = path.join(dir, 'config');
vi.stubEnv('ADMIN_CONFIG_DIR', configDir);
lib/admin/plugin-signing.ts
+5 -2
View File
@@ -47,8 +47,11 @@ async function loadExternal(path: string): Promise<{ privateKey: KeyObject; publ
}
async function loadOrCreate(): Promise<{ privateKey: KeyObject; publicKey: KeyObject }> {
const externalPath = process.env.PLUGIN_SIGNING_KEY_FILE;
if (externalPath !== undefined) return loadExternal(externalPath);
// An empty value (`PLUGIN_SIGNING_KEY_FILE=` in an env file) means unset,
// like the other *_FILE variables. Reading '' fails, and a failed load
// makes every bundle ship unsigned with only a console warning.
const externalPath = process.env.PLUGIN_SIGNING_KEY_FILE?.trim();
if (externalPath) return loadExternal(externalPath);
await ensureConfigDir();
const path = getConfigPath(KEY_FILENAME);