rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-04-03 05:31:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3499 from SillyTavern/accesslog-dataroot

Browse Source 
Move access.log to data root
This commit is contained in:
Cohee 2025-02-19 11:32:37 +02:00 committed by GitHub
commit 826e4f6d16
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server.js
View File

@ -57,7 +57,7 @@ import {
import getWebpackServeMiddleware from './src/middleware/webpack-serve.js'; import getWebpackServeMiddleware from './src/middleware/webpack-serve.js';
import basicAuthMiddleware from './src/middleware/basicAuth.js'; import basicAuthMiddleware from './src/middleware/basicAuth.js';
import whitelistMiddleware from './src/middleware/whitelist.js'; import whitelistMiddleware, { getAccessLogPath, migrateAccessLog } from './src/middleware/whitelist.js';
import multerMonkeyPatch from './src/middleware/multerMonkeyPatch.js'; import multerMonkeyPatch from './src/middleware/multerMonkeyPatch.js';
import initRequestProxy from './src/request-proxy.js'; import initRequestProxy from './src/request-proxy.js';
import getCacheBusterMiddleware from './src/middleware/cacheBuster.js'; import getCacheBusterMiddleware from './src/middleware/cacheBuster.js';
@ -754,6 +754,7 @@ const preSetupTasks = async function () {
await checkForNewContent(directories); await checkForNewContent(directories);
await ensureThumbnailCache(); await ensureThumbnailCache();
cleanUploads(); cleanUploads();
migrateAccessLog();
await settingsInit(); await settingsInit();
await statsInit(); await statsInit();
@ -856,7 +857,7 @@ const postSetupTasks = async function (v6Failed, v4Failed, useIPv6, useIPv4) {
if (listen) { if (listen) {
console.log(); console.log();
console.log('To limit connections to internal localhost only ([::1] or 127.0.0.1), change the setting in config.yaml to "listen: false".'); console.log('To limit connections to internal localhost only ([::1] or 127.0.0.1), change the setting in config.yaml to "listen: false".');
console.log('Check the "access.log" file in the SillyTavern directory to inspect incoming connections.'); console.log('Check the "access.log" file in the data directory to inspect incoming connections:', color.green(getAccessLogPath()));
} }
console.log('\n' + getSeparator(plainGoToLog.length) + '\n'); console.log('\n' + getSeparator(plainGoToLog.length) + '\n');
console.log(goToLog); console.log(goToLog);

22
src/middleware/whitelist.js
View File

@ -12,6 +12,8 @@ const enableForwardedWhitelist = getConfigValue('enableForwardedWhitelist', fals
let whitelist = getConfigValue('whitelist', []); let whitelist = getConfigValue('whitelist', []);
let knownIPs = new Set(); let knownIPs = new Set();
export const getAccessLogPath = () => path.join(globalThis.DATA_ROOT, 'access.log');
if (fs.existsSync(whitelistPath)) { if (fs.existsSync(whitelistPath)) {
try { try {
let whitelistTxt = fs.readFileSync(whitelistPath, 'utf-8'); let whitelistTxt = fs.readFileSync(whitelistPath, 'utf-8');
@ -46,6 +48,23 @@ function getForwardedIp(req) {
return undefined; return undefined;
} }
export function migrateAccessLog() {
try {
if (!fs.existsSync('access.log')) {
return;
}
const logPath = getAccessLogPath();
if (fs.existsSync(logPath)) {
return;
}
fs.renameSync('access.log', logPath);
console.log(color.yellow('Migrated access.log to new location:'), logPath);
} catch (e) {
console.error('Failed to migrate access log:', e);
console.info('Please move access.log to the data directory manually.');
}
}
/** /**
* 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} whitelistMode If whitelist mode is enabled via config or command line
@ -67,9 +86,10 @@ export default function whitelistMiddleware(whitelistMode, listen) {
knownIPs.add(clientIp); knownIPs.add(clientIp);
// Write access log // Write access log
const logPath = getAccessLogPath();
const timestamp = new Date().toISOString(); const timestamp = new Date().toISOString();
const log = `${timestamp} ${clientIp} ${userAgent}\n`; const log = `${timestamp} ${clientIp} ${userAgent}\n`;
fs.appendFile('access.log', log, (err) => { fs.appendFile(logPath, log, (err) => {
if (err) { if (err) {
console.error('Failed to write access log:', err); console.error('Failed to write access log:', err);
} }