defer 403 HTML to file

928487985d56043a1db3bb54d41657db2966c1b3

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

Signed

default/config.yaml+0 -2 Viewed

 whitelist:
   - ::1
   - 127.0.0.1
 -# HTML displayed when a connection is blocked. Use "{{ipDetails}}" to print the client's IP.
 -whitelistErrorMessage: "<h1>Forbidden</h1><p>If you are the system administrator, add your IP address to the whitelist or disable whitelist mode by editing <code>config.yaml</code> in the root directory of your installation.</p><hr /><p><em>Connection from {{ipDetails}} has been blocked. This attempt has been logged.</em></p>"
 # Toggle basic authentication for endpoints
 basicAuthMode: false
 # Basic authentication credentials

default/public/error/forbidden-by-whitelist.html+22 -0 Viewed

 +<!DOCTYPE html>
 +<html>
++
 +<head>
 +    <title>Forbidden</title>
 +</head>
++
 +<body>
 +    <h1>Forbidden</h1>
 +    <p>
 +        If you are the system administrator, add your IP address to the
 +        whitelist or disable whitelist mode by editing
 +        <code>config.yaml</code> in the root directory of your installation.
 +    </p>
 +    <hr />
 +    <p>
 +        <em>Connection from {{ipDetails}} has been blocked. This attempt
 +            has been logged.</em>
 +    </p>
 +</body>
++
 +</html>

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

 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 DEFAULT_WHITELIST_ERROR_MESSAGE =
 -    '<h1>Forbidden</h1><p>If you are the system administrator, add your IP address to the whitelist or disable whitelist mode by editing <code>config.yaml</code> in the root directory of your installation.</p><hr /><p><em>Connection from {{ipDetails}} has been blocked. This attempt has been logged.</em></p>';
+-
 -const errorMessage = Handlebars.compile(
 -    getConfigValue(
 -        'whitelistErrorMessage',
 -        DEFAULT_WHITELIST_ERROR_MESSAGE,
 -    ),
 -);
 if (fs.existsSync(whitelistPath)) {
     try {

                     `Blocked connection from ${clientIp}; User Agent: ${userAgent}\n\tTo allow this connection, add its IP address to the whitelist or disable whitelist mode by editing config.yaml in the root directory of your SillyTavern installation.\n`,
                 ),
             );
             return res.status(403).send(errorMessageforbiddenWebpage({ ipDetails }));
+        }
         next();
     };