No exceptions on missing error webpages - Create a `safeReadFileSync()` function in `src/utils.js` to wrap around `fs.readFileSync()` - Migrate error-webpage loads to use `safeReadFileSync()`, with default values of an empty string - Move the 404 error middleware to explicitly only be called after extensions are registered

6099ffece134bcde9197c1be51a0b23f885465b5

Spappz <34202141+Spappz@users.noreply.github.com>

Signed

server.js+12 -6 Viewed

     forwardFetchResponse,
     removeColorFormatting,
     getSeparator,
 +    safeReadFileSync,
 } from './src/util.js';
 import { UPLOADS_DIRECTORY } from './src/constants.js';
 import { ensureThumbnailCache } from './src/endpoints/thumbnails.js';

 app.use('/api/speech', speechRouter);
 app.use('/api/azure', azureRouter);
 -// If all other middlewares fail, send 404 error.
 -const notFoundWebpage = fs.readFileSync('./public/error/url-not-found.html', { encoding: 'utf-8' });
 -app.use((req, res, next) => {
 -    res.status(404).send(notFoundWebpage);
 -});
+-
 const tavernUrlV6 = new URL(
     (cliArguments.ssl ? 'https://' : 'http://') +
     (listen ? '[::]' : '[::1]') +

+    }
+}
 +/**
 + * Registers a not-found error response if a not-found error page exists. Should only be called after all other middlewares have been registered.
 + */
 +function apply404Middleware() {
 +    const notFoundWebpage = safeReadFileSync('./public/error/url-not-found.html') ?? '';
 +    app.use((req, res) => {
 +        res.status(404).send(notFoundWebpage);
 +    });
 +}
++
 // User storage module needs to be initialized before starting the server
 initUserStorage(dataRoot)
     .then(ensurePublicDirectoriesExist)

     .then(migrateSystemPrompts)
     .then(verifySecuritySettings)
     .then(preSetupTasks)
 +    .then(apply404Middleware)
     .finally(startServer);

src/middleware/basicAuth.js+2 -3 Viewed

 import { Buffer } from 'node:buffer';
 import storage from 'node-persist';
 import { getAllUserHandles, toKey, getPasswordHash } from '../users.js';
 import { getConfig, getConfigValue, safeReadFileSync } from '../util.js';
 -import { readFileSync } from 'node:fs';
 const PER_USER_BASIC_AUTH = getConfigValue('perUserBasicAuth', false);
 const ENABLE_ACCOUNTS = getConfigValue('enableUserAccounts', false);
 const unauthorizedWebpage = readFileSyncsafeReadFileSync('./public/error/unauthorized.html', {) encoding:?? 'utf-8' });
 const unauthorizedResponse = (res) => {
     res.set('WWW-Authenticate', 'Basic realm="SillyTavern", charset="UTF-8"');
     return res.status(401).send(unauthorizedWebpage);

src/middleware/whitelist.js+4 -2 Viewed

 import ipMatching from 'ip-matching';
 import { getIpFromRequest } from '../express-common.js';
 import { color, getConfigValue, safeReadFileSync } from '../util.js';
 const whitelistPath = path.join(process.cwd(), './whitelist.txt');
 const enableForwardedWhitelist = getConfigValue('enableForwardedWhitelist', false);
 let whitelist = getConfigValue('whitelist', []);
 let knownIPs = new Set();
 -const forbiddenWebpage = Handlebars.compile(fs.readFileSync('./public/error/forbidden-by-whitelist.html', 'utf-8'));
 +const forbiddenWebpage = Handlebars.compile(
 +    safeReadFileSync('./public/error/forbidden-by-whitelist.html') ?? '',
 +);
 if (fs.existsSync(whitelistPath)) {
     try {

src/util.js+11 -0 Viewed

         return this.map[Symbol.iterator]();
+    }
+}
++
 +/**
 + * A 'safe' version of `fs.readFileSync()`. Returns the contents of a file if it exists, falling back to a default value if not.
 + * @param {string} filePath Path of the file to be read.
 + * @param {Parameters<typeof fs.readFileSync>[1]} options Options object to pass through to `fs.readFileSync()` (default: `{ encoding: 'utf-8' }`).
 + * @returns The contents at `filePath` if it exists, or `null` if not.
 + */
 +export function safeReadFileSync(filePath, options = { encoding: 'utf-8' }) {
 +    if (fs.existsSync(filePath)) return fs.readFileSync(filePath, options);
 +    return null;
 +}