rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-13 10:42:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Control whitelist mode with console flag

Browse Source
This commit is contained in:
Cohee 2024-04-12 01:33:39 +03:00
parent a3da248e3c
commit 58359c9682
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server.js
View File

@ -62,6 +62,7 @@ const DEFAULT_PORT = 8000;
const DEFAULT_AUTORUN = false; const DEFAULT_AUTORUN = false;
const DEFAULT_LISTEN = false; const DEFAULT_LISTEN = false;
const DEFAULT_CORS_PROXY = false; const DEFAULT_CORS_PROXY = false;
const DEFAULT_WHITELIST = true;
const cliArguments = yargs(hideBin(process.argv)) const cliArguments = yargs(hideBin(process.argv))
.usage('Usage: <your-start-script> <command> [options]') .usage('Usage: <your-start-script> <command> [options]')
@ -97,6 +98,10 @@ const cliArguments = yargs(hideBin(process.argv))
type: 'string', type: 'string',
default: 'certs/privkey.pem', default: 'certs/privkey.pem',
describe: 'Path to your private key file.', describe: 'Path to your private key file.',
}).option('whitelist', {
type: 'boolean',
default: false,
describe: 'Enables whitelist mode',
}).parseSync(); }).parseSync();
// change all relative paths // change all relative paths
@ -115,6 +120,7 @@ const server_port = cliArguments.port ?? process.env.SILLY_TAVERN_PORT ?? getCon
const autorun = (cliArguments.autorun ?? getConfigValue('autorun', DEFAULT_AUTORUN)) && !cliArguments.ssl; const autorun = (cliArguments.autorun ?? getConfigValue('autorun', DEFAULT_AUTORUN)) && !cliArguments.ssl;
const listen = cliArguments.listen ?? getConfigValue('listen', DEFAULT_LISTEN); const listen = cliArguments.listen ?? getConfigValue('listen', DEFAULT_LISTEN);
const enableCorsProxy = cliArguments.corsProxy ?? getConfigValue('enableCorsProxy', DEFAULT_CORS_PROXY); const enableCorsProxy = cliArguments.corsProxy ?? getConfigValue('enableCorsProxy', DEFAULT_CORS_PROXY);
const enableWhitelist = cliArguments.whitelist ?? getConfigValue('whitelistMode', DEFAULT_WHITELIST);
const basicAuthMode = getConfigValue('basicAuthMode', false); const basicAuthMode = getConfigValue('basicAuthMode', false);
const enableAccounts = getConfigValue('enableUserAccounts', false); const enableAccounts = getConfigValue('enableUserAccounts', false);
@ -130,7 +136,7 @@ app.use(CORS);
if (listen && basicAuthMode) app.use(basicAuthMiddleware); if (listen && basicAuthMode) app.use(basicAuthMiddleware);
app.use(whitelistMiddleware(listen)); app.use(whitelistMiddleware(enableWhitelist, listen));
if (enableCorsProxy) { if (enableCorsProxy) {
const bodyParser = require('body-parser'); const bodyParser = require('body-parser');
@ -585,7 +591,7 @@ async function loadPlugins() {
} }
} }
if (listen && !getConfigValue('whitelistMode', true) && !basicAuthMode) { if (listen && !enableWhitelist && !basicAuthMode) {
if (getConfigValue('securityOverride', false)) { if (getConfigValue('securityOverride', false)) {
console.warn(color.red('Security has been overridden. If it\'s not a trusted network, change the settings.')); console.warn(color.red('Security has been overridden. If it\'s not a trusted network, change the settings.'));
} }

4
src/middleware/whitelist.js
View File

@ -8,7 +8,6 @@ const { color, getConfigValue } = require('../util');
const whitelistPath = path.join(process.cwd(), './whitelist.txt'); const whitelistPath = path.join(process.cwd(), './whitelist.txt');
let whitelist = getConfigValue('whitelist', []); let whitelist = getConfigValue('whitelist', []);
let knownIPs = new Set(); let knownIPs = new Set();
const whitelistMode = getConfigValue('whitelistMode', true);
if (fs.existsSync(whitelistPath)) { if (fs.existsSync(whitelistPath)) {
try { try {
@ -21,10 +20,11 @@ if (fs.existsSync(whitelistPath)) {
/** /**
* Returns a middleware function that checks if the client IP is in the whitelist. * Returns a middleware function that checks if the client IP is in the whitelist.
* @param {boolean} whitelistMode If whitelist mode is enabled via config or command line
* @param {boolean} listen If listen mode is enabled via config or command line * @param {boolean} listen If listen mode is enabled via config or command line
* @returns {import('express').RequestHandler} The middleware function * @returns {import('express').RequestHandler} The middleware function
*/ */
function whitelistMiddleware(listen) { function whitelistMiddleware(whitelistMode, listen) {
return function (req, res, next) { return function (req, res, next) {
const clientIp = getIpFromRequest(req); const clientIp = getIpFromRequest(req);