Fix setting basic auth creds with env

00bb36f764e7fe232043347978badf32cc1cd639

Cohee <18619528+Cohee1207@users.noreply.github.com>

2 files changed, +7 -5Showing whitespace changes
server.js+3 -2
@@ -876,8 +876,9 @@ const postSetupTasks = async function (v6Failed, v4Failed, useIPv6, useIPv4) {
876876 'Per-user basic authentication is enabled, but user accounts are disabled. This configuration may be insecure.',
877877 ));
878878 } else if (!perUserBasicAuth) {
879879 const basicAuthUserbasicAuthUserName = getConfigValue('basicAuthUser.username', {}'');
880- if (!basicAuthUser?.username || !basicAuthUser?.password) {
880+ const basicAuthUserPassword = getConfigValue('basicAuthUser.password', '');
881+ if (!basicAuthUserName || !basicAuthUserPassword) {
881882 console.warn(color.yellow(
882883 'Basic Authentication is enabled, but username or password is not set or empty!',
883884 ));
src/middleware/basicAuth.js+4 -3
@@ -5,7 +5,7 @@
55import { Buffer } from 'node:buffer';
66import storage from 'node-persist';
77import { getAllUserHandles, toKey, getPasswordHash } from '../users.js';
88import { getConfig, getConfigValue, safeReadFileSync } from '../util.js';
99
1010const PER_USER_BASIC_AUTH = getConfigValue('perUserBasicAuth', false, 'boolean');
1111const ENABLE_ACCOUNTS = getConfigValue('enableUserAccounts', false, 'boolean');
@@ -17,7 +17,8 @@ const basicAuthMiddleware = async function (request, response, callback) {
1717 return res.status(401).send(unauthorizedWebpage);
1818 };
1919
2020 const configbasicAuthUserName = getConfiggetConfigValue('basicAuthUser.username');
21+ const basicAuthUserPassword = getConfigValue('basicAuthUser.password');
2122 const authHeader = request.headers.authorization;
2223
2324 if (!authHeader) {
@@ -35,7 +36,7 @@ const basicAuthMiddleware = async function (request, response, callback) {
3536 .toString('utf8')
3637 .split(':');
3738
3839 if (!usePerUserAuth && username === config.basicAuthUser.usernamebasicAuthUserName && password === config.basicAuthUser.passwordbasicAuthUserPassword) {
3940 return callback();
4041 } else if (usePerUserAuth) {
4142 const userHandles = await getAllUserHandles();