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

Merge branch 'feat/do-trust-fixes' into feat/desktop-offline

Browse Source
This commit is contained in:
Linus Rath
2026-11-04 03:43:04 +01:00
parent be8aba2ae7 466fa7f974
commit 92e6ee1bfa
15 changed files with 474 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/admin/password.ts
+2 -1
View File
@@ -6,6 +6,7 @@ import { assertWritable, isConfigReadOnly } from './paths';
import { adminConfigDocs, adminStateDocs, isStoreUnavailable } from './admin-store';
import type { AdminConfigData, AdminStateData } from './types';
import { readFileEnv } from '../read-file-env';
import { desktopServerSecret } from '@/lib/desktop/server-secrets';
const SCRYPT_KEYLEN = 64;
const SCRYPT_COST = 16384; // 2^14
@@ -269,7 +270,7 @@ export async function initAdminPassword(): Promise<boolean> {
return true;
}
const envPassword = process.env.ADMIN_PASSWORD;
const envPassword = desktopServerSecret('adminPassword') || process.env.ADMIN_PASSWORD;
if (!envPassword) {
if (!cache.initialized) logger.info('Admin dashboard disabled (no ADMIN_PASSWORD set)');
cache.initialized = true;