Merge pull request #2953 from QuantumEntangledAndy/feat/AdditionalLogins Add additional login methods

e7fe2188104c1dc1c57be4fe0f645f76efd69eec

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

Parents: 15efdb660929bf7750c5c573d936ccca5e204a37 ad316c6d78679f27f362d8664e68d43dca0de836

default/config.yaml+13 -0 Viewed

 enableUserAccounts: false
 # Enable discreet login mode: hides user list on the login screen
 enableDiscreetLogin: false
 +# Enable's authlia based auto login. Only enable this if you
 +# have setup and installed Authelia as a middle-ware on your
 +# reverse proxy
 +# https://www.authelia.com/
 +# This will use auto login to an account with the same username
 +# as that used for authlia. (Ensure the username in authlia
 +# is an exact match with that in sillytavern)
 +autheliaAuth: false
 +# If `basicAuthMode` and this are enabled then
 +# the username and passwords for basic auth are the same as those
 +# for the individual accounts
 +perUserBasicAuth: false
++
 # User session timeout *in seconds* (defaults to 24 hours).
 ## Set to a positive number to expire session after a certain time of inactivity
 ## Set to 0 to expire session when the browser is closed

public/scripts/login.js+7 -1 Viewed

  * Preserves the query string.
  */
 function redirectToHome() {
 -    window.location.href = '/' + window.location.search;
 +    // After a login theres no need to preserve the
 +    // noauto (if present)
 +    const urlParams = new URLSearchParams(window.location.search);
++
 +    urlParams.delete('noauto');
++
 +    window.location.href = '/' + urlParams.toString();
+}
 /**

public/scripts/user.js+8 -1 Viewed

         headers: getRequestHeaders(),
     });
 -    window.location.reload();
 +    // On an explicit logout stop auto login
 +    // to allow user to change username even
 +    // when auto auth (such as authelia or basic)
 +    // would be valid
 +    const urlParams = new URLSearchParams(window.location.search);
 +    urlParams.set('noauto', 'true');
++
 +    window.location.search = urlParams.toString();
+}
 /**

server.js+7 -1 Viewed

 const DEFAULT_ACCOUNTS = false;
 const DEFAULT_CSRF_DISABLED = false;
 const DEFAULT_BASIC_AUTH = false;
 +const DEFAULT_PER_USER_BASIC_AUTH = false;
 const DEFAULT_ENABLE_IPV6 = false;
 const DEFAULT_ENABLE_IPV4 = true;

 const dataRoot = cliArguments.dataRoot ?? getConfigValue('dataRoot', './data');
 const disableCsrf = cliArguments.disableCsrf ?? getConfigValue('disableCsrfProtection', DEFAULT_CSRF_DISABLED);
 const basicAuthMode = cliArguments.basicAuthMode ?? getConfigValue('basicAuthMode', DEFAULT_BASIC_AUTH);
 +const perUserBasicAuth = getConfigValue('perUserBasicAuth', DEFAULT_PER_USER_BASIC_AUTH);
 const enableAccounts = getConfigValue('enableUserAccounts', DEFAULT_ACCOUNTS);
 const uploadsPath = path.join(dataRoot, require('./src/constants').UPLOADS_DIRECTORY);

+    }
     try {
         const autoLogin = await userModule.tryAutoLogin(request, basicAuthMode);
         if (autoLogin) {
             return response.redirect('/');

@@ -756,11 +758,15 @@ const postSetupTasks = async function (v6Failed, v4Failed) {
756	758	}
757	759
758	760	if (basicAuthMode) {
	761	+ if (perUserBasicAuth && !enableAccounts) {
	762	+ console.error(color.red('Per-user basic authentication is enabled, but user accounts are disabled. This configuration may be insecure.'));
	763	+ } else if (!perUserBasicAuth) {
759	764	const basicAuthUser = getConfigValue('basicAuthUser', {});
760	765	if (!basicAuthUser?.username \|\| !basicAuthUser?.password) {
761	766	console.warn(color.yellow('Basic Authentication is enabled, but username or password is not set or empty!'));
762	767	}
763	768	}
	769	+ }
764	770	};
765	771
766	772	/**

src/middleware/basicAuth.js+20 -5 Viewed

  * When applied, this middleware will ensure the request contains the required header for basic authentication and only
  * allow access to the endpoint after successful authentication.
  */
 const { getConfiggetAllUserHandles, toKey, getPasswordHash } = require('../utilusers.js');
 +const { getConfig, getConfigValue } = require('../util.js');
 +const storage = require('node-persist');
++
 +const PER_USER_BASIC_AUTH = getConfigValue('perUserBasicAuth', false);
 +const ENABLE_ACCOUNTS = getConfigValue('enableUserAccounts', false);
 const unauthorizedResponse = (res) => {
     res.set('WWW-Authenticate', 'Basic realm="SillyTavern", charset="UTF-8"');
     return res.status(401).send('Authentication required');
 };
 const basicAuthMiddleware = async function (request, response, callback) {
     const config = getConfig();
     const authHeader = request.headers.authorization;

         return unauthorizedResponse(response);
+    }
 +    const usePerUserAuth = PER_USER_BASIC_AUTH && ENABLE_ACCOUNTS;
     const [username, password] = Buffer.from(credentials, 'base64')
         .toString('utf8')
         .split(':');
     if (!usePerUserAuth && username === config.basicAuthUser.username && password === config.basicAuthUser.password) {
         return callback();
     } else if (usePerUserAuth) {
 -        return unauthorizedResponse(response);
 +        const userHandles = await getAllUserHandles();
 +        for (const userHandle of userHandles) {
 +            if (username === userHandle) {
 +                const user = await storage.getItem(toKey(userHandle));
 +                if (user && user.enabled && (user.password && user.password === getPasswordHash(password, user.salt))) {
 +                    return callback();
 +                }
+            }
 +        }
 +    }
 +    return unauthorizedResponse(response);
 };
 module.exports = basicAuthMiddleware;

src/users.js+101 -1 Viewed

 const KEY_PREFIX = 'user:';
 const AVATAR_PREFIX = 'avatar:';
 const ENABLE_ACCOUNTS = getConfigValue('enableUserAccounts', false);
 +const AUTHELIA_AUTH = getConfigValue('autheliaAuth', false);
 +const PER_USER_BASIC_AUTH = getConfigValue('perUserBasicAuth', false);
 const ANON_CSRF_SECRET = crypto.randomBytes(64).toString('base64');
 /**

 /**
  * Tries auto-login if there is only one user and it's not password protected.
 + * or another configured method such authlia or basic
  * @param {import('express').Request} request Request object
 + * @param {boolean} basicAuthMode If Basic auth mode is enabled
  * @returns {Promise<boolean>} Whether auto-login was performed
  */
 async function tryAutoLogin(request, basicAuthMode) {
     if (!ENABLE_ACCOUNTS || request.user || !request.session) {
         return false;
+    }
 +    if (!request.query.noauto) {
 +        if (await singleUserLogin(request)) {
 +            return true;
 +        }
++
 +        if (AUTHELIA_AUTH && await autheliaUserLogin(request)) {
 +            return true;
 +        }
++
 +        if (basicAuthMode && PER_USER_BASIC_AUTH && await basicUserLogin(request)) {
 +            return true;
 +        }
 +    }
++
 +    return false;
 +}
++
 +/**
 + * Tries auto-login if there is only one user and it's not password protected.
 + * @param {import('express').Request} request Request object
 + * @returns {Promise<boolean>} Whether auto-login was performed
 + */
 +async function singleUserLogin(request) {
 +    if (!request.session) {
 +        return false;
 +    }
++
     const userHandles = await getAllUserHandles();
     if (userHandles.length === 1) {
         const user = await storage.getItem(toKey(userHandles[0]));

             return true;
+        }
+    }
 +    return false;
 +}
++
 +/**
 + * Tries auto-login with authlia trusted headers.
 + * https://www.authelia.com/integration/trusted-header-sso/introduction/
 + * @param {import('express').Request} request Request object
 + * @returns {Promise<boolean>} Whether auto-login was performed
 + */
 +async function autheliaUserLogin(request) {
 +    if (!request.session) {
 +        return false;
 +    }
++
 +    const remoteUser = request.get('Remote-User');
 +    if (!remoteUser) {
 +        return false;
 +    }
++
 +    const userHandles = await getAllUserHandles();
 +    for (const userHandle of userHandles) {
 +        if (remoteUser === userHandle) {
 +            const user = await storage.getItem(toKey(userHandle));
 +            if (user && user.enabled) {
 +                request.session.handle = userHandle;
 +                return true;
 +            }
 +        }
 +    }
 +    return false;
 +}
++
 +/**
 + * Tries auto-login with basic auth username.
 + * @param {import('express').Request} request Request object
 + * @returns {Promise<boolean>} Whether auto-login was performed
 + */
 +async function basicUserLogin(request) {
 +    if (!request.session) {
 +        return false;
 +    }
++
 +    const authHeader = request.headers.authorization;
++
 +    if (!authHeader) {
 +        return false;
 +    }
++
 +    const [scheme, credentials] = authHeader.split(' ');
++
 +    if (scheme !== 'Basic' || !credentials) {
 +        return false;
 +    }
++
 +    const [username, password] = Buffer.from(credentials, 'base64')
 +        .toString('utf8')
 +        .split(':');
++
 +    const userHandles = await getAllUserHandles();
 +    for (const userHandle of userHandles) {
 +        if (username === userHandle) {
 +            const user = await storage.getItem(toKey(userHandle));
 +            // Verify pass again here just to be sure
 +            if (user && user.enabled && user.password && user.password === getPasswordHash(password, user.salt)) {
 +                request.session.handle = userHandle;
 +                return true;
 +            }
 +        }
 +    }
     return false;
+}