rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use Express router for secrets endpoint

Browse Source
This commit is contained in:
valadaptive
2023-12-04 12:55:13 -05:00
parent 414c9bd5fb
commit 091255d451
2 changed files with 55 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server.js
View File

@ -3585,7 +3585,7 @@ require('./src/endpoints/tokenizers').registerEndpoints(app, jsonParser);
require('./src/endpoints/presets').registerEndpoints(app, jsonParser); require('./src/endpoints/presets').registerEndpoints(app, jsonParser);
// Secrets managemenet // Secrets managemenet
require('./src/endpoints/secrets').registerEndpoints(app, jsonParser); app.use('/api/secrets', require('./src/endpoints/secrets').router);
// Thumbnail generation // Thumbnail generation
require('./src/endpoints/thumbnails').registerEndpoints(app, jsonParser); require('./src/endpoints/thumbnails').registerEndpoints(app, jsonParser);

113
src/endpoints/secrets.js
View File

@ -1,7 +1,9 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const express = require('express');
const { getConfigValue } = require('../util'); const { getConfigValue } = require('../util');
const writeFileAtomicSync = require('write-file-atomic').sync; const writeFileAtomicSync = require('write-file-atomic').sync;
const { jsonParser } = require('../express-common');
const SECRETS_FILE = path.join(process.cwd(), './secrets.json'); const SECRETS_FILE = path.join(process.cwd(), './secrets.json');
const SECRET_KEYS = { const SECRET_KEYS = {
@ -143,78 +145,71 @@ function getAllSecrets() {
return secrets; return secrets;
} }
/** const router = express.Router();
* Registers endpoints for the secret management API
* @param {import('express').Express} app Express app
* @param {any} jsonParser JSON parser middleware
*/
function registerEndpoints(app, jsonParser) {
app.post('/api/secrets/write', jsonParser, (request, response) => { router.post('/write', jsonParser, (request, response) => {
const key = request.body.key; const key = request.body.key;
const value = request.body.value; const value = request.body.value;
writeSecret(key, value); writeSecret(key, value);
return response.send('ok'); return response.send('ok');
}); });
app.post('/api/secrets/read', jsonParser, (_, response) => { router.post('/read', jsonParser, (_, response) => {
try {
const state = readSecretState();
return response.send(state);
} catch (error) {
console.error(error);
return response.send({});
}
});
try { router.post('/view', jsonParser, async (_, response) => {
const state = readSecretState(); const allowKeysExposure = getConfigValue('allowKeysExposure', false);
return response.send(state);
} catch (error) {
console.error(error);
return response.send({});
}
});
app.post('/api/secrets/view', jsonParser, async (_, response) => { if (!allowKeysExposure) {
const allowKeysExposure = getConfigValue('allowKeysExposure', false); console.error('secrets.json could not be viewed unless the value of allowKeysExposure in config.yaml is set to true');
return response.sendStatus(403);
}
if (!allowKeysExposure) { try {
console.error('secrets.json could not be viewed unless the value of allowKeysExposure in config.yaml is set to true'); const secrets = getAllSecrets();
return response.sendStatus(403);
if (!secrets) {
return response.sendStatus(404);
} }
try { return response.send(secrets);
const secrets = getAllSecrets(); } catch (error) {
console.error(error);
return response.sendStatus(500);
}
});
if (!secrets) { router.post('/find', jsonParser, (request, response) => {
return response.sendStatus(404); const allowKeysExposure = getConfigValue('allowKeysExposure', false);
}
return response.send(secrets); if (!allowKeysExposure) {
} catch (error) { console.error('Cannot fetch secrets unless allowKeysExposure in config.yaml is set to true');
console.error(error); return response.sendStatus(403);
return response.sendStatus(500); }
}
});
app.post('/api/secrets/find', jsonParser, (request, response) => { const key = request.body.key;
const allowKeysExposure = getConfigValue('allowKeysExposure', false);
if (!allowKeysExposure) { try {
console.error('Cannot fetch secrets unless allowKeysExposure in config.yaml is set to true'); const secret = readSecret(key);
return response.sendStatus(403);
if (!secret) {
response.sendStatus(404);
} }
const key = request.body.key; return response.send({ value: secret });
} catch (error) {
try { console.error(error);
const secret = readSecret(key); return response.sendStatus(500);
}
if (!secret) { });
response.sendStatus(404);
}
return response.send({ value: secret });
} catch (error) {
console.error(error);
return response.sendStatus(500);
}
});
}
module.exports = { module.exports = {
writeSecret, writeSecret,
@ -222,6 +217,6 @@ module.exports = {
readSecretState, readSecretState,
migrateSecrets, migrateSecrets,
getAllSecrets, getAllSecrets,
registerEndpoints,
SECRET_KEYS, SECRET_KEYS,
router,
}; };