From 53386b35c912e4ea1d4928f373a8b16c246c27b0 Mon Sep 17 00:00:00 2001 From: Cohee <18619528+Cohee1207@users.noreply.github.com> Date: Sat, 13 Apr 2024 00:11:20 +0300 Subject: [PATCH] Make Reset account functional --- public/script.js | 4 +- public/scripts/templates/changePassword.html | 2 +- public/scripts/templates/userProfile.html | 2 +- public/scripts/templates/userReset.html | 18 ++++++ public/scripts/user.js | 59 +++++++++++++++++++ src/endpoints/users-private.js | 60 ++++++++++++++++++-- src/endpoints/users-public.js | 6 +- src/users.js | 4 +- 8 files changed, 143 insertions(+), 12 deletions(-) create mode 100644 public/scripts/templates/userReset.html diff --git a/public/script.js b/public/script.js index c9447c2fa..c7d5270c3 100644 --- a/public/script.js +++ b/public/script.js @@ -666,13 +666,15 @@ async function getSystemMessages() { registerPromptManagerMigration(); $(document).ajaxError(function myErrorHandler(_, xhr) { + // Cohee: CSRF doesn't error out in multiple tabs anymore, so this is unnecessary + /* if (xhr.status == 403) { toastr.warning( 'doubleCsrf errors in console are NORMAL in this case. If you want to run ST in multiple tabs, start the server with --disableCsrf option.', 'Looks like you\'ve opened SillyTavern in another browser tab', { timeOut: 0, extendedTimeOut: 0, preventDuplicates: true }, ); - } + } */ }); async function getClientVersion() { diff --git a/public/scripts/templates/changePassword.html b/public/scripts/templates/changePassword.html index bbebf088f..b5ed6ecab 100644 --- a/public/scripts/templates/changePassword.html +++ b/public/scripts/templates/changePassword.html @@ -1,7 +1,7 @@
- +
diff --git a/public/scripts/templates/userProfile.html b/public/scripts/templates/userProfile.html index e80007d85..0aa40eb0d 100644 --- a/public/scripts/templates/userProfile.html +++ b/public/scripts/templates/userProfile.html @@ -77,7 +77,7 @@ Reset Settings
-
+
Reset Everything
diff --git a/public/scripts/templates/userReset.html b/public/scripts/templates/userReset.html new file mode 100644 index 000000000..35079920d --- /dev/null +++ b/public/scripts/templates/userReset.html @@ -0,0 +1,18 @@ + +

+ This will delete all your settings and data. There will be no undo button. + Make sure you have a backup before proceeding. +

+
+
+ Account reset code has been posted to the server console. +
+
+ + +
+
+ + +
+ diff --git a/public/scripts/user.js b/public/scripts/user.js index fd2424929..c432e090b 100644 --- a/public/scripts/user.js +++ b/public/scripts/user.js @@ -597,6 +597,64 @@ async function viewSettingsSnapshots() { renderSnapshots(); } +/** + * Reset everything to default. + * @param {function} callback Success callback + */ +async function resetEverything(callback) { + try { + const step1Response = await fetch('/api/users/reset-step1', { + method: 'POST', + headers: getRequestHeaders(), + }); + + if (!step1Response.ok) { + const data = await step1Response.json(); + toastr.error(data.error || 'Unknown error', 'Failed to reset'); + throw new Error('Failed to reset everything'); + } + + let password = ''; + let code = ''; + + const template = $(await renderTemplateAsync('userReset')); + template.find('input[name="password"]').on('input', function () { + password = String($(this).val()); + }); + template.find('input[name="code"]').on('input', function () { + code = String($(this).val()); + }); + const confirm = await callGenericPopup( + template, + POPUP_TYPE.CONFIRM, + '', + { okButton: 'Reset', cancelButton: 'Cancel', wide: false, large: false }, + ); + + if (confirm !== POPUP_RESULT.AFFIRMATIVE) { + throw new Error('Reset everything cancelled'); + } + + const step2Response = await fetch('/api/users/reset-step2', { + method: 'POST', + headers: getRequestHeaders(), + body: JSON.stringify({ password, code }), + }); + + if (!step2Response.ok) { + const data = await step2Response.json(); + toastr.error(data.error || 'Unknown error', 'Failed to reset'); + throw new Error('Failed to reset everything'); + } + + toastr.success('Everything reset successfully', 'Reset Everything'); + callback(); + } catch (error) { + console.error('Error resetting everything:', error); + } + +} + async function openUserProfile() { await getCurrentUser(); const template = $(await renderTemplateAsync('userProfile')); @@ -624,6 +682,7 @@ async function openUserProfile() { }); }); template.find('.userResetSettingsButton').on('click', () => resetSettings(currentUser.handle, () => location.reload())); + template.find('.userResetAllButton').on('click', () => resetEverything(() => location.reload())); if (!accountsEnabled) { template.find('[data-require-accounts]').hide(); diff --git a/src/endpoints/users-private.js b/src/endpoints/users-private.js index 445016376..0bec02b42 100644 --- a/src/endpoints/users-private.js +++ b/src/endpoints/users-private.js @@ -2,10 +2,15 @@ const path = require('path'); const fsPromises = require('fs').promises; const storage = require('node-persist'); const express = require('express'); +const crypto = require('crypto'); const { jsonParser } = require('../express-common'); -const { getUserAvatar, toKey, getPasswordHash, getPasswordSalt, createBackupArchive } = require('../users'); +const { getUserAvatar, toKey, getPasswordHash, getPasswordSalt, createBackupArchive, ensurePublicDirectoriesExist } = require('../users'); const { SETTINGS_FILE } = require('../constants'); const contentManager = require('./content-manager'); +const { color, Cache } = require('../util'); +const { checkForNewContent } = require('./content-manager'); + +const RESET_CACHE = new Cache(5 * 60 * 1000); const router = express.Router(); @@ -27,7 +32,7 @@ router.post('/logout', async (request, response) => { router.get('/me', async (request, response) => { try { if (!request.user) { - return response.sendStatus(401); + return response.sendStatus(403); } const user = request.user.profile; @@ -74,7 +79,7 @@ router.post('/change-password', jsonParser, async (request, response) => { if (!request.user.profile.admin && user.password && user.password !== getPasswordHash(request.body.oldPassword, user.salt)) { console.log('Change password failed: Incorrect password'); - return response.status(401).json({ error: 'Incorrect password' }); + return response.status(403).json({ error: 'Incorrect password' }); } if (request.body.newPassword) { @@ -121,7 +126,7 @@ router.post('/reset-settings', jsonParser, async (request, response) => { if (request.user.profile.password && request.user.profile.password !== getPasswordHash(password, request.user.profile.salt)) { console.log('Reset settings failed: Incorrect password'); - return response.status(401).json({ error: 'Incorrect password' }); + return response.status(403).json({ error: 'Incorrect password' }); } const pathToFile = path.join(request.user.directories.root, SETTINGS_FILE); @@ -165,6 +170,53 @@ router.post('/change-name', jsonParser, async (request, response) => { } }); +router.post('/reset-step1', jsonParser, async (request, response) => { + try { + const resetCode = String(crypto.randomInt(1000, 9999)); + console.log(); + console.log(color.magenta(`${request.user.profile.name}, your account reset code is: `) + color.red(resetCode)); + console.log(); + RESET_CACHE.set(request.user.profile.handle, resetCode); + return response.sendStatus(204); + } catch (error) { + console.error('Recover step 1 failed:', error); + return response.sendStatus(500); + } +}); + +router.post('/reset-step2', jsonParser, async (request, response) => { + try{ + if (!request.body.code) { + console.log('Recover step 2 failed: Missing required fields'); + return response.status(400).json({ error: 'Missing required fields' }); + } + + if (request.user.profile.password && request.user.profile.password !== getPasswordHash(request.body.password, request.user.profile.salt)) { + console.log('Recover step 2 failed: Incorrect password'); + return response.status(400).json({ error: 'Incorrect password' }); + } + + const code = RESET_CACHE.get(request.user.profile.handle); + + if (!code || code !== request.body.code) { + console.log('Recover step 2 failed: Incorrect code'); + return response.status(400).json({ error: 'Incorrect code' }); + } + + console.log('Resetting account data:', request.user.profile.handle); + await fsPromises.rm(request.user.directories.root, { recursive: true, force: true }); + + await ensurePublicDirectoriesExist(); + await checkForNewContent([request.user.directories]); + + RESET_CACHE.remove(request.user.profile.handle); + return response.sendStatus(204); + } catch (error) { + console.error('Recover step 2 failed:', error); + return response.sendStatus(500); + } +}); + module.exports = { router, }; diff --git a/src/endpoints/users-public.js b/src/endpoints/users-public.js index 17e2f47ae..f808d525f 100644 --- a/src/endpoints/users-public.js +++ b/src/endpoints/users-public.js @@ -59,7 +59,7 @@ router.post('/login', jsonParser, async (request, response) => { if (!user) { console.log('Login failed: User not found'); - return response.status(401).json({ error: 'User not found' }); + return response.status(403).json({ error: 'User not found' }); } if (!user.enabled) { @@ -70,7 +70,7 @@ router.post('/login', jsonParser, async (request, response) => { if (user.password && user.password !== getPasswordHash(request.body.password, user.salt)) { console.log('Login failed: Incorrect password'); - return response.status(401).json({ error: 'Incorrect password' }); + return response.status(403).json({ error: 'Incorrect password' }); } if (!request.session) { @@ -159,7 +159,7 @@ router.post('/recover-step2', jsonParser, async (request, response) => { if (request.body.code !== mfaCode) { await recoverLimiter.consume(ip); console.log('Recover step 2 failed: Incorrect code'); - return response.status(401).json({ error: 'Incorrect code' }); + return response.status(403).json({ error: 'Incorrect code' }); } if (request.body.newPassword) { diff --git a/src/users.js b/src/users.js index 889df2b70..eeb69063f 100644 --- a/src/users.js +++ b/src/users.js @@ -551,7 +551,7 @@ async function setUserDataMiddleware(request, response, next) { */ function requireLoginMiddleware(request, response, next) { if (!request.user) { - return response.sendStatus(401); + return response.sendStatus(403); } return next(); @@ -583,7 +583,7 @@ function createRouteHandler(directoryFn) { */ function requireAdminMiddleware(request, response, next) { if (!request.user) { - return response.sendStatus(401); + return response.sendStatus(403); } if (request.user.profile.admin) {